aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10500] Fix phpbb_template_compile instantiation.Oleg Pudeyev2011-12-031-1/+1
| | | | | | The required $allow_php argument was missing. PHPBB3-10500
* 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
| * | | | | | [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functionsJoas Schilling2011-11-305-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizesJoas Schilling2011-11-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Fix parsing error in language/en/viewtopic.phpJoas Schilling2011-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Move rule determination code into a new functionJoas Schilling2011-11-252-153/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Remove more useless 0-casesJoas Schilling2011-11-256-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Make the use of the 0-case optionalJoas Schilling2011-11-251-34/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And correctly determinate the rule otherwise PHPBB3-10345
| * | | | | | [ticket/10345] Remove some unused 0 casesJoas Schilling2011-11-255-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-254-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Fix some documentation issues.Joas Schilling2011-11-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Allow float as array key and add some testsJoas Schilling2011-11-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests for the fallback when a key is missing and the float-feature. PHPBB3-10345
| * | | | | | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-2526-101/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I added two function avatar_explanation_string() and avatar_error_wrong_size() for easier handling of the "pixels"-languages, as they are used quite often. PHPBB3-10345
| * | | | | | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-2537-271/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10345
| * | | | | | [ticket/10345] Remove '1 hour ago' string which conflicted with plural rulesJoas Schilling2011-11-252-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This message was only viewed for 1 second anyway, as floor($delta / 60) is only 60 for 3600 to 3660, but the code was limited to $delta <= 3600 PHPBB3-10345
| * | | | | | [ticket/10345] Fix documentation on the new function and the switchJoas Schilling2011-11-252-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also do not min/max the value, but throw an error on an invalid Plural rule. PHPBB3-10345
| * | | | | | [ticket/10345] Add a system to allow multiple plural formsJoas Schilling2011-11-252-1/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://wiki.phpbb.com/Plural_Rules for explanation and examples. PHPBB3-10345
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-12-011-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-011-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10480] Add a build target for changelog building. [ticket/10480] Add a build script for exporting the changelog from tracker. [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| | * | | | | Merge remote-tracking branch 'github-bantu/ticket/10502' into ↵Nils Adermann2011-12-011-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * github-bantu/ticket/10502: [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
| | | * | | | | [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.Andreas Fischer2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10502
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-291-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10501] Fix description of table prefixes
| * | | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-291-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10501] Fix description of table prefixes
| | * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10501' into ↵Andreas Fischer2011-11-291-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10501: [ticket/10501] Fix description of table prefixes
| | | * | | | | [ticket/10501] Fix description of table prefixesJoas Schilling2011-11-281-2/+2
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They must start with a letter, not an alphanumeric character PHPBB3-10501
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-281-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-281-1/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
| | * | | | | [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.Andreas Fischer2011-11-281-1/+0
| | |/ / / /
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-0/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
| * | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-0/+8
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
| | * | | | [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.Andreas Fischer2011-11-271-0/+8
| | | | | |
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-271-5/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10497] Fix SQL error when guest visits forum with unread topic