Oleg Pudeyev
81eeafbb8d
Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus
...
* nickvergessen/ticket/8636:
[ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:29 -04:00
Vjacheslav Trushkin
1cc9f60f95
[feature/merging-style-components] Removing theme.cfg and template.cfg
...
Removing theme.cfg and template.cfg
PHPBB3-10632
2012-03-14 23:26:01 +02:00
Joas Schilling
33dce916e2
[ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
...
PHPBB3-10690
2012-03-14 22:22:22 +01:00
Vjacheslav Trushkin
68fb7356b8
[feature/prosilver-cleanup/remove-tweaks2] Tweaks.css only for IE
...
Removing tweaks.css from stylesheet.css, including it for IE8 or older via conditional statements
PHPBB3-10622
2012-03-08 01:38:16 +02:00
callumacrae
c5de658c7f
[ticket/10510] Moved quick-mod tools markup to template.
...
PHPBB3-10510
2012-03-04 10:51:46 +00:00
Andreas Fischer
50d234b9af
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
Conflicts:
phpBB/styles/prosilver/template/memberlist_leaders.html
2012-02-28 22:25:09 +01:00
Andreas Fischer
f6cf8782c8
Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympus
...
* nickvergessen/ticket/9220:
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
2012-02-28 22:23:38 +01:00
Joas Schilling
17dc8c6c5c
[ticket/9089] Add tabindex to pm/topic/post icon-options aswell
...
PHPBB3-9089
2012-02-27 17:18:08 +01:00
Joas Schilling
d3091da5ea
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
...
The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.
PHPBB3-9220
2012-02-27 16:32:29 +01:00
Andreas Fischer
23e845d066
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10453] Fixing spacing
2012-02-26 16:01:42 +01:00
Vjacheslav Trushkin
d3d8793c1f
[ticket/10453] Fixing spacing
...
Fixing spacing
PHPBB3-10453
2012-02-26 16:54:31 +02:00
Andreas Fischer
2f91623392
Merge remote-tracking branch 'nickvergessen/ticket/10458' into develop
...
* nickvergessen/ticket/10458:
[ticket/10458] Fix xHTML errors when print-viewing PMs
2012-02-25 20:34:23 +01:00
Vjacheslav Trushkin
b9da8f3a33
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10453] PM viewmessage page is misplacing the online icon
[ticket/10453] PM viewmessage page is misplacing the online icon
2012-02-24 20:05:41 +02:00
Vjacheslav Trushkin
8cb95b3b84
Merge branch 'ticket/raimon/10453' into develop-olympus
...
* ticket/raimon/10453:
[ticket/10453] PM viewmessage page is misplacing the online icon
[ticket/10453] PM viewmessage page is misplacing the online icon
2012-02-24 20:05:26 +02:00
Joas Schilling
30c08bfe5b
[ticket/10458] Fix xHTML errors when print-viewing PMs
...
PHPBB3-10458
2012-02-23 16:25:47 +01:00
Joas Schilling
8e1e48a7b6
[ticket/8636] Add resync option to topic_view moderation page
...
PHPBB3-8636
2012-02-23 10:55:57 +01:00
Joas Schilling
cd5c01ac2d
[ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
...
I also added tabindex 1 to the buttons for adding the recipients.
Also note, that duplicated tabindex are fine:
http://www.w3.org/TR/html4/interact/forms.html#adef-tabindex
PHPBB3-9089
2012-02-21 11:10:10 +01:00
Patrick Webster
2a5e30db9e
[ticket/10641] Update MCP template with new plurality forms
...
Updates the MCP template according to PHPBB3-10345
PHPBB3-10641
2012-02-11 01:40:01 -06:00
Oleg Pudeyev
598e022d4c
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10569] Invalid string comparison in prosilver
[ticket/10569] Invalid string comparison in subsilver2
2012-02-10 21:00:51 -05:00
Oleg Pudeyev
ed6bd50ab8
Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympus
...
* cyberalien/ticket/10569:
[ticket/10569] Invalid string comparison in prosilver
[ticket/10569] Invalid string comparison in subsilver2
2012-02-10 21:00:36 -05:00
Vjacheslav Trushkin
62288b3c05
[ticket/10569] Invalid string comparison in prosilver
...
Fixing invalid string comparison in ucp_main_front.html in prosilver
PHPBB3-10569
2012-02-07 22:03:24 +02:00
Igor Wiedler
d4e00b6c0d
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10616] Add template inheritance to exported template
[ticket/10616] Ignore template inheritance that points to self
[ticket/10616] Add template inheritance to default styles
2012-02-07 16:57:09 +01:00
Oleg Pudeyev
cddd63aae0
Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
...
* imkingdavid/ticket/10535:
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/10535] Delete email confirm from installer
[ticket/10535] Removed email confirm field from acp_users module
[ticket/10535] Forgot a subsilver2 change. *doh*
[ticket/10535] Removed email confirm from UCP, removed unused language entries
[ticket/10535] Remove email confirm check on registration form
2012-02-03 16:21:51 -05:00
Vjacheslav Trushkin
d2a3496149
[ticket/10616] Add template inheritance to default styles
...
Adding template inheritance field to prosilver and subsilver2
PHPBB3-10616
2012-02-03 16:00:14 +02:00
Unknown
656a8ece6f
[ticket/9916] Updating header license and removing Version $Id$
...
PHPBB3-9916
2012-01-02 19:10:27 +01:00
Andreas Fischer
d42d097244
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[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
Conflicts:
phpBB/styles/prosilver/template/forumlist_body.html
phpBB/styles/prosilver/template/search_results.html
phpBB/styles/prosilver/template/viewforum_body.html
2011-12-16 17:51:48 +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
93701adf02
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[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:11 +01:00
David King
d73c3a297e
[ticket/10535] Removed email confirm from UCP, removed unused language entries
...
PHPBB3-10535
2011-12-15 23:15:24 +00: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
David King
18aa4e4ecd
[ticket/10535] Remove email confirm check on registration form
...
PHPBB3-10535
2011-12-15 15:13:11 +00: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
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
06ae98b1e5
[develop-olympus] Bumping version numbers to final for 3.0.10 releases.
2011-11-20 21:41:24 +01:00
Oleg Pudeyev
08032068c0
Merge remote-tracking branch 'nickvergessen/ticket/10344' into develop
...
* nickvergessen/ticket/10344:
[ticket/10344] Add attachment icons to list of reported and queued posts/topics
2011-11-20 00:46:45 -05:00
Oleg Pudeyev
f5b009158c
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[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:25:58 -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
Nils Adermann
0a4efcbe8c
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9956] Display error message if no disapprove reason given
Conflicts:
phpBB/includes/mcp/mcp_queue.php
2011-11-18 19:42:44 +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
Andreas Fischer
08827fa733
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10452] Fix xHTML errors when print-viewing PMs
Conflicts:
phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
2011-11-14 22:01:36 +01:00
Andreas Fischer
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
Raimon
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
Joas Schilling
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
Andreas Fischer
d3a1b670bd
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/7138] Allow simple header and footer for trigger_error() messages
Conflicts:
phpBB/styles/prosilver/template/message_body.html
2011-11-13 20:28:29 +01:00
Raimon
65921ae67a
[ticket/10453] PM viewmessage page is misplacing the online icon
...
PHPBB3-10453
http://tracker.phpbb.com/browse/PHPBB3-10453
2011-11-13 20:10:51 +01:00
David King
b371d62dd3
[ticket/7138] Allow simple header and footer for trigger_error() messages
...
Adds a template condition using S_SIMPLE_MESSAGE that must be set to true
before calling trigger_error() which will automatically use the simple
header and footer files in the template directory instead of the overall
header and footer files.
PHPBB3-7138
2011-11-13 16:30:11 +01:00
