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
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
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
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
a72ea2bc98
[ticket/10461] Add a comment explaining the logic here.
...
PHPBB3-10461
2011-11-23 18:15:45 -05:00
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
43818289fe
[ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
...
PHPBB3-10488
2011-11-23 22:30:40 +01:00
0d3697e40c
[ticket/10486] Create git shortlog and git diff --stat in build script.
...
PHPBB3-10486
2011-11-22 20:59:51 +01:00
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
aef3652d7a
[ticket/10483] Fix test suite when running with MySQL strict mode
...
PHPBB3-10483
2011-11-21 13:09:27 +01:00
a9d7b1f9a1
[develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.
2011-11-21 00:57:53 +01:00
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
f5633d281e
[develop-olympus] Add changelog for 3.0.10-RC1
2011-11-21 00:08:49 +01:00
3e43b53a63
[develop-olympus] Bump version numbers for 3.0.10-RC1 release.
2011-11-20 21:50:29 +01:00
06ae98b1e5
[develop-olympus] Bumping version numbers to final for 3.0.10 releases.
2011-11-20 21:41:24 +01:00
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
37c7668193
[ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
...
PHPBB3-10446
2011-11-20 16:35:31 +01:00
a7077c9149
[ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
...
PHPBB3-10446
2011-11-20 14:02:22 +01:00
c68973a9e0
[ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
...
PHPBB3-10446
2011-11-20 04:17:42 -05:00
64d62038cd
[ticket/10446] DRY X-AntiAbuse header addition.
...
PHPBB3-10446
2011-11-20 04:15:44 -05:00
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
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
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
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
eb1f15bc8b
[ticket/8996] Also fix the BBCode bug in subsilver2 and acp
2011-11-18 23:27:25 +01:00
810016ce94
[ticket/10239] Correct undefined variable error.
...
PHPBB3-10239
2011-11-18 21:29:02 +00:00
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
4fae5eef68
[ticket/9776] Delete poll if no poll options were submitted.
...
PHPBB3-9776
2011-11-18 20:29:50 +01:00
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
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
cfaf0e1e96
Merge remote-tracking branch 'github-nickvergessen/ticket/10296' into develop-olympus
...
* github-nickvergessen/ticket/10296:
[ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle
[ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
2011-11-18 19:17:20 +01:00
93c4cdd1de
Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympus
...
* nickvergessen/ticket/10185:
[ticket/10185] Always set board startdate on conversion
2011-11-18 18:07:44 +01:00
a7d7083d75
Merge remote-tracking branch 'remotes/rxu/ticket/9008' into develop-olympus
2011-11-18 15:22:01 +01:00
aeb896399c
Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympus
...
* nickvergessen/ticket/10157:
[ticket/10157] Add notification to update cpfs when installing a language.
2011-11-17 12:44:04 -05:00
3091efc501
[ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
...
PHPBB3-9416
2011-11-17 22:16:41 +08:00
b2b057910e
[ticket/10157] Add notification to update cpfs when installing a language.
...
We currently just copy the language-strings from the default language. But the
admin should be reminded to change them.
PHPBB3-10157
2011-11-17 10:28:16 +01:00
3d893c8222
[ticket/10296] Fix CROSS JOIN with INNER JOIN on MSSQL, Postgres and Oracle
...
PHPBB3-10296
2011-11-15 22:19:45 +01:00
e8686d9dad
[ticket/10296] Add unit test for CROSS JOIN with INNER JOIN
...
PHPBB3-10296
2011-11-15 22:14:28 +01:00
815dd3591b
[ticket/10185] Always set board startdate on conversion
...
The board startdate should always be set to first user registration date.
The current code did not do anything at all, as the board_startdate was always
set on installation before running the convertor.
PHPBB3-10185
2011-11-15 17:23:55 +01:00
39f8592312
Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympus
...
* rxu/ticket/10419:
[ticket/10419] Reword the language strings
[ticket/10419] Reword some language strings, minor code changes
[ticket/10419] Add mbstring PHP ini parameters checks to ACP
2011-11-15 16:46:08 +01:00
f1a53659bd
[ticket/10419] Reword the language strings
...
PHPBB3-10419
2011-11-15 23:43:52 +08:00
f7286e1abe
Merge remote-tracking branch 'nickvergessen/ticket/10452' into develop-olympus
...
* nickvergessen/ticket/10452:
[ticket/10452] Fix xHTML errors when print-viewing PMs
2011-11-14 21:57:00 +01:00
c0ffc8386c
[ticket/10453] PM viewmessage page is misplacing the online icon
...
Removed the position: absolute value, and made it so that if the
buttons are bigger the text move with it, also added support for
bidi.css (text right to left).
PHPBB3-10453
http://tracker.phpbb.com/browse/PHPBB3-10453
2011-11-14 21:38:10 +01:00
69f943c8d6
Merge remote-tracking branch 'nickvergessen/ticket/9361' into develop-olympus
...
* nickvergessen/ticket/9361:
[ticket/9361] View correct error messages when editing account information
2011-11-14 19:01:06 +01:00
14af18cb1b
[ticket/9361] View correct error messages when editing account information
...
Currently the "current password" is only checked, when you change something.
This means you get "Your profile has been updated." although you enter a wrong
password. I also added proper error messages, when you leave the confirm fields
empty, and sorted them in the order of the field appearances on the html page.
PHPBB3-9361
2011-11-14 18:54:12 +01:00
9830453487
[ticket/10452] Fix xHTML errors when print-viewing PMs
...
Also changed the layout of prosilvers PM print-view, so it looks like the post
print-view and not like the subsilver2 print-view.
PHPBB3-10452
2011-11-14 18:41:19 +01:00
f31da015fc
Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympus
...
* nickvergessen/ticket/9066:
[ticket/9066] Move regex into get_preg_expression function and add tests
[ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:50 +01:00
3302305cd4
[ticket/9066] Move regex into get_preg_expression function and add tests
...
PHPBB3-9066
2011-11-14 15:10:25 +01:00
9d7b144c54
Merge remote-tracking branch 'bantu/ticket/10254' into develop-olympus
...
* bantu/ticket/10254:
[ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
[ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
[ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
[ticket/10254] Remove subsilver2 as default style on theme.
[ticket/10254] Remove style names from themes and fix some informations on it.
2011-11-14 13:44:38 +01:00
e543effc64
[ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
...
PHPBB3-10254
2011-11-14 13:32:54 +01:00
