aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge pull request #3759 from Zoddo/ticket/14013Marc Alexander2015-08-082-0/+8
| |\ \ \ \ \
| | * | | | | [ticket/14013] Add documentation for acp_forums_custom_settingsZoddo2015-07-151-0/+6
| | * | | | | [ticket/14013] Add acp_forums_custom_settings eventZoddo2015-07-151-0/+2
| | | |/ / / | | |/| | |
* | | | | | Merge branch '3.1.x'Marc Alexander2015-08-083-8/+71
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3738 from javiexin/ticket/13981Marc Alexander2015-08-083-8/+71
| |\ \ \ \ \
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-241-3/+3
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-231-1/+3
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-171-1/+1
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-172-6/+11
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-091-0/+10
| | * | | | | [ticket/13981] Add events to capture avatar deletion or overwritingjaviexin2015-07-031-6/+52
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-08-081-0/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3757 from Zoddo/ticket/14006Marc Alexander2015-08-081-0/+10
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | [ticket/14006] Add core.ucp_register_agreement eventZoddo2015-07-121-0/+10
| | | |/ / / | | |/| | |
* | | | | | Merge pull request #3819 from Nicofuma/ticket/14079Máté Bartus2015-08-083-10/+17
|\ \ \ \ \ \
| * | | | | | [ticket/14079] Correctly mark notifications as readTristan Darricau2015-08-083-10/+17
|/ / / / / /
* | | | | | Merge pull request #3817 from Nicofuma/ticket/14076Máté Bartus2015-08-071-5/+5
|\ \ \ \ \ \
| * | | | | | [ticket/14076] Fix notification settingsTristan Darricau2015-08-071-5/+5
|/ / / / / /
* | | | | | Merge pull request #3816 from Nicofuma/ticket/14074Máté Bartus2015-08-071-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/14074] Fix mark notifications as read in the ucpTristan Darricau2015-08-071-1/+1
|/ / / / / /
* | | | | | Merge remote-tracking branch 'Nicofuma/ticket/12692'Marc Alexander2015-08-079-0/+660
|\ \ \ \ \ \
| * | | | | | [ticket/12692] Fix tests and update styleTristan Darricau2015-08-065-73/+129
| * | | | | | [ticket/12692] Cleanup language fileTristan Darricau2015-07-094-16/+15
| * | | | | | [ticket/12692] Fix languages vars and services orderTristan Darricau2015-07-092-13/+13
| * | | | | | [ticket/12692] Fix testsTristan Darricau2015-07-091-1/+1
| * | | | | | [ticket/12692] Fix languages filesTristan Darricau2015-07-093-11/+3
| * | | | | | [ticket/12692] Add outputTristan Darricau2015-07-094-0/+69
| * | | | | | [ticket/12692] Add a proper extension to the fixturesTristan Darricau2015-07-093-4/+6
| * | | | | | [ticket/12692] Move the language strings to cli.phpTristan Darricau2015-07-096-39/+31
| * | | | | | [ticket/12692] Update the database regularlyTristan Darricau2015-07-092-8/+42
| * | | | | | [ticket/12692] Cast the ids to intTristan Darricau2015-07-091-1/+1
| * | | | | | [ticket/12692] Remove a not and swap the blocks in the corresponding ifTristan Darricau2015-07-091-4/+4
| * | | | | | [ticket/12692] Update commentsTristan Darricau2015-07-091-1/+1
| * | | | | | [ticket/12692] Fix coding styleTristan Darricau2015-07-092-2/+2
| * | | | | | [ticket/12692] Use strict comparison in thumbnail:recreateTristan Darricau2015-07-091-1/+1
| * | | | | | [ticket/12692] Use !empty() instead of sizeof()Tristan Darricau2015-07-092-2/+2
| * | | | | | [ticket/12692] Update doc blocksTristan Darricau2015-07-094-2/+8
| * | | | | | [ticket/12692] Add unit testTristan Darricau2015-07-094-0/+149
| * | | | | | [ticket/12692] Add a console command to manage the thumbnailsTristan Darricau2015-07-095-0/+361
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-08-051-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #3782 from RMcGirr83/ticket/13711Andreas Fischer2015-08-051-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/13711] Notifications are sent to inactive usersRMcGirr832015-07-271-1/+1
* | | | | | | | Merge branch '3.1.x'Andreas Fischer2015-08-052-9/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3790 from prototech/ticket/14010Andreas Fischer2015-08-051-8/+9
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/14010] Update Plupload from 2.1.2 to 2.1.8.Cesar G2015-07-251-8/+9
| * | | | | | | | Merge pull request #3791 from prototech/ticket/14049Andreas Fischer2015-08-051-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | [ticket/14049] Use headers from config when sending Plupload delete request.Cesar G2015-07-251-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #3698 from s9e/ticket/13935Tristan Darricau2015-08-056-7/+69
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/13935] Removed cache invalidation from acp_boardJoshyPHP2015-07-151-6/+0
| * | | | | | | | [ticket/13935] Removed UIJoshyPHP2015-07-153-44/+0