1. 09 Aug, 2011 1 commit
  2. 03 Jun, 2011 1 commit
  3. 24 Mar, 2011 1 commit
  4. 02 Mar, 2011 1 commit
  5. 31 Jan, 2011 1 commit
  6. 18 Jan, 2011 1 commit
  7. 12 Jan, 2011 1 commit
  8. 04 Jan, 2011 1 commit
  9. 21 Dec, 2010 2 commits
  10. 15 Dec, 2010 2 commits
  11. 07 Dec, 2010 2 commits
  12. 30 Nov, 2010 1 commit
  13. 26 Nov, 2010 1 commit
  14. 25 Nov, 2010 1 commit
    • Jonny Bradley's avatar
      [MRG] Automatic merge, branches/6.x 30823 to 30869 · 1d13db8c
      Jonny Bradley authored
      Conflicts manually resolved this time:
      	tiki-list_posts.php
      	lib/wiki-plugins/wikiplugin_flash.php
      	lib/wiki-plugins/wikiplugin_youtube.php
      	lib/setup/prefs.php
      	tiki-setup_base.php
      	templates/tiki-list_posts.tpl
      (white space characters count!)
      1d13db8c
  15. 20 Nov, 2010 1 commit
    • Jonny Bradley's avatar
      [MRG] Automatic merge, branches/6.x 30756 to 30823 · 7505d087
      Jonny Bradley authored
      Manually fixed conflicts in
      	lib/wiki-plugins/wikiplugin_flash.php
      	lib/wiki-plugins/wikiplugin_file.php
      	lib/wiki-plugins/wikiplugin_youtube.php
      	lib/tikilib.php
      	lib/jquery_tiki/tiki-jquery.js
      	tiki-interactive_trans.php
      	templates/tiki-admin_menu_options.tpl
      (editors please check)
      7505d087
  16. 21 Oct, 2010 1 commit
  17. 16 Sep, 2010 1 commit
  18. 13 Sep, 2010 1 commit
    • Jonny Bradley's avatar
      [bp r29148,29149,29150] from wysiwyg_ckeditor_update - splitting feature_ajax. · 0bed187f
      Jonny Bradley authored
      [ENH] ajax: splitting feature_ajax part 1. New pref for xajax
      Part 2. Low level xajax pref checks in smarty blocks, smarty and lib. Also added missing pref tests in tiki-index.php
      Part 3. replacement of feature_ajax with ajax_xajax in other files using xajax directly. Other areas (such as Google maps, auto save etc untouched).
      0bed187f
  19. 27 Aug, 2010 1 commit
  20. 23 Aug, 2010 1 commit
  21. 27 Jul, 2010 1 commit
  22. 21 Jul, 2010 1 commit
  23. 22 Jun, 2010 3 commits
  24. 06 Apr, 2010 1 commit
  25. 30 Mar, 2010 2 commits
  26. 26 Mar, 2010 1 commit
  27. 08 Mar, 2010 1 commit
    • chealer's avatar
      accesslib: add check_authenticity() for CSRF protection · 55241a7f
      chealer authored
      some accesslib deployment
      ticketlib: Mark ticketlib[1] as deprecated again
      ticketlib: Store tickets in session instead of database
      [FIX] ticketlib: granting a ticket destroys previous one
      [FIX] HTML special chars escaping
      55241a7f
  28. 11 Feb, 2010 1 commit
  29. 22 Jan, 2010 2 commits
  30. 18 Dec, 2009 1 commit
  31. 20 Nov, 2009 1 commit
  32. 09 Nov, 2009 1 commit
  33. 05 Nov, 2009 1 commit