aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-31280-516/+281
| | | | PHPBB3-9916
* Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-117/+121
|\ | | | | | | | | * develop-olympus: [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
| * 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 'develop-olympus' into developAndreas Fischer2011-12-165-35/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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 Conflicts: phpBB/styles/prosilver/template/forumlist_body.html phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * | 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 'develop-olympus' into developAndreas Fischer2011-12-161-2/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10531] Disallow deleting of the last style Conflicts: phpBB/includes/acp/acp_styles.php
| * | | 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 'develop-olympus' into developAndreas Fischer2011-12-163-129/+116
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * develop-olympus: [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 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 remote-tracking branch 'imkingdavid/ticket/10463' into developAndreas Fischer2011-12-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10463: [ticket/10463] removed extra comma in malformed query in acp_styles.php
| * | | | [ticket/10463] removed extra comma in malformed query in acp_styles.phpDavid King2011-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10463
* | | | | [ticket/10524] Changed Olympus to Ascraeus in Coding Docs in 3 placesDavid King2011-12-121-3/+3
|/ / / / | | | | | | | | | | | | PHPBB3-10524
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-12-093-1/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10319] Missing hidden fields in search form
| * | | 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 branch 'develop-olympus' into developAndreas Fischer2011-12-081-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10511] Fix a grammar defect in permissions language.
| * | | 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 branch 'develop-olympus' into developAndreas Fischer2011-12-081-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9876] Distinctly name user and forum roles for newly registered users.
| * | | | 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 branch 'develop-olympus' into developOleg Pudeyev2011-12-031-0/+137
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10434] Add script for creating search index from CLI.
| * | | | 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 branch 'develop-olympus' into developOleg Pudeyev2011-12-033-50/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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
| * | | | | 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 'develop-olympus' into developAndreas Fischer2011-12-041-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. Conflicts: phpBB/install/database_update.php
| * | | | | | 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 'develop-olympus' into developAndreas Fischer2011-12-041-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10503] Debug error "Invalid arguments" when previewing edits
| * | | | | | 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
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/10503' into ↵Andreas Fischer2011-12-041-3/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10503: [ticket/10503] Debug error "Invalid arguments" when previewing edits
| | | * | | | [ticket/10503] Debug error "Invalid arguments" when previewing editsJoas Schilling2011-11-281-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty value of poll_options should be an empty array, so that sizeof() is 0. PHPBB3-9776 PHPBB3-10503
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into developOleg Pudeyev2011-12-0350-400/+675
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/develop/10345: (21 commits) [ticket/10345] Check directly whether the key to use exists [ticket/10345] Return the language key when the key has an empty array [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form [ticket/10345] Remove doubled check for valid plural rule [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes [ticket/10345] Fix parsing error in language/en/viewtopic.php [ticket/10345] Move rule determination code into a new function [ticket/10345] Fix little type in unit test [ticket/10345] Remove more useless 0-cases [ticket/10345] Make the use of the 0-case optional [ticket/10345] Remove some unused 0 cases [ticket/10345] Fix some last use cases of sprintf() to use $user->lang() [ticket/10345] Add tests for array() as first parameter on call to $user->lang() [ticket/10345] Fix some documentation issues. [ticket/10345] Allow float as array key and add some tests [ticket/10345] Use the plural function in some more places. [ticket/10345] Make use of the plural function in some basic places [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules [ticket/10345] Fix documentation on the new function and the switch ...
| * | | | | | | [ticket/10345] Check directly whether the key to use existsJoas Schilling2011-11-301-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | | [ticket/10345] Return the language key when the key has an empty arrayJoas Schilling2011-11-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | | [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_formJoas Schilling2011-11-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The numbers are floored by casting to int. PHPBB3-10345
| * | | | | | | [ticket/10345] Remove doubled check for valid plural ruleJoas Schilling2011-11-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-16 04:09:41 +0000