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
11,077 Commits 17 Branches 190 Tags
Commit Graph

11077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Fischer
74bc2d130d Merge remote-tracking branch 'p/ticket/10093' into develop-olympus 
* 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.
 2011-12-03 23:56:00 +01:00
Oleg Pudeyev
5b9c835127 [ticket/9876] Distinctly name user and forum roles for newly registered users. 
PHPBB3-9876
 2011-12-03 17:44:58 -05:00
Oleg Pudeyev
0ad81a4cdc [ticket/10511] Fix a grammar defect in permissions language. 
PHPBB3-10511
 2011-12-03 17:42:10 -05:00
Oleg Pudeyev
8e59699424 [ticket/10093] Use correct ANSI code for clearing color. 
PHPBB3-10093
 2011-12-03 16:43:13 -05:00
Oleg Pudeyev
88cad5523e [ticket/10093] Make commit-msg always not fatal by nuking all fatal logic. 
PHPBB3-10093
 2011-12-03 16:41:31 -05:00
Nils Adermann
cafe74a88d Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:21:30 +01:00
Nils Adermann
7f8968595b Merge remote-tracking branch 'github-bantu/ticket/10480' into prep-release-3.0.10 
* github-bantu/ticket/10480:
  [ticket/10480] Add a build target for changelog building.
  [ticket/10480] Add a build script for exporting the changelog from tracker.
 2011-12-01 22:20:48 +01:00
Nils Adermann
29723c97c6 Merge remote-tracking branch 'github-bantu/ticket/10502' into prep-release-3.0.10 
* github-bantu/ticket/10502:
  [ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
 2011-12-01 22:20:11 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
Igor Wiedler
aef3652d7a [ticket/10483] Fix test suite when running with MySQL strict mode 
PHPBB3-10483
 2011-11-21 13:09:27 +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