Oleg Pudeyev
37fa5e56f3
Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympus
...
* cyberalien/ticket/10399:
[ticket/10399] Correctly encoding template component urls (3.0)
[ticket/10399] Correctly encoding template component urls (3.0)
2011-12-22 15:45:48 -05:00
Andreas Fischer
51f8f642de
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-RC3 release.
2011-12-16 18:08:08 +01:00
Andreas Fischer
ba576f823b
[prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
2011-12-16 18:03:46 +01:00
Andreas Fischer
74c4b92760
Merge branch 'prep-release-3.0.10' into develop-olympus
...
* prep-release-3.0.10:
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
2011-12-16 17:45:08 +01:00
Andreas Fischer
6bfca76f1c
Merge remote-tracking branch 'nickvergessen/ticket/10504' into prep-release-3.0.10
...
* nickvergessen/ticket/10504:
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
2011-12-16 17:44:57 +01:00
Andreas Fischer
8f690d3475
Merge branch 'prep-release-3.0.10' into develop-olympus
...
* prep-release-3.0.10:
[ticket/10531] Disallow deleting of the last style
2011-12-16 16:17:40 +01:00
Andreas Fischer
56c3a66c28
Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3.0.10
...
* nickvergessen/ticket/10531:
[ticket/10531] Disallow deleting of the last style
2011-12-16 16:03:20 +01:00
Andreas Fischer
f4bdfda69d
Merge branch 'prep-release-3.0.10' into develop-olympus
...
* prep-release-3.0.10:
[ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
[ticket/8996] Revert initial fix to keep old behaviour on empty selection
2011-12-16 15:50:04 +01:00
Andreas Fischer
1d9fb6b4ec
Merge remote-tracking branch 'nickvergessen/ticket/revert/8996' into prep-release-3.0.10
...
* nickvergessen/ticket/revert/8996:
[ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
[ticket/8996] Revert initial fix to keep old behaviour on empty selection
2011-12-16 15:49:30 +01:00
Joas Schilling
0cfa843677
[ticket/10531] Disallow deleting of the last style
...
Regression from PHPBB3-9675 commit 0e02f5cb0b
2011-12-15 23:17:16 +01:00
Joas Schilling
2bf4e8d3d0
[ticket/8996] Revert initial fix to keep old behaviour on empty selection Part2
...
Revert
"[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey"
This reverts commit 219bdbaf70
2011-12-15 22:17:39 +01:00
Joas Schilling
730d2d5d19
[ticket/8996] Revert initial fix to keep old behaviour on empty selection
...
Revert "[ticket/8996] Also fix the BBCode bug in subsilver2 and acp"
This reverts commit eb1f15bc8b
2011-12-15 22:14:59 +01:00
Nils Adermann
2c7495e1c7
Merge branch 'prep-release-3.0.10' into develop-olympus
...
* prep-release-3.0.10:
[ticket/10319] Missing hidden fields in search form
2011-12-09 01:32:21 +01:00
Vjacheslav Trushkin
dfb7cc625a
[ticket/10319] Missing hidden fields in search form
...
Missing hidden fields in search form (bug added in 3.0.9)
PHPBB3-10319
2011-12-09 01:31:41 +01:00
Joas Schilling
8af9a0054c
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
...
Revert "[ticket/6632] Better viewing of topics for wide screen displays"
This reverts commit bb733b0204
2011-12-08 23:14:02 +01:00
Joas Schilling
e3d81812fa
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
...
Revert "[ticket/10408] Layout of topics/attachments list is broken in UCP and
MCP"
This reverts commit 88aacd0f2c
2011-12-08 23:07:44 +01:00
Joas Schilling
1a09f9005c
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
...
Revert "[ticket/10485] Fix invalid HTML5 markup introduced in PHPBB3-6632"
This reverts commit c67633577f
2011-12-08 23:05:13 +01:00
Andreas Fischer
7ae12df3d2
Merge remote-tracking branch 'p/ticket/10511' into develop-olympus
...
* p/ticket/10511:
[ticket/10511] Fix a grammar defect in permissions language.
2011-12-08 22:22:22 +01:00
Andreas Fischer
48d767a36e
Merge remote-tracking branch 'p/ticket/9876' into develop-olympus
...
* p/ticket/9876:
[ticket/9876] Distinctly name user and forum roles for newly registered users.
2011-12-08 22:21:54 +01:00
Vjacheslav Trushkin
1842323ca9
[ticket/10399] Correctly encoding template component urls (3.0)
...
Changes in style.php
PHPBB3-10399
2011-12-04 11:43:55 +02:00
Oleg Pudeyev
1ce0c76e14
Merge remote-tracking branch 'bantu/ticket/10434' into develop-olympus
...
* bantu/ticket/10434:
[ticket/10434] Add script for creating search index from CLI.
2011-12-03 22:28:05 -05:00
Oleg Pudeyev
bf6d501ab1
Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus
...
* Noxwizard/ticket/10349:
[ticket/10349] Removed duplicated functions from schema loading in tests
[ticket/10349] Update function comment
[ticket/10349] Use new schema comment function in installer
[ticket/10349] Unit tests: Consolidate schema comment removal functions
[ticket/10349] Unit tests: Remove comments while loading schema files
2011-12-03 22:07:34 -05:00
Andreas Fischer
138f123bd8
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-RC3.
Conflicts:
phpBB/includes/constants.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
2011-12-04 00:24:22 +01:00
Andreas Fischer
69cbb4ac1d
[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.
2011-12-04 00:22:10 +01:00
Andreas Fischer
9b9f30bbb9
Merge branch 'prep-release-3.0.10' into develop-olympus
...
* prep-release-3.0.10:
[ticket/10503] Debug error "Invalid arguments" when previewing edits
2011-12-04 00:06:06 +01:00
Andreas Fischer
6f81a2f5b8
Merge remote-tracking branch 'nickvergessen/ticket/10503' into prep-release-3.0.10
...
* nickvergessen/ticket/10503:
[ticket/10503] Debug error "Invalid arguments" when previewing edits
2011-12-04 00:05:56 +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
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
