Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop-olympus' into develop | Oleg Pudeyev | 2011-12-24 | 1 | -1/+6 |
|\ | |||||
| * | Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympus | Oleg Pudeyev | 2011-12-24 | 1 | -1/+6 |
| |\ | |||||
| | * | [ticket/10507] Sort styles in acp | Vjacheslav Trushkin | 2011-12-15 | 1 | -1/+6 |
* | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-23 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | [ticket/10546] Add missing argument to adm_back_link in acp_captcha. | Oleg Pudeyev | 2011-12-23 | 1 | -1/+1 |
| * | | Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympus | Oleg Pudeyev | 2011-12-22 | 2 | -15/+15 |
| |\ \ | |||||
| | * | | [ticket/10399] Correctly encoding template component urls (3.0) | Vjacheslav Trushkin | 2011-12-04 | 1 | -5/+5 |
| | * | | [ticket/10399] Correctly encoding template component urls (3.0) | Vjacheslav Trushkin | 2011-12-01 | 1 | -10/+10 |
* | | | | Merge remote-tracking branch 'imkingdavid/ticket/10541' into develop | Oleg Pudeyev | 2011-12-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | [ticket/10541] Fixed empty drop-down menu bug | David King | 2011-12-21 | 1 | -1/+1 |
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/develop/10399' into develop | Oleg Pudeyev | 2011-12-22 | 1 | -7/+7 |
|\ \ \ \ \ | |||||
| * | | | | | [ticket/10399] Correctly encoding template component urls (3.1) | Vjacheslav Trushkin | 2011-12-01 | 1 | -7/+7 |
* | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-16 | 1 | -117/+121 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympus | Andreas Fischer | 2011-12-16 | 1 | -117/+121 |
| |\ \ \ \ \ | |||||
| | * | | | | | [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release. | Andreas Fischer | 2011-12-16 | 1 | -117/+121 |
* | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-16 | 5 | -35/+20 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympus | Andreas Fischer | 2011-12-16 | 5 | -34/+20 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10504' into prep-release-3... | Andreas Fischer | 2011-12-16 | 5 | -34/+20 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632 | Joas Schilling | 2011-12-08 | 3 | -15/+9 |
| | | * | | | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408 | Joas Schilling | 2011-12-08 | 2 | -3/+3 |
| | | * | | | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485 | Joas Schilling | 2011-12-08 | 4 | -25/+17 |
* | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-16 | 1 | -2/+16 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympus | Andreas Fischer | 2011-12-16 | 1 | -2/+16 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3... | Andreas Fischer | 2011-12-16 | 1 | -2/+16 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | [ticket/10531] Disallow deleting of the last style | Joas Schilling | 2011-12-15 | 1 | -2/+16 |
| | | |/ / / / / | |||||
* | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-16 | 3 | -129/+116 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympus | Andreas Fischer | 2011-12-16 | 3 | -129/+116 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/revert/8996' into prep-rel... | Andreas Fischer | 2011-12-16 | 3 | -129/+116 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 | Joas Schilling | 2011-12-15 | 1 | -15/+11 |
| | | * | | | | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selection | Joas Schilling | 2011-12-15 | 3 | -117/+108 |
| | | |/ / / / / | |||||
* | | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10463' into develop | Andreas Fischer | 2011-12-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | [ticket/10463] removed extra comma in malformed query in acp_styles.php | David King | 2011-12-15 | 1 | -1/+1 |
* | | | | | | | | [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 places | David King | 2011-12-12 | 1 | -3/+3 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'develop-olympus' into develop | Nils Adermann | 2011-12-09 | 3 | -1/+28 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympus | Nils Adermann | 2011-12-09 | 3 | -1/+28 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | [ticket/10319] Missing hidden fields in search form | Vjacheslav Trushkin | 2011-12-09 | 3 | -1/+28 |
* | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'p/ticket/10511' into develop-olympus | Andreas Fischer | 2011-12-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | [ticket/10511] Fix a grammar defect in permissions language. | Oleg Pudeyev | 2011-12-03 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'p/ticket/9876' into develop-olympus | Andreas Fischer | 2011-12-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/9876] Distinctly name user and forum roles for newly registered users. | Oleg Pudeyev | 2011-12-03 | 1 | -2/+2 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge branch 'develop-olympus' into develop | Oleg Pudeyev | 2011-12-03 | 1 | -0/+137 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'bantu/ticket/10434' into develop-olympus | Oleg Pudeyev | 2011-12-03 | 1 | -0/+137 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | [ticket/10434] Add script for creating search index from CLI. | Andreas Fischer | 2011-10-30 | 1 | -0/+137 |
* | | | | | | | | | Merge branch 'develop-olympus' into develop | Oleg Pudeyev | 2011-12-03 | 3 | -50/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus | Oleg Pudeyev | 2011-12-03 | 3 | -50/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | [ticket/10349] Removed duplicated functions from schema loading in tests | Patrick Webster | 2011-10-29 | 1 | -1/+0 |
| | * | | | | | | | | [ticket/10349] Use new schema comment function in installer | Patrick Webster | 2011-09-28 | 3 | -50/+11 |
* | | | | | | | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2011-12-04 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |