mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-31 22:13:15 +02:00
Code Issues Releases Wiki Activity
10,935 Commits 18 Branches 191 Tags
Commit Graph

10410 Commits

Author SHA1 Message Date
Oleg Pudeyev
0ad81a4cdc [ticket/10511] Fix a grammar defect in permissions language. 
PHPBB3-10511
 2011-12-03 17:42:10 -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
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
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. 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
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
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
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
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
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
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 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
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
6155707071 Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympus 
* callumacrae/ticket/10402:
  [ticket/10402] Fixed a formatting issue with report details.
 2011-11-20 00:15:48 -05:00
Oleg Pudeyev
2359d1e268 Merge remote-tracking branch 'callumacrae/ticket/8599' into develop-olympus 
* callumacrae/ticket/8599:
  [ticket/8599] Added ability to select all to add multiple smilies screen.
 2011-11-19 22:27:07 -05:00
Oleg Pudeyev
fb43029935 Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympus 
* cs278/ticket/10239:
  [ticket/10239] Correct undefined variable error.
  [ticket/10239] Add confirm box to backup restore.
 2011-11-19 21:52:43 -05:00
Oleg Pudeyev
d03366fba2 Merge remote-tracking branch 'nickvergessen/ticket/8996' into develop-olympus 
* nickvergessen/ticket/8996:
  [ticket/8996] Also fix the BBCode bug in subsilver2 and acp
  [ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
 2011-11-19 21:15:25 -05:00
Joas Schilling
eb1f15bc8b [ticket/8996] Also fix the BBCode bug in subsilver2 and acp 2011-11-18 23:27:25 +01:00
Chris Smith
810016ce94 [ticket/10239] Correct undefined variable error. 
PHPBB3-10239
 2011-11-18 21:29:02 +00:00
Nils Adermann
4be9c70827 Merge remote-tracking branch 'github-nickvergessen/ticket/9776' into develop-olympus 
* github-nickvergessen/ticket/9776:
  [ticket/9776] Delete poll if no poll options were submitted.
 2011-11-18 20:31:26 +01:00
Joas Schilling
4fae5eef68 [ticket/9776] Delete poll if no poll options were submitted. 
PHPBB3-9776
 2011-11-18 20:29:50 +01:00
Nils Adermann
6894477b60 Merge remote-tracking branch 'github-nickvergessen/ticket/9956' into develop-olympus 
* github-nickvergessen/ticket/9956:
  [ticket/9956] Display error message if no disapprove reason given
 2011-11-18 19:41:10 +01:00
Nils Adermann
665982bb32 Merge remote-tracking branch 'github-rxu/ticket/9416' into develop-olympus 
* github-rxu/ticket/9416:
  [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
 2011-11-18 19:32:36 +01:00