aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [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 developAndreas Fischer2011-11-251-11/+15
|\ | | | | | | | | * develop-olympus: [ticket/10280] Change the display of user activation settings in the ACP.
| * [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
| | | | | | | | | | | | Use a select box to be consistent with other settings. PHPBB3-10280
| * Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-244-17/+25
| |\ | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
| | * Merge remote-tracking branch 'nickvergessen/ticket/10485' into ↵Oleg Pudeyev2011-11-244-17/+25
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10485: [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
| | | * [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632Joas Schilling2011-11-214-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1 PHPBB3-6632 PHPBB3-10485
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10484' into developOleg Pudeyev2011-11-247-38/+47
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10484: [ticket/10484] Use variables for sql_build_query() calls Conflicts: phpBB/includes/mcp/mcp_front.php
| * | | | [ticket/10484] Use variables for sql_build_query() callsJoas Schilling2011-11-217-38/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's easier for mods/extensions to extend the arrays. PHPBB3-10484
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+6
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * develop-olympus: [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+6
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * prep-release-3.0.10: [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| | * | | Merge remote-tracking branch 'bantu/ticket/10488' into prep-release-3.0.10Oleg Pudeyev2011-11-231-1/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10488: [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
| | | * | | [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.Andreas Fischer2011-11-231-1/+6
| | | | |/ | | | |/| | | | | | | | | | | PHPBB3-10488
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| | * | | Merge remote-tracking branch 'bantu/ticket/10461' into prep-release-3.0.10Oleg Pudeyev2011-11-231-1/+5
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10461: [ticket/10461] Add a comment explaining the logic here. [ticket/10461] Correct $log_count check in view_log() so we show logs again.
| | | * | | [ticket/10461] Add a comment explaining the logic here.Oleg Pudeyev2011-11-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10461
| | | * | | [ticket/10461] Correct $log_count check in view_log() so we show logs again.Andreas Fischer2011-11-231-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We pass $log_count as false now when we do not need to know how many log entries there are. However when $log_count is false, $log_count == 0 will be true as well and thus we will return early with 0. PHPBB3-9874 PHPBB3-10461
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10479] Remove PostgreSQL version numbers from driver's language string
| * | | | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * prep-release-3.0.10: [ticket/10479] Remove PostgreSQL version numbers from driver's language string
| | * | | Merge remote-tracking branch 'nickvergessen/ticket/10479' into ↵Oleg Pudeyev2011-11-231-1/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.10 * nickvergessen/ticket/10479: [ticket/10479] Remove PostgreSQL version numbers from driver's language string
| | | * | [ticket/10479] Remove PostgreSQL version numbers from driver's language stringJoas Schilling2011-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The versions should be removed like for all other DBMS so we don't have to add each new version. PHPBB3-10479
* | | | | Merge remote-tracking branch 'igorw/ticket/10323' into developOleg Pudeyev2011-11-201-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/10323: [ticket/10323] slight potential performance improvement [ticket/10323] make finder work with PHP 5.2
| * | | | | [ticket/10323] slight potential performance improvementIgor Wiedler2011-11-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
| * | | | | [ticket/10323] make finder work with PHP 5.2Igor Wiedler2011-11-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10323
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-213-22/+150
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus. [develop-olympus] Add changelog for 3.0.10-RC1 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.10 releases. Conflicts: phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| * | | | | [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.Andreas Fischer2011-11-213-3/+3
| | |/ / / | |/| | |
| * | | | [develop-olympus] Add changelog for 3.0.10-RC1Igor Wiedler2011-11-211-18/+144
| | | | |
| * | | | [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-203-5/+7
| | | | |
| * | | | [develop-olympus] Bumping version numbers to final for 3.0.10 releases.Andreas Fischer2011-11-2010-11/+11
| | | | |
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-2010-48/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. [ticket/10446] DRY X-AntiAbuse header addition. Conflicts: phpBB/includes/ucp/ucp_register.php
| * | | | [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-2010-15/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().Andreas Fischer2011-11-201-1/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.Oleg Pudeyev2011-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10446
| * | | | [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-2010-50/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-10446
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10344' into developOleg Pudeyev2011-11-208-19/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10344: [ticket/10344] Add attachment icons to list of reported and queued posts/topics
| * | | | | [ticket/10344] Add attachment icons to list of reported and queued posts/topicsJoas Schilling2011-08-278-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10344
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-201-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * develop-olympus: [ticket/10402] Fixed a formatting issue with report details.
| * | | | | Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympusOleg Pudeyev2011-11-201-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10402: [ticket/10402] Fixed a formatting issue with report details.
| | * | | | | [ticket/10402] Fixed a formatting issue with report details.Callum Macrae2011-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Line returns were being removed and links weren't being made clickable. This commit adds a line (contributed by AmigoJack) to retain the link breaks and make links clickable. PHPBB3-10402
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8599] Added ability to select all to add multiple smilies screen.
| * | | | | | Merge remote-tracking branch 'callumacrae/ticket/8599' into develop-olympusOleg Pudeyev2011-11-191-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/8599: [ticket/8599] Added ability to select all to add multiple smilies screen.
| | * | | | | | [ticket/8599] Added ability to select all to add multiple smilies screen.callumacrae2011-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8599
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-11 18:54:51 +0000