4a73ce0933
Merge remote-tracking branch 'prototech/ticket/12009' into develop
...
* prototech/ticket/12009:
[ticket/12009] Prevent user from enabling invalid extension through direct URL
[ticket/12009] Update functional test to check for invalid extensions.
[ticket/12009] Fix functional tests.
[ticket/12009] Move valid extensions in tests to correct dir structure.
[ticket/12009] Do not allow incorrectly structured extensions to be installed.
2013-12-16 10:18:56 +01:00
8da2f349fe
Merge remote-tracking branch 'vsephpbb/ticket/12054' into develop
...
* vsephpbb/ticket/12054:
[ticket/12054] Re-word event documentation
[ticket/12054] Reword descriptions and resort events alphabetically
[ticket/12054] Update index_body_linklist_before/after template events
2013-12-16 10:08:19 +01:00
b13f64b5a9
[ticket/12054] Re-word event documentation
...
PHPBB3-12054
2013-12-14 12:59:52 -08:00
a999dbad74
Merge remote-tracking branch 'vsephpbb/ticket/12063' into develop
...
* vsephpbb/ticket/12063:
[ticket/12063] Use CSS to replace valign=top
[ticket/12063] Remove obsolete valign attributes from tr tags
2013-12-13 20:28:22 +01:00
7bc4571753
[ticket/12063] Use CSS to replace valign=top
...
PHPBB3-12063
2013-12-13 10:33:38 -08:00
c42bd28d17
[ticket/12009] Prevent user from enabling invalid extension through direct URL
...
PHPBB3-12009
2013-12-12 14:40:03 -08:00
1be42e7ab2
[ticket/12054] Reword descriptions and resort events alphabetically
...
PHPBB3-12054
2013-12-12 10:11:53 -08:00
da6ced59d9
Merge remote-tracking branch 'vsephpbb/ticket/12064' into develop
...
* vsephpbb/ticket/12064:
[ticket/12064] Delete obsolete viewsource.html file from adm/style/
2013-12-12 10:29:31 +01:00
4816446c4a
Merge remote-tracking branch 'Marc/ticket/11859' into develop
...
* Marc/ticket/11859:
[ticket/11859] Add missing get_template_name method to test drivers
[ticket/11859] Make avatar drivers return template filename
2013-12-12 10:21:36 +01:00
4d65727acc
[ticket/12009] Do not allow incorrectly structured extensions to be installed.
...
PHPBB3-12009
2013-12-11 23:11:52 -08:00
d252ef3f60
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/12061] Fix keyboard shortcut in firefox
Conflicts:
phpBB/styles/prosilver/template/overall_footer.html
2013-12-09 01:23:29 +01:00
d5742d7ec1
Merge remote-tracking branch 'imkingdavid/ticket/12069' into develop
...
* imkingdavid/ticket/12069:
[ticket/12069] Globalize in submit_post()
2013-12-08 21:43:06 +01:00
6b081433c5
[ticket/12069] Globalize in submit_post()
...
PHPBB3-12069
2013-12-08 15:08:30 -05:00
b5bfe7b3ca
Merge pull request #1923 from prototech/ticket/12067
...
[ticket/12067] Remove double scrollbar from notifications dropdown.
2013-12-08 12:04:14 -08:00
e379b84c7b
Merge pull request #1926 from imkingdavid/ticket/12069
...
[ticket/12069] Fix event documentation
2013-12-08 12:03:33 -08:00
0b76880816
[ticket/12069] Fix event documentation
...
PHPBB3-12069
2013-12-08 15:01:53 -05:00
44a0e91ab9
Merge pull request #1925 from imkingdavid/ticket/12069
...
[ticket/12069] Add core.submit_post_end event
2013-12-08 11:47:07 -08:00
fdac051956
[ticket/12069] Add core.submit_post_end event
...
PHPBB3-12069
2013-12-08 14:42:46 -05:00
6098134cc6
[ticket/12067] Remove double scrollbar from notifications dropdown.
...
PHPBB3-12067
2013-12-07 00:43:55 -08:00
204d6781d8
[ticket/12061] Fix keyboard shortcut in firefox
...
PHPBB3-12061
2013-12-06 19:59:33 +01:00
dbe7154065
[ticket/11241] Retain button gradient when menu is active.
...
PHPBB3-11241
2013-12-06 03:32:49 -08:00
664e7862d0
[ticket/11241] Fix the disappearing dropdown when responsive changes take effect
...
PHPBB3-11241
2013-12-06 00:56:31 -08:00
42a70154fa
[ticket/11241] Add border to dropdown menu options.
...
PHPBB3-11241
2013-12-06 00:56:31 -08:00
5579dc2412
[ticket/11241] Add events & var for extensions to dropdown.
...
PHPBB3-11241
2013-12-06 00:56:31 -08:00
a25b1e6a40
[ticket/11241] Fix the dropdown in RTL languages.
...
PHPBB3-11241
2013-12-06 00:56:31 -08:00
9c9c20ad55
[ticket/11241] Use DEFINE for the block.
...
PHPBB3-11241
2013-12-06 00:56:31 -08:00
e110d591a9
[ticket/11241] Consolidate topic actions into "Topic tools" dropdown.
...
PHPBB3-11241
2013-12-06 00:56:24 -08:00
4b0410a9d9
[ticket/11241] Add dropdown control button.
...
PHPBB3-11241
2013-12-06 00:44:48 -08:00
4684ba0869
Merge remote-tracking branch 'cyberalien/ticket/11979' into develop
...
* cyberalien/ticket/11979:
[ticket/11979] Fix errors in dropdown
[ticket/11979] Add ability to create dropdown menu to prosilver
2013-12-06 09:31:30 +01:00
63276dacda
[ticket/12064] Delete obsolete viewsource.html file from adm/style/
...
PHPBB3-12064
2013-12-05 16:29:49 -08:00
88aa7b88a4
[ticket/12063] Remove obsolete valign attributes from tr tags
...
PHPBB3-12063
2013-12-05 16:25:51 -08:00
5530942468
[ticket/12062] Fix to allow extensions to use INCLUDEJS in the ACP
...
PHPBB3-12062
2013-12-05 09:55:52 -08:00
097fba9fdf
[ticket/12059] Allow INCLUDECSS to work with ACP templates
...
PHPBB3-12059
2013-12-04 15:51:14 -08:00
53be0a4432
[ticket/12058] Add missing apostrophe to avatar_types migration queries
...
PHPBB3-12058
2013-12-04 23:40:38 +01:00
1d243b78bb
Merge pull request #1813 from marc1706/ticket/11912
...
[ticket/11912] Add mimetype guesser for proper mimetype guessing
2013-12-04 14:12:25 -08:00
97bf88dd32
Merge pull request #1879 from Pico88/ticket/12026
...
[ticket/12026] Correct path for template files
2013-12-04 13:59:59 -08:00
e399a52816
Merge pull request #1887 from nickvergessen/ticket/skouat/10910
...
[ticket/10910] Function build_cfg_template() allow $size for $tpl_type = select
2013-12-04 09:48:10 -08:00
b474917ba3
Merge remote-tracking branch 'Marc/ticket/11842' into develop
...
* Marc/ticket/11842:
[ticket/11842] Add functional test for creating group
[ticket/11842] Use avatar_data for obtaining driver that should be deleted
[ticket/11842] Use type map for updating avatar types in database
[ticket/11842] Add missing prefix for group id in avatar data
[ticket/11842] Use only new avatar type in user_delete function
[ticket/11842] Add migration file for updating avatar type in database
[ticket/11842] Replace outdated occurences of user and group avatar_type
[ticket/11842] Use group_id 0 and correct avatar name after creating group
2013-12-04 17:20:20 +01:00
abb2def48d
[ticket/11842] Use avatar_data for obtaining driver that should be deleted
...
PHPBB3-11842
2013-12-04 15:42:17 +01:00
186f3ecb7e
[ticket/12054] Update index_body_linklist_before/after template events
...
PHPBB3-12054
2013-12-03 17:20:32 -08:00
8b2d515736
Merge remote-tracking branch 'prototech/ticket/11672' into develop
...
* prototech/ticket/11672:
[ticket/11672] Move the reapply_sid() call before meta_refresh() is called.
[ticket/11672] Remove duplicate $request global.
[ticket/11672] The json response call exits so the else is not necessary.
[ticket/11672] Remove the messages for lock/unlock/change topic type.
[ticket/11672] Clean up the logic in mcp_queue.php.
[ticket/11672] Remove some messages that were missed in mcp_queue.php.
[ticket/11672] Replace sprintf() usage with $user->lang().
[ticket/11672] Removed unnecessary text from alerts.
2013-12-03 21:10:25 +01:00
8f504b1ca5
Merge remote-tracking branch 'cyberalien/ticket/11969' into develop
...
* cyberalien/ticket/11969:
[ticket/11969] Change topic link to unread post in subsilver2
[ticket/11969] Change topic link to unread post in prosilver
[ticket/11969] New language strings for first and last post links
2013-12-03 18:29:10 +01:00
8a6d01591b
Merge remote-tracking branch 'vsephpbb/ticket/12014' into develop
...
* vsephpbb/ticket/12014:
[ticket/12014] Change event date in docs
[ticket/12014] Fix version number in event docs
[ticket/12014] Template Event index_body.html before forumlist
2013-12-03 18:18:09 +01:00
a5f1dc67b9
[ticket/12026] Remove root path, its prepended later
...
PHPBB3-12026
2013-12-03 18:10:20 +01:00
9be443769a
Merge remote-tracking branch 'prototech/ticket/11346' into develop
...
* prototech/ticket/11346:
[ticket/11346] Hide "Mark topics read" link when forum is empty.
2013-12-02 21:30:07 +01:00
d4da154cda
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/12048] Fix the regexp for language keys in custom bbcodes.
2013-12-02 10:07:49 +01:00
eef1b586d5
[ticket/12048] Fix the regexp for language keys in custom bbcodes.
...
PHPBB3-12048
2013-12-02 00:53:42 -08:00
5ab5bd6bda
[ticket/11346] Hide "Mark topics read" link when forum is empty.
...
TOTAL_POSTS and TOTAL_USERS are not defined for viewforum.php.
PHPBB3-11346
2013-12-01 17:16:31 -08:00
d867bda6af
Merge remote-tracking branch 'nickvergessen/ticket/12045' into develop
...
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12045:
[ticket/12045] Only display group selection if there are groups
[ticket/12045] Correctly close <span> before closing parent tag
[ticket/12045] Correctly close <dd> with </dd>
2013-11-30 17:21:40 +05:30
09b5499d87
Merge remote-tracking branch 'nickvergessen/ticket/12042' into develop
...
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12042:
[ticket/12042] Replace B with a more meaningful key name
[ticket/12042] Add all language strings from PLUpload 2.0 to the language file
2013-11-30 14:14:17 +05:30
