makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
13165 commits 18 branches 192 tags 206 MiB
Commit graph

13165 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
6472a270e0 [ticket/10345] Add cases for 1 pixel height on MAX_FLASH and MAX_IMG sizes 
PHPBB3-10345
 2011-11-27 21:43:07 +01:00
Joas Schilling
2fac1d4c23 [ticket/10345] Fix parsing error in language/en/viewtopic.php 
PHPBB3-10345
 2011-11-27 21:41:22 +01:00
Andreas Fischer
2b3319c239 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
 2011-11-27 16:24:02 +01:00
Andreas Fischer
fc47fa06a3 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release.
 2011-11-27 16:23:53 +01:00
Andreas Fischer
799be4469a [prep-release-3.0.10] Update Changelog for 3.0.10-RC2 release. 2011-11-27 16:23:15 +01:00
Andreas Fischer
6215740112 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:13:18 +01:00
Andreas Fischer
ede3963951 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:13:11 +01:00
Andreas Fischer
b89320ad39 Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10 
* rxu/ticket/10497:
  [ticket/10497] Fix SQL error when guest visits forum with unread topic
 2011-11-27 16:12:39 +01:00
rxu
77e00d14a1 [ticket/10497] Fix SQL error when guest visits forum with unread topic 
Regression from the ticket PHPBB3-9008 fix.

When topic marking was enabled for guests, and a guest visited a forum with
a new topic which is marked unread, the built SQL missed an alias for a
TOPICS_TABLE which resulted in the following error:

Unknown column 't.topic_approved' in 'where clause' [1054]

The fix is to add an alias for the table.

PHPBB3-10497
PHPBB3-9008
 2011-11-27 23:11:22 +08:00
Oleg Pudeyev
92cdf08d48 [ticket/10093] Use color in commit-msg hook warning/error messages. 
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
 2011-11-26 18:06:38 -05:00
Oleg Pudeyev
6a3ee0996e [ticket/10093] Refactor complaining in commit-msg hook for color support. 
PHPBB3-10093
 2011-11-26 17:41:25 -05:00
Oleg Pudeyev
26d01d4408 [ticket/10093] Respect phpbb.hooks.commit-msg.fatal on syntax errors. 
PHPBB3-10093
 2011-11-26 17:35:35 -05:00
Oleg Pudeyev
0cb83f99ab [ticket/10093] Document phpbb.hooks.commit-msg.fatal setting. 
PHPBB3-10093
 2011-11-26 17:32:40 -05:00
Andreas Fischer
791464258f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

Conflicts:
	phpBB/install/database_update.php
 2011-11-26 22:26:59 +01:00
Andreas Fischer
7520b27639 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
 2011-11-26 22:20:32 +01:00
Andreas Fischer
007457f182 [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. 2011-11-26 22:17:43 +01:00
Joas Schilling
454280c6e8 [ticket/10345] Move rule determination code into a new function 
PHPBB3-10345
 2011-11-25 15:10:51 -05:00
Joas Schilling
6c69bdb734 [ticket/10345] Fix little type in unit test 
PHPBB3-10345
 2011-11-25 15:10:51 -05:00
Joas Schilling
3788326d71 [ticket/10345] Remove more useless 0-cases 
PHPBB3-10345
 2011-11-25 15:10:51 -05:00
Joas Schilling
33e3bf4f64 [ticket/10345] Make the use of the 0-case optional 
And correctly determinate the rule otherwise

PHPBB3-10345
 2011-11-25 15:10:51 -05:00
Joas Schilling
7da6826a67 [ticket/10345] Remove some unused 0 cases 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
c4aa8d8401 [ticket/10345] Fix some last use cases of sprintf() to use $user->lang() 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
814220f1c1 [ticket/10345] Add tests for array() as first parameter on call to $user->lang() 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
4c2c842a7d [ticket/10345] Fix some documentation issues. 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
2de7153afd [ticket/10345] Allow float as array key and add some tests 
Added tests for the fallback when a key is missing and the float-feature.

PHPBB3-10345
 2011-11-25 15:10:49 -05:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places. 
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
 2011-11-25 15:10:49 -05:00
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