mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
12,227 Commits 17 Branches 190 Tags
Commit Graph

12227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places 
PHPBB3-10345
 2011-11-25 15:10:44 -05:00
Joas Schilling
0734dd3c42 [ticket/10345] Remove '1 hour ago' string which conflicted with plural rules 
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
 2011-11-25 15:04:31 -05:00
Joas Schilling
f16d72fcfb [ticket/10345] Fix documentation on the new function and the switch 
Also do not min/max the value, but throw an error on an invalid Plural rule.

PHPBB3-10345
 2011-11-25 15:04:31 -05:00
Joas Schilling
757fcd3e63 [ticket/10345] Add a system to allow multiple plural forms 
See http://wiki.phpbb.com/Plural_Rules for explanation and examples.

PHPBB3-10345
 2011-11-25 15:04:30 -05:00
Andreas Fischer
c4e29bde23 Merge remote-tracking branch 'p/ticket/10481' into develop 
* p/ticket/10481:
  [ticket/10481] Use phar:// url for requiring goutte.
  [ticket/10481] Skip functional tests if phar extension is missing.
 2011-11-25 19:37:59 +01:00
Andreas Fischer
79443eb1d4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10280] Change the display of user activation settings in the ACP.
 2011-11-25 18:15:00 +01:00
Andreas Fischer
f856cc2ef6 Merge remote-tracking branch 'p/ticket/10280' into develop-olympus 
* p/ticket/10280:
  [ticket/10280] Change the display of user activation settings in the ACP.
 2011-11-25 18:13:58 +01:00
RMcGirr83
3ce5b1d386 [ticket/10280] Change the display of user activation settings in the ACP. 
Use a select box to be consistent with other settings.

PHPBB3-10280
 2011-11-25 01:27:44 -05:00
Oleg Pudeyev
7b4fd00ae5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10483] Fix test suite when running with MySQL strict mode
 2011-11-25 01:08:05 -05:00
Oleg Pudeyev
372698218a Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10483] Fix test suite when running with MySQL strict mode
 2011-11-25 01:08:01 -05:00
Oleg Pudeyev
e08e22ca12 Merge remote-tracking branch 'igorw/ticket/10483' into prep-release-3.0.10 
* igorw/ticket/10483:
  [ticket/10483] Fix test suite when running with MySQL strict mode
 2011-11-25 01:07:40 -05:00
Oleg Pudeyev
90a7f55831 Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop 
* nickvergessen/ticket/10484:
  [ticket/10484] Use variables for sql_build_query() calls

Conflicts:
	phpBB/includes/mcp/mcp_front.php
 2011-11-24 21:51:10 -05:00
Oleg Pudeyev
6b2b98d855 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
 2011-11-24 21:38:35 -05:00
Oleg Pudeyev
58e35759d9 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
 2011-11-24 21:33:44 -05:00
Oleg Pudeyev
b531e02871 Merge remote-tracking branch 'nickvergessen/ticket/10485' into prep-release-3.0.10 
* nickvergessen/ticket/10485:
  [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632
 2011-11-24 21:32:50 -05:00
Oleg Pudeyev
2ddc4acd90 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10486] Create git shortlog and git diff --stat in build script.
 2011-11-24 20:14:09 -05:00
Oleg Pudeyev
a29a9266e3 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10486] Create git shortlog and git diff --stat in build script.
 2011-11-24 20:14:03 -05:00
Oleg Pudeyev
39c62cd175 Merge remote-tracking branch 'bantu/ticket/10486' into prep-release-3.0.10 
* bantu/ticket/10486:
  [ticket/10486] Create git shortlog and git diff --stat in build script.
 2011-11-24 19:58:53 -05:00
Oleg Pudeyev
ba1603a5f0 [ticket/10481] Use phar:// url for requiring goutte. 
It does not seem to work on my machine without phar:// even with
phar extension installed.

PHPBB3-10481
 2011-11-24 14:16:58 -05:00
Oleg Pudeyev
44cab5696f [ticket/10481] Skip functional tests if phar extension is missing. 
PHPBB3-10481
 2011-11-24 14:03:09 -05:00
Oleg Pudeyev
3d17816812 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
 2011-11-23 20:50:06 -05:00
Oleg Pudeyev
6f41f96444 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
 2011-11-23 20:50:01 -05:00
Oleg Pudeyev
3eda9cfc07 Merge remote-tracking branch 'bantu/ticket/10488' into prep-release-3.0.10 
* bantu/ticket/10488:
  [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
 2011-11-23 20:48:39 -05:00
Oleg Pudeyev
817ef638d1 Merge branch 'develop-olympus' into develop 
* 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.
 2011-11-23 20:39:29 -05:00
Oleg Pudeyev
d13ce7f560 Merge branch 'prep-release-3.0.10' into develop-olympus 
* 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.
 2011-11-23 20:39:11 -05:00
Oleg Pudeyev
74bca1d97b Merge remote-tracking branch 'bantu/ticket/10461' into prep-release-3.0.10 
* 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.
 2011-11-23 20:38:58 -05:00
Oleg Pudeyev
4b8f00f649 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10479] Remove PostgreSQL version numbers from driver's language string
 2011-11-23 18:39:48 -05:00
Oleg Pudeyev
cd60073a52 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10479] Remove PostgreSQL version numbers from driver's language string
 2011-11-23 18:39:39 -05:00
Oleg Pudeyev
4cd88199c9 Merge remote-tracking branch 'nickvergessen/ticket/10479' into prep-release-3.0.10 
* nickvergessen/ticket/10479:
  [ticket/10479] Remove PostgreSQL version numbers from driver's language string
 2011-11-23 18:37:11 -05:00
Oleg Pudeyev
a72ea2bc98 [ticket/10461] Add a comment explaining the logic here. 
PHPBB3-10461
 2011-11-23 18:15:45 -05:00
Andreas Fischer
6f40960071 [ticket/10461] Correct $log_count check in view_log() so we show logs again. 
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
 2011-11-23 23:03:41 +01:00
Andreas Fischer
43818289fe [ticket/10488] Only set $config['email_max_chunk_size'] when not already set. 
PHPBB3-10488
 2011-11-23 22:30:40 +01:00
Andreas Fischer
0d3697e40c [ticket/10486] Create git shortlog and git diff --stat in build script. 
PHPBB3-10486
 2011-11-22 20:59:51 +01:00
Joas Schilling
c67633577f [ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632 
Remove the previous fix and fix it the way we did it in PHPBB3-10360 for 3.1

PHPBB3-6632
PHPBB3-10485
 2011-11-21 23:23:02 +01:00
Joas Schilling
4c77903129 [ticket/10484] Use variables for sql_build_query() calls 
It's easier for mods/extensions to extend the arrays.

PHPBB3-10484
 2011-11-21 16:22:07 +01:00
Igor Wiedler
aef3652d7a [ticket/10483] Fix test suite when running with MySQL strict mode 
PHPBB3-10483
 2011-11-21 13:09:27 +01:00
Oleg Pudeyev
4378c0f85b Merge remote-tracking branch 'igorw/ticket/10323' into develop 
* igorw/ticket/10323:
  [ticket/10323] slight potential performance improvement
  [ticket/10323] make finder work with PHP 5.2
 2011-11-20 22:37:24 -05:00
Andreas Fischer
c67ca0ac99 Merge branch 'develop-olympus' into develop 
* 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
 2011-11-21 01:08:43 +01:00
Andreas Fischer
a9d7b1f9a1 [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus. 2011-11-21 00:57:53 +01:00
Joas Schilling
c4d3c5320e [ticket/10479] Remove PostgreSQL version numbers from driver's language string 
The versions should be removed like for all other DBMS so we don't have to add
each new version.

PHPBB3-10479
 2011-11-21 00:12:44 +01:00
Igor Wiedler
f5633d281e [develop-olympus] Add changelog for 3.0.10-RC1 release-3.0.10-RC1 2011-11-21 00:08:49 +01:00
Andreas Fischer
3e43b53a63 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. 2011-11-20 21:50:29 +01:00
Andreas Fischer
06ae98b1e5 [develop-olympus] Bumping version numbers to final for 3.0.10 releases. 2011-11-20 21:41:24 +01:00
Igor Wiedler
d766ee3fe6 Merge branch 'develop-olympus' into develop 
* 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
 2011-11-20 18:45:56 +01:00
Igor Wiedler
92e1681761 Merge remote-tracking branch 'bantu/ticket/10446' into develop-olympus 
* bantu/ticket/10446:
  [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.
 2011-11-20 18:43:27 +01:00
Andreas Fischer
37c7668193 [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). 
PHPBB3-10446
 2011-11-20 16:35:31 +01:00
Andreas Fischer
a7077c9149 [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers(). 
PHPBB3-10446
 2011-11-20 14:02:22 +01:00
Oleg Pudeyev
c68973a9e0 [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers. 
PHPBB3-10446
 2011-11-20 04:17:42 -05:00
Oleg Pudeyev
64d62038cd [ticket/10446] DRY X-AntiAbuse header addition. 
PHPBB3-10446
 2011-11-20 04:15:44 -05:00
Oleg Pudeyev
08032068c0 Merge remote-tracking branch 'nickvergessen/ticket/10344' into develop 
* nickvergessen/ticket/10344:
  [ticket/10344] Add attachment icons to list of reported and queued posts/topics
 2011-11-20 00:46:45 -05:00