aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-034-88/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-034-88/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-292-44/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10349
| | * | | [ticket/10349] Update function commentPatrick Webster2011-09-281-2/+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
| | * | | [ticket/10349] Unit tests: Consolidate schema comment removal functionsPatrick Webster2011-09-201-58/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-10349
| | * | | [ticket/10349] Unit tests: Remove comments while loading schema filesPatrick Webster2011-09-031-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform the same operations that the installer does when preparing the schema files. These functions come straight from /includes/functions_install.php and /includes/functions_admin.php. PHPBB3-10349
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-042-3/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-042-3/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-044-6/+11
| | | | | |
* | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2011-12-041-28/+72
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10093] Use correct ANSI code for clearing color. [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic. [ticket/10093] Use color in commit-msg hook warning/error messages. [ticket/10093] Refactor complaining in commit-msg hook for color support. [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors. [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
| * | | | | | Merge remote-tracking branch 'p/ticket/10093' into develop-olympusAndreas Fischer2011-12-031-28/+72
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10093: [ticket/10093] Use correct ANSI code for clearing color. [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic. [ticket/10093] Use color in commit-msg hook warning/error messages. [ticket/10093] Refactor complaining in commit-msg hook for color support. [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors. [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.
| | * | | | | [ticket/10093] Use correct ANSI code for clearing color.Oleg Pudeyev2011-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10093
| | * | | | | [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic.Oleg Pudeyev2011-12-031-18/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10093
| | * | | | | [ticket/10093] Use color in commit-msg hook warning/error messages.Oleg Pudeyev2011-11-261-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default color is used if the message is printed to a tty, phpbb.hooks.commit-msg.color configuration setting can override this. PHPBB3-10093
| | * | | | | [ticket/10093] Refactor complaining in commit-msg hook for color support.Oleg Pudeyev2011-11-261-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10093
| | * | | | | [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors.Oleg Pudeyev2011-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10093
| | * | | | | [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting.Oleg Pudeyev2011-11-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10093
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into developOleg Pudeyev2011-12-0351-401/+733
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-302-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Fix little type in unit testJoas Schilling2011-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-35/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Add tests for array() as first parameter on call to $user->lang()Joas Schilling2011-11-251-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-1/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://wiki.phpbb.com/Plural_Rules for explanation and examples. PHPBB3-10345