1. 25 Mar, 2018 1 commit
  2. 17 Feb, 2018 1 commit
  3. 02 Nov, 2017 2 commits
  4. 30 Oct, 2017 1 commit
  5. 05 Oct, 2017 1 commit
  6. 26 Sep, 2017 2 commits
  7. 21 Apr, 2017 2 commits
  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. 29 Jan, 2017 1 commit
  11. 15 Jan, 2017 1 commit
  12. 09 Jan, 2017 5 commits
  13. 21 Nov, 2016 2 commits
  14. 18 Nov, 2016 1 commit
  15. 23 Sep, 2016 1 commit
  16. 31 Jul, 2016 1 commit
  17. 23 Jul, 2016 1 commit
  18. 22 Jul, 2016 1 commit
  19. 19 Jul, 2016 1 commit
  20. 09 Jul, 2016 1 commit
  21. 20 Jun, 2016 1 commit
  22. 05 Jun, 2016 1 commit
  23. 25 May, 2016 1 commit
  24. 18 May, 2016 2 commits
  25. 06 Apr, 2016 1 commit
  26. 17 Feb, 2016 1 commit
  27. 01 Feb, 2016 1 commit
  28. 01 Apr, 2015 2 commits
  29. 31 Mar, 2015 1 commit
  30. 21 Nov, 2014 1 commit