1fa39ea722
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:35 -04:00
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
33dce916e2
[ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
...
PHPBB3-10690
2012-03-14 22:22:22 +01:00
ad3bbcf466
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10456] Add tabindex to subsilver2 captcha
2012-02-25 20:26:29 +01:00
8e1e48a7b6
[ticket/8636] Add resync option to topic_view moderation page
...
PHPBB3-8636
2012-02-23 10:55:57 +01:00
340a8f19d6
[ticket/10456] Add tabindex to subsilver2 captcha
...
Did not set tabindex on registration page, as the hole page does not have any.
PHPBB3-10456
2012-02-21 11:25:22 +01:00
d70c3f1eb8
Merge branch 'develop' into ticket/10380
...
* develop: (325 commits)
[ticket/10641] Update MCP template with new plurality forms
[ticket/10637] Leftovers from implementation of extensions in convertor
[ticket/10637] Leftovers from implementation of extensions in develop tools
[ticket/10637] Leftovers from implementation of extensions in mcp_post
[ticket/10637] Leftovers from implementation of extensions in mcp_main
[ticket/10637] Leftovers from implementation of extensions
[ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
[ticket/10606] Fix incorrect hidden fields array name in page_header().
[ticket/10633] Stop leaking filename of attachments when thumbnail is requested
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
[ticket/10634] Specify module type when viewing profile
[ticket/10634] Changing p_master::is_full_class
[ticket/10569] Invalid string comparison in prosilver
[ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
[ticket/10512] Call startup.php from tests/bootstrap.php
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/9914] Add backup warning to updater.
[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-17 13:48:48 +01:00
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
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
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
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
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
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
879c92e8a2
[ticket/10569] Invalid string comparison in subsilver2
...
Fixing invalid string comparison in ucp_main_front.html in subsilver2
PHPBB3-10569
2012-02-03 15:38:52 +02:00
7295e5824a
[ticket/10380] BIDI support for imageset
...
BIDI support for imageset conversion script, added RTL imageset entries to prosilver and subsilver2, fixed small bug in imageset.css, changed spacing in code to match phpbb coding guidelines
PHPBB3-10380
2012-01-16 14:35:29 +02:00
656a8ece6f
[ticket/9916] Updating header license and removing Version $Id$
...
PHPBB3-9916
2012-01-02 19:10:27 +01:00
0f974f9494
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
2011-12-25 00:58:11 +01:00
fa003bb5fd
[ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
...
class="postlink" is not defined in stylesheet.css so remove it from
styles/subsilver2/template/faq_body.html
PHPBB3-10542
2011-12-24 11:30:17 -05:00
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
fd58a0ad37
[ticket/10535] Forgot a subsilver2 change. *doh*
...
PHPBB3-10535
2011-12-15 23:17:21 +00:00
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
18aa4e4ecd
[ticket/10535] Remove email confirm check on registration form
...
PHPBB3-10535
2011-12-15 15:13:11 +00:00
06ae98b1e5
[develop-olympus] Bumping version numbers to final for 3.0.10 releases.
2011-11-20 21:41:24 +01:00
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
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
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
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
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
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
b21e343b5e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[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:45:01 +01:00
cf044c363b
[ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
...
PHPBB3-10254
2011-11-14 13:29:38 +01:00
c79992d1cc
[ticket/10254] Remove subsilver2 as default style on theme.
...
PHPBB3-10254
2011-11-14 13:29:18 +01:00
dee836315c
[ticket/10254] Remove style names from themes and fix some informations on it.
...
PHPBB3-10254
2011-11-14 13:28:42 +01:00
56c6476233
[ticket/10390] Allow option for jQuery to be hosted by a remote CDN
...
Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.
PHPBB3-10390
2011-09-26 11:15:22 -07:00
b1df91db80
[feature/remove-db-styles] Remove parse_css_file option from themes.
...
PHPBB3-9741
2011-09-20 21:06:52 +01:00
e38fd2b9f2
[ticket/10371] Removing last mentions of imageset
...
Removing last mentions of imageset
PHPBB3-10371
2011-09-20 22:56:53 +03:00
4e8e31c10b
Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' into develop
...
* github-cyberalien/feature/remove-imagesets:
[feature/remove-imagesets] Script for converting imageset to css
[feature/remove-imagesets] Changing subsilver
[feature/remove-imagesets] Changing prosilver
[feature/remove-imagesets] Adjustments to php files
[feature/remove-imagesets] Changing admin control panel styles module
[feature/remove-imagesets] Changing database structure
[feature/remove-imagesets] Removing imageset files
[feature/remove-imagesets] Moving images
2011-09-20 21:26:37 +02:00
145bc23044
Merge remote-tracking branch 'igorw/ticket/10155' into develop
...
* igorw/ticket/10155:
[ticket/10155] Briefly explain assets in coding-guidelines
[ticket/10155] Move jQuery inclusion to footer
[ticket/10155] Update to jQuery 1.6.2
[ticket/10155] Add jQuery to AUTHORS
[ticket/10155] Add jQuery, introduce global assets path
2011-09-05 06:03:19 -04:00
93b892d24a
Merge remote-tracking branch 'bantu/ticket/9474' into develop
...
* bantu/ticket/9474:
[ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
2011-09-05 02:53:13 -04:00
4035f3f6c8
[feature/remove-imagesets] Changing subsilver
...
Removing imagesets. Changing subsilver
PHPBB3-10336
2011-09-04 11:05:10 +03:00
929c13a52b
[feature/remove-imagesets] Removing imageset files
...
Removing imagesets. Removing imageset files
PHPBB3-10336
2011-09-03 18:53:23 +03:00
e5daccdf33
[feature/remove-imagesets] Moving images
...
Removing imagesets. Moving images
PHPBB3-10336
2011-09-03 18:51:33 +03:00
57f7c24806
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
2011-08-29 22:28:44 +02:00
a73bc353d6
Merge remote-tracking branch 'remotes/bantu/ticket/10341' into ticket/bantu/10341
...
* remotes/bantu/ticket/10341:
[ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
2011-08-29 22:27:20 +02:00
37a659513e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
2011-08-27 17:49:09 -04:00
0d41385344
Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympus
...
* nickvergessen/ticket/10253:
[ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
2011-08-27 17:38:27 -04:00
6a2b13632d
[ticket/10344] Add attachment icons to list of reported and queued posts/topics
...
PHPBB3-10344
2011-08-27 00:25:38 +02:00
4499be5795
[ticket/10341] Also show forum/topic name of "0" as most active forum/topic.
...
PHPBB3-10341
2011-08-25 17:44:45 +02:00
ad20758916
[ticket/9474] Remove unused/unreferenced mcp_viewlogs.html files.
...
PHPBB3-9474
2011-08-23 00:11:15 +02:00
