Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/13645] Fix docblocks | Tristan Darricau | 2015-08-24 | 1 | -1/+3 |
* | [ticket/13645] Proper OOP for feeds | Tristan Darricau | 2015-08-23 | 15 | -320/+506 |
* | [ticket/13645] Move the feeds to controllers | Nicofuma | 2015-08-23 | 27 | -449/+914 |
* | Merge pull request #3842 from CHItA/ticket/14097 | Tristan Darricau | 2015-08-23 | 1 | -3/+10 |
|\ | |||||
| * | [ticket/14097] Remove auto refresh on install failure | Mate Bartus | 2015-08-21 | 1 | -2/+1 |
| * | [ticket/14097] Improve error and failure handling in the installer | Mate Bartus | 2015-08-17 | 1 | -2/+10 |
* | | Merge branch '3.1.x' | Joas Schilling | 2015-08-23 | 3 | -1/+121 |
|\ \ | |||||
| * | | [3.1.x] Update version to 3.1.7-dev | Joas Schilling | 2015-08-23 | 2 | -2/+2 |
| * | | [prep-release-3.1.6] Add changelog for 3.1.6-RC1 | Joas Schilling | 2015-08-23 | 1 | -0/+89 |
| * | | [prep-release-3.1.6] Add migration for 3.1.6-RC1 | Joas Schilling | 2015-08-23 | 1 | -0/+31 |
| * | | [prep-release-3.1.6] Update version to 3.1.6-RC1 | Joas Schilling | 2015-08-23 | 5 | -7/+7 |
| * | | Merge pull request #3829 from Nicofuma/ticket/14099 | Joas Schilling | 2015-08-23 | 3 | -21/+48 |
| |\ \ | |||||
* | \ \ | Merge pull request #3854 from Nicofuma/ticket/14099-master | Joas Schilling | 2015-08-23 | 1 | -8/+8 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '3.1.x' | Tristan Darricau | 2015-08-23 | 1 | -8/+8 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'ticket/14099' into 3.1.x | Tristan Darricau | 2015-08-21 | 3 | -21/+48 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | [ticket/14099] Fix the assets | Tristan Darricau | 2015-08-18 | 1 | -3/+14 |
| | | * | | | [ticket/14099] Fix tests | Tristan Darricau | 2015-08-14 | 1 | -0/+8 |
| | | * | | | [ticket/14099] Update twig/twig to 1.20.0 | Tristan Darricau | 2015-08-14 | 2 | -21/+29 |
* | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 1 | -1/+12 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #3823 from lavigor/ticket/14087 | Marc Alexander | 2015-08-22 | 1 | -1/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/14087] Add an event to ucp_activate.php. | lavigor | 2015-08-09 | 1 | -1/+12 |
* | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge pull request #3834 from brunoais/ticket/14104 | Marc Alexander | 2015-08-22 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/14104] Fix missing variables from previous commit | brunoais | 2015-08-15 | 1 | -0/+4 |
* | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3831 from rxu/ticket/14101 | Marc Alexander | 2015-08-22 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/14101] Add core event to the download/file.php | rxu | 2015-08-15 | 1 | -0/+24 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 2 | -0/+18 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3852 from marc1706/ticket/14068 | Marc Alexander | 2015-08-22 | 3 | -0/+22 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/14068] Add template events before and after poll panel | javiexin | 2015-08-22 | 3 | -0/+22 |
* | | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 2 | -2/+18 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #3771 from Zoddo/ticket/14025 | Marc Alexander | 2015-08-22 | 3 | -2/+22 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | [ticket/14091] Add mcp_topic_subject_* template events | Zoddo | 2015-08-11 | 3 | -2/+22 |
* | | | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3813 from rxu/ticket/14072 | Marc Alexander | 2015-08-22 | 1 | -0/+23 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | [ticket/14072] Add core event to the function format_display() | rxu | 2015-08-06 | 1 | -0/+23 |
* | | | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 2 | -1/+56 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3803 from rxu/ticket/14064 | Marc Alexander | 2015-08-22 | 3 | -2/+74 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | [ticket/14064] Add template events to ucp_pm_history.html | rxu | 2015-08-03 | 3 | -2/+74 |
| | |/ / / / / / / / | |||||
* | | | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 2 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #3806 from rxu/ticket/14067 | Marc Alexander | 2015-08-22 | 3 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | [ticket/14067] Add template events to overall_header.html around feeds | rxu | 2015-08-05 | 3 | -0/+10 |
| | |/ / / / / / / / | |||||
* | | | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-22 | 2 | -3/+32 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3804 from rxu/ticket/14065 | Marc Alexander | 2015-08-22 | 3 | -3/+40 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| | * | | | | | | | [ticket/14065] Add template events to attachment.html | rxu | 2015-08-03 | 3 | -3/+40 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-20 | 1 | -0/+20 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #3849 from marc1706/ticket/14037 | Marc Alexander | 2015-08-20 | 1 | -0/+20 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/14037] Minor coding style improvements to event | Marc Alexander | 2015-08-20 | 1 | -0/+2 |
| | * | | | | | | | [ticket/14037] Allows adapting memberlist profile fields headline | javiexin | 2015-08-20 | 1 | -0/+18 |
* | | | | | | | | | Merge branch '3.1.x' | Marc Alexander | 2015-08-20 | 2 | -6/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |