aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-...Andreas Fischer2012-01-0220-34/+19
|\
| * [ticket/9916] Changing header in non-distributed filesUnknown2012-01-0219-31/+17
| * [ticket/9916] Changing coding guidelines licenseUnknown2012-01-021-3/+2
* | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2012-01-011-0/+6
|\ \ | |/ |/|
| * [prep-release-3.0.10] Bumping version number for 3.0.10 final.Andreas Fischer2012-01-013-3/+9
* | Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympusIgor Wiedler2011-12-281-3/+3
|\ \
| * | [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
* | | 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 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 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 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
* | | | | [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 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 '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 '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 '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 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 remote-tracking branch 'p/ticket/10511' into develop-olympusAndreas Fischer2011-12-081-1/+1
|\ \ \ \ \
| * | | | | [ticket/10511] Fix a grammar defect in permissions language.Oleg Pudeyev2011-12-031-1/+1
* | | | | | Merge remote-tracking branch 'p/ticket/9876' into develop-olympusAndreas Fischer2011-12-081-2/+2
|\ \ \ \ \ \
| * | | | | | [ticket/9876] Distinctly name user and forum roles for newly registered users.Oleg Pudeyev2011-12-031-2/+2
| |/ / / / /
* | | | | | Merge remote-tracking branch 'bantu/ticket/10434' into develop-olympusOleg Pudeyev2011-12-031-0/+137
|\ \ \ \ \ \
| * | | | | | [ticket/10434] Add script for creating search index from CLI.Andreas Fischer2011-10-301-0/+137
* | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-033-50/+10
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10349] Removed duplicated functions from schema loading in testsPatrick Webster2011-10-291-1/+0
| * | | | | | | [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-283-50/+11
* | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-041-1/+6
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-043-4/+9
* | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-041-3/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |