aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into ↵Andreas Fischer2012-01-0220-34/+19
|\ | | | | | | | | | | | | | | | | develop-olympus * unknownbliss/ticket/9916-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header
| * [ticket/9916] Changing header in non-distributed filesUnknown2012-01-0219-31/+17
| | | | | | | | PHPBB3-9916
| * [ticket/9916] Changing coding guidelines licenseUnknown2012-01-021-3/+2
| | | | | | | | PHPBB3-9916
* | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2012-01-011-0/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Bumping version number for 3.0.10 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * [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
|\ \ | | | | | | | | | | | | * bantu/ticket/10538: [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
| * | [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
| | | | | | | | | | | | PHPBB3-10538
* | | Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/9681: [ticket/9681] Add password length to security settings
| * | | [ticket/9681] Add password length to security settingsIgor Wiedler2011-12-231-0/+2
| | | | | | | | | | | | | | | | PHPBB3-9681
* | | | Merge remote-tracking branch 'p/ticket/10428' into develop-olympusAndreas Fischer2011-12-252-48/+66
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10428: [ticket/10428] Documentation for optionget/optionset functions. [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. [ticket/10428] Dispose of $this->keyvalues cache for optionget. [ticket/10428] Compare $data to false strictly.
| * | | | [ticket/10428] Documentation for optionget/optionset functions.Oleg Pudeyev2011-12-252-4/+36
| | | | | | | | | | | | | | | | | | | | PHPBB3-10428
| * | | | [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.Oleg Pudeyev2011-12-252-32/+24
| | | | | | | | | | | | | | | | | | | | PHPBB3-10428
| * | | | [ticket/10428] Dispose of $this->keyvalues cache for optionget.Oleg Pudeyev2011-12-251-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not work properly when custom $data is provided, and making it work will make the code so complicated that any benefits from having this cache in the first place will be nullified. Just get rid of it. PHPBB3-10428
| * | | | [ticket/10428] Compare $data to false strictly.Oleg Pudeyev2011-12-252-8/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Users may pass 0 or '' for $data, this should cause the user-specified $data code path to be taken. PHPBB3-10428
* | | | Merge remote-tracking branch 'Dickyf/ticket/10542' into develop-olympusAndreas Fischer2011-12-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * Dickyf/ticket/10542: [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
| * | | | [ticket/10542] Remove class="postlink" in subsilver2 faq_body.htmlRichard Foote2011-12-241-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | class="postlink" is not defined in stylesheet.css so remove it from styles/subsilver2/template/faq_body.html PHPBB3-10542
* | | | Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympusOleg Pudeyev2011-12-241-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10507: [ticket/10507] DBAL unit test [ticket/10507] Sort styles in acp
| * | | | [ticket/10507] Sort styles in acpVjacheslav Trushkin2011-12-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort styles by name in admin control panel PHPBB3-10507
* | | | | [ticket/10546] Add missing argument to adm_back_link in acp_captcha.Oleg Pudeyev2011-12-231-1/+1
| |_|/ / |/| | | | | | | | | | | PHPBB3-10546
* | | | Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympusOleg Pudeyev2011-12-222-15/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * cyberalien/ticket/10399: [ticket/10399] Correctly encoding template component urls (3.0) [ticket/10399] Correctly encoding template component urls (3.0)
| * | | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Changes in style.php PHPBB3-10399
| * | | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-011-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Correctly encoding template component urls PHPBB3-10399
* | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-117/+121
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
| * | | [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
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10504' into ↵Andreas Fischer2011-12-165-34/+20
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10504: [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408 [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
| | * | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632Joas Schilling2011-12-083-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/6632] Better viewing of topics for wide screen displays" This reverts commit bb733b0204aef71c40290a9c8db8ad0a7e3e3d0a. PHPBB3-6632 PHPBB3-10504
| | * | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408Joas Schilling2011-12-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/10408] Layout of topics/attachments list is broken in UCP and MCP" This reverts commit 88aacd0f2cffdf75af71d749c6ea602ed3912651. PHPBB3-6632 PHPBB3-10408 PHPBB3-10504
| | * | | [ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485Joas Schilling2011-12-084-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632" This reverts commit c67633577f276727e1d15106a87517b97c8a4d1a. PHPBB3-6632 PHPBB3-10485 PHPBB3-10504
* | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-2/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10531] Disallow deleting of the last style
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10531' into ↵Andreas Fischer2011-12-161-2/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10531: [ticket/10531] Disallow deleting of the last style
| | * | | | [ticket/10531] Disallow deleting of the last styleJoas Schilling2011-12-151-2/+16
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from PHPBB3-9675 commit 0e02f5cb0b7f615f1eadd6606a89bfd1b28f0d0d PHPBB3-9675 PHPBB3-10531
* | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-163-129/+116
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 [ticket/8996] Revert initial fix to keep old behaviour on empty selection
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/revert/8996' into ↵Andreas Fischer2011-12-163-129/+116
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/revert/8996: [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2 [ticket/8996] Revert initial fix to keep old behaviour on empty selection
| | * | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2Joas Schilling2011-12-151-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey" This reverts commit 219bdbaf7044bd203755ed138d109cf39ccdb837. PHPBB3-8996
| | * | | | [ticket/8996] Revert initial fix to keep old behaviour on empty selectionJoas Schilling2011-12-153-117/+108
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp" This reverts commit eb1f15bc8b7b7a284b25b2c9b9942714b6848ebc. PHPBB3-8996
* | | | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-093-1/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10319] Missing hidden fields in search form
| * | | | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-093-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing hidden fields in search form (bug added in 3.0.9) PHPBB3-10319
* | | | | Merge remote-tracking branch 'p/ticket/10511' into develop-olympusAndreas Fischer2011-12-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10511: [ticket/10511] Fix a grammar defect in permissions language.
| * | | | | [ticket/10511] Fix a grammar defect in permissions language.Oleg Pudeyev2011-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10511
* | | | | | Merge remote-tracking branch 'p/ticket/9876' into develop-olympusAndreas Fischer2011-12-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/9876: [ticket/9876] Distinctly name user and forum roles for newly registered users.
| * | | | | | [ticket/9876] Distinctly name user and forum roles for newly registered users.Oleg Pudeyev2011-12-031-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9876
* | | | | | Merge remote-tracking branch 'bantu/ticket/10434' into develop-olympusOleg Pudeyev2011-12-031-0/+137
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10434: [ticket/10434] Add script for creating search index from CLI.
| * | | | | | [ticket/10434] Add script for creating search index from CLI.Andreas Fischer2011-10-301-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10434
* | | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-033-50/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10349: [ticket/10349] Removed duplicated functions from schema loading in tests [ticket/10349] Update function comment [ticket/10349] Use new schema comment function in installer [ticket/10349] Unit tests: Consolidate schema comment removal functions [ticket/10349] Unit tests: Remove comments while loading schema files
| * | | | | | | [ticket/10349] Removed duplicated functions from schema loading in testsPatrick Webster2011-10-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10349
| * | | | | | | [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-283-50/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what now runs in the unit tests. The COMMENTS field in the dbms data is no longer needed, so it has been removed. PHPBB3-10349
* | | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-041-1/+6
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | | | | | | [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
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | * prep-release-3.0.10: [ticket/10503] Debug error "Invalid arguments" when previewing edits
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-15 10:53:05 +0000