aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10411] Ensure we only get services that do existJoas Schilling2013-02-251-1/+1
* [ticket/10411] Add a comment why we left join the group tableJoas Schilling2013-01-151-0/+2
* [ticket/10411] Rename template variable CUR_ to CURRENT_Joas Schilling2012-12-062-2/+2
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2012-12-0681-405/+1737
|\
| * Merge PR #1053 branch 'develop-olympus' into developOleg Pudeyev2012-12-053-6/+43
| |\
| | * [ticket/10841] Revert more whitespace changes.Oleg Pudeyev2012-12-051-2/+2
| | * [ticket/10841] Revert whitespace changes.Oleg Pudeyev2012-12-052-20/+20
| | * [ticket/10841] adding space after ifSenky2012-12-051-2/+2
| | * [ticket/10841] removing unnecessary spacingSenky2012-12-051-2/+2
| | * [ticket/10841] changing affectedrows check to COUNT in sqlSenky2012-12-051-6/+8
| | * [ticket/10841] Modifying style and language selectors in UCPSenky2012-12-053-28/+62
| * | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-3/+10
| |\ \ | | |/
| | * [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
| | * [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
| | * [ticket/11238] Set goutte version to 0.1.0.Oleg Pudeyev2012-12-022-32/+433
| * | [ticket/11247] Fix wrong property reference in flock class.Oleg Pudeyev2012-12-051-1/+1
| * | Merge remote-tracking branch 'p/ticket/10103' into developAndreas Fischer2012-12-044-72/+157
| |\ \
| | * | [ticket/10103] New and improved wording.Oleg Pudeyev2012-12-041-2/+2
| | * | [ticket/10103] $rv had too few characters.Oleg Pudeyev2012-12-041-3/+3
| | * | [ticket/10103] Correct flock class documentation.Oleg Pudeyev2012-12-041-4/+13
| | * | [ticket/10103] Convert the rest of the tree to flock class.Oleg Pudeyev2012-12-042-8/+16
| | * | [ticket/10103] Use flock lock class in messenger.Oleg Pudeyev2012-12-041-6/+8
| | * | [ticket/10103] Factor out flock lock class.Oleg Pudeyev2012-12-042-58/+124
| * | | [ticket/10091] Bump minimum supported postgresql version to 8.3.Oleg Pudeyev2012-12-044-4/+4
| |/ /
| * | Merge remote-tracking branch 'p/ticket/9983' into developAndreas Fischer2012-12-031-1/+27
| |\ \
| | * | [ticket/9983] Empty line by request.Oleg Pudeyev2012-12-021-0/+1
| | * | [ticket/9983] Add redis cache driver tests.Oleg Pudeyev2012-12-011-1/+26
| * | | [ticket/11238] Set goutte to 0.1.0 in develop.Oleg Pudeyev2012-12-022-104/+68
| * | | Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into developOleg Pudeyev2012-12-024-10/+10
| |\ \ \
| | * | | [ticket/10771] fix remember me languageDhruv2012-12-022-8/+8
| | * | | [ticket/10771] use remember me in ucpDhruv2012-12-021-4/+4
| | * | | [ticket/10771] use remember me in acpDhruv2012-12-021-4/+4
| | * | | [ticket/10771] changed value in help_faq.phpHari Sankar R2012-12-021-1/+1
| | * | | [ticket/10771] Using Remember Me instead of autologin or persistent keysHari Sankar R2012-12-021-1/+1
| * | | | Merge PR #545 branch 'brunoais/ticket/10601' into developOleg Pudeyev2012-12-013-3/+59
| |\ \ \ \
| | * | | | [ticket/10601] The ORDER BY is only taking space thereBruno Ais2012-12-011-1/+1
| | * | | | [ticket/10601] New approach in the update algorithmBruno Ais2012-12-011-14/+11
| | * | | | [ticket/10601] Comment to help understanding the codeBruno Ais2012-11-281-0/+1
| | * | | | [ticket/10601] Requested code changesBruno Ais2012-11-281-6/+6
| | * | | | [ticket/10601] Cosmetic code changesBruno Ais2012-11-261-7/+5
| | * | | | [ticket/10601] Database updating code v2Bruno Ais2012-11-261-19/+19
| | * | | | [ticket/10601] Database updating codeBruno Ais2012-11-261-0/+27
| | * | | | [ticket/10601] Comment explaning the basename applied to categoriesBruno Ais2012-11-261-0/+2
| | * | | | [ticket/10601] Correctly access class propertyDavid King2012-11-261-4/+4
| | * | | | [ticket/10601]Move Inbox the default in private messages moduleBruno Ais2012-11-262-3/+34
| * | | | | Merge PR #1095 branch 'nickvergessen/ticket/11209' into developOleg Pudeyev2012-12-011-4/+4
| |\ \ \ \ \
| | * | | | | [ticket/11209] Clone disable moving images to allow multiple per pageJoas Schilling2012-11-161-4/+4
| * | | | | | Merge remote-tracking branch 'p/ticket/11227' into developAndreas Fischer2012-12-0118-24/+24
| |\ \ \ \ \ \
| | * | | | | | [ticket/11227] @return void -> @return null, per coding guidelines.Oleg Pudeyev2012-11-3018-24/+24
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge PR #893 branch 'develop-olympus' into developOleg Pudeyev2012-12-012-0/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |