1. 09 Mar, 2019 1 commit
  2. 23 Nov, 2018 1 commit
  3. 25 Apr, 2018 1 commit
  4. 19 Apr, 2018 1 commit
  5. 17 Apr, 2018 1 commit
  6. 19 Nov, 2017 1 commit
  7. 29 Apr, 2017 1 commit
  8. 25 Mar, 2017 1 commit
    • jonnybradley's avatar
      [MRG] Automatic merge, trunk 61745 to 61845 · 46b24d4c
      jonnybradley authored
      Conflicts fixed (with tf) on:
              admin/include_general.php
              admin/include_intertiki.php
              db/config/controllers.xml
              lib/core/Search/Indexer.php
              lib/core/Services/Edit/PluginController.php
              lib/core/Tiki/MemoryLimit.php
              lib/prefs/wikiplugin.php
              templates/admin/include_calendar.tpl
              templates/admin/include_print.tpl
      Setup and composer update to follow...
      46b24d4c
  9. 17 Mar, 2017 1 commit
  10. 14 Mar, 2017 2 commits
  11. 25 Jan, 2017 1 commit
  12. 13 Nov, 2016 1 commit
  13. 01 Nov, 2016 1 commit
  14. 01 Oct, 2016 1 commit
  15. 28 Sep, 2016 1 commit
  16. 13 Apr, 2016 1 commit
  17. 17 Mar, 2016 1 commit
  18. 18 Jun, 2015 1 commit
  19. 25 Apr, 2015 1 commit
  20. 06 Apr, 2015 1 commit
  21. 05 Apr, 2015 1 commit
  22. 03 Apr, 2015 1 commit
  23. 30 Mar, 2015 1 commit
  24. 17 Mar, 2015 1 commit
  25. 06 Feb, 2015 1 commit
  26. 29 Sep, 2014 2 commits
  27. 23 Aug, 2014 1 commit
  28. 25 Jul, 2014 1 commit
  29. 09 May, 2014 1 commit
  30. 21 Apr, 2014 1 commit
  31. 05 Apr, 2014 1 commit
  32. 01 Feb, 2014 1 commit
  33. 15 Jan, 2014 2 commits
  34. 05 Dec, 2013 4 commits