mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-29 20:49:48 +01:00
Code Issues Releases Wiki Activity
12,480 Commits 17 Branches 190 Tags
Commit Graph

12480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vjacheslav Trushkin
74ae7d0339 [ticket/10399] Correctly encoding template component urls (3.0) 
Correctly encoding template component urls

PHPBB3-10399
 2011-12-01 01:46:33 +02:00
Joas Schilling
c1311faebf [ticket/10345] Check directly whether the key to use exists 
PHPBB3-10345
 2011-11-30 21:36:56 +01:00
Joas Schilling
65e6ab5530 [ticket/10345] Return the language key when the key has an empty array 
PHPBB3-10345
 2011-11-30 21:23:00 +01:00
Joas Schilling
dd99675f72 [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_form 
The numbers are floored by casting to int.

PHPBB3-10345
 2011-11-30 21:07:53 +01:00
Joas Schilling
b195fce0a4 [ticket/10345] Remove doubled check for valid plural rule 
PHPBB3-10345
 2011-11-30 21:06:04 +01:00
Joas Schilling
b790d2e283 [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions 
PHPBB3-10345
 2011-11-30 21:03:29 +01:00
Andreas Fischer
af867de77c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:51 +01:00
Andreas Fischer
050fb83dfe Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:38 +01:00
Andreas Fischer
e596d2ca7e Merge remote-tracking branch 'nickvergessen/ticket/10501' into prep-release-3.0.10 
* nickvergessen/ticket/10501:
  [ticket/10501] Fix description of table prefixes
 2011-11-29 20:09:25 +01:00
Andreas Fischer
f351914137 [ticket/10480] Add a build target for changelog building. 
PHPBB3-10480
 2011-11-29 20:05:27 +01:00
Andreas Fischer
4cf059e38f [ticket/10480] Add a build script for exporting the changelog from tracker. 
PHPBB3-10480
 2011-11-29 20:05:21 +01:00
Andreas Fischer
8f1f42cc6c [ticket/10502] Fix typo in changelog. 'red' should have been 'read'. 
PHPBB3-10502
 2011-11-29 19:59:31 +01:00
Andreas Fischer
705730bfa7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
 2011-11-28 23:12:53 +01:00
Andreas Fischer
895501743d Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
 2011-11-28 23:12:44 +01:00
Andreas Fischer
593ac9ed43 [prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog. 2011-11-28 23:10:01 +01:00
Joas Schilling
cb4e72298b [ticket/10501] Fix description of table prefixes 
They must start with a letter, not an alphanumeric character

PHPBB3-10501
 2011-11-28 11:28:46 +01:00
Joas Schilling
f88e89900f [ticket/10503] Debug error "Invalid arguments" when previewing edits 
Empty value of poll_options should be an empty array, so that sizeof() is 0.

PHPBB3-9776
PHPBB3-10503
 2011-11-28 10:35:43 +01:00
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. release-3.0.10-RC2 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