aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-0/+2
|\
| * Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
| |\
| | * [ticket/9681] Add password length to security settingsIgor Wiedler2011-12-231-0/+2
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-252-48/+66
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'p/ticket/10428' into develop-olympusAndreas Fischer2011-12-252-48/+66
| |\ \
| | * | [ticket/10428] Documentation for optionget/optionset functions.Oleg Pudeyev2011-12-252-4/+36
| | * | [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.Oleg Pudeyev2011-12-252-32/+24
| | * | [ticket/10428] Dispose of $this->keyvalues cache for optionget.Oleg Pudeyev2011-12-251-8/+2
| | * | [ticket/10428] Compare $data to false strictly.Oleg Pudeyev2011-12-252-8/+8
| | |/
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'Dickyf/ticket/10542' into develop-olympusAndreas Fischer2011-12-251-1/+1
| |\ \
| | * | [ticket/10542] Remove class="postlink" in subsilver2 faq_body.htmlRichard Foote2011-12-241-1/+1
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-241-1/+6
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympusOleg Pudeyev2011-12-241-1/+6
| |\ \ \
| | * | | [ticket/10507] Sort styles in acpVjacheslav Trushkin2011-12-151-1/+6
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [ticket/10546] Add missing argument to adm_back_link in acp_captcha.Oleg Pudeyev2011-12-231-1/+1
| | |_|/ | |/| |
| * | | Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympusOleg Pudeyev2011-12-222-15/+15
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-041-5/+5
| | * | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-011-10/+10
* | | | Merge remote-tracking branch 'imkingdavid/ticket/10541' into developOleg Pudeyev2011-12-221-1/+1
|\ \ \ \
| * | | | [ticket/10541] Fixed empty drop-down menu bugDavid King2011-12-211-1/+1
* | | | | Merge remote-tracking branch 'cyberalien/ticket/develop/10399' into developOleg Pudeyev2011-12-221-7/+7
|\ \ \ \ \
| * | | | | [ticket/10399] Correctly encoding template component urls (3.1)Vjacheslav Trushkin2011-12-011-7/+7
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-117/+121
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-117/+121
| |\ \ \ \ \
| | * | | | | [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.Andreas Fischer2011-12-161-117/+121
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-165-35/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-165-34/+20
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10504' into prep-release-3...Andreas Fischer2011-12-165-34/+20
| | |\ \ \ \ \
| | | * | | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632Joas Schilling2011-12-083-15/+9
| | | * | | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408Joas Schilling2011-12-082-3/+3
| | | * | | | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485Joas Schilling2011-12-084-25/+17
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-2/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-2/+16
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3...Andreas Fischer2011-12-161-2/+16
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/10531] Disallow deleting of the last styleJoas Schilling2011-12-151-2/+16
| | | |/ / / / /
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-163-129/+116
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-163-129/+116
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/revert/8996' into prep-rel...Andreas Fischer2011-12-163-129/+116
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2Joas Schilling2011-12-151-15/+11
| | | * | | | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selectionJoas Schilling2011-12-153-117/+108
| | | |/ / / / /
* | | | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10463' into developAndreas Fischer2011-12-161-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | [ticket/10463] removed extra comma in malformed query in acp_styles.phpDavid King2011-12-151-1/+1
* | | | | | | | [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 placesDavid King2011-12-121-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-12-093-1/+28
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-093-1/+28
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-093-1/+28
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'p/ticket/10511' into develop-olympusAndreas Fischer2011-12-081-1/+1
| |\ \ \ \ \ \