Commit graph

19248 commits

Author SHA1 Message Date
Marc Alexander
235d2069e0 [ticket/11997] Allow redirects to parent folders like previously
Redirects to parent folders were possible with the previous redirect function.
This change will allow these redirects again.

PHPBB3-11997
2013-12-21 16:31:20 +01:00
Marc Alexander
15913fdf79 [ticket/11997] Move expected redirect returns to controller and output to HTML
The controller will now output the expected redirect returns the same way the
redirect returns are output. The extension controller test will compare those
2 outputs.

PHPBB3-11997
2013-12-20 18:13:53 +01:00
Marc Alexander
47ea6bc9e6 Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997
Conflicts:
	tests/functional/fixtures/ext/foo/bar/config/services.yml
2013-12-07 13:32:19 +01:00
Marc Alexander
f32a30eeca [ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
PHPBB3-11997
2013-12-07 13:28:44 +01:00
Marc Alexander
a7f2788c72 [ticket/11997] Use get_controller_redirect_url() in redirect() function
This method of path_helper will now be used instead of the previous hack
of the phpbb_own_realpath() function.

PHPBB3-11997
2013-12-07 13:25:04 +01:00
Marc Alexander
8bbede4251 [ticket/11997] Add method for controller redirect URLs to path helper
This method will allow us to get proper redirect URLs for controllers.

PHPBB3-11997
2013-12-07 13:23:57 +01:00
Marc Alexander
8370857f04 [ticket/11997] Undo changes to phpbb_own_realpath()
PHPBB3-11997
2013-12-07 13:20:40 +01:00
Joas Schilling
71169de823 Merge remote-tracking branch 'prototech/ticket/11241' into develop
* prototech/ticket/11241:
  [ticket/11241] Retain button gradient when menu is active.
  [ticket/11241] Fix the disappearing dropdown when responsive changes take effect
  [ticket/11241] Add border to dropdown menu options.
  [ticket/11241] Add events & var for extensions to dropdown.
  [ticket/11241] Fix the dropdown in RTL languages.
  [ticket/11241] Use DEFINE for the block.
  [ticket/11241] Consolidate topic actions into "Topic tools" dropdown.
  [ticket/11241] Add dropdown control button.
2013-12-06 12:54:32 +01:00
Cesar G
dbe7154065 [ticket/11241] Retain button gradient when menu is active.
PHPBB3-11241
2013-12-06 03:32:49 -08:00
Cesar G
664e7862d0 [ticket/11241] Fix the disappearing dropdown when responsive changes take effect
PHPBB3-11241
2013-12-06 00:56:31 -08:00
Cesar G
42a70154fa [ticket/11241] Add border to dropdown menu options.
PHPBB3-11241
2013-12-06 00:56:31 -08:00
Cesar G
5579dc2412 [ticket/11241] Add events & var for extensions to dropdown.
PHPBB3-11241
2013-12-06 00:56:31 -08:00
Cesar G
a25b1e6a40 [ticket/11241] Fix the dropdown in RTL languages.
PHPBB3-11241
2013-12-06 00:56:31 -08:00
Cesar G
9c9c20ad55 [ticket/11241] Use DEFINE for the block.
PHPBB3-11241
2013-12-06 00:56:31 -08:00
Cesar G
e110d591a9 [ticket/11241] Consolidate topic actions into "Topic tools" dropdown.
PHPBB3-11241
2013-12-06 00:56:24 -08:00
Cesar G
4b0410a9d9 [ticket/11241] Add dropdown control button.
PHPBB3-11241
2013-12-06 00:44:48 -08:00
Joas Schilling
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
Nathan Guse
7f08a33b9f Merge pull request #1917 from VSEphpbb/ticket/12062
[ticket/12062] Fix to allow extensions to use INCLUDEJS in the ACP
2013-12-05 10:08:00 -08:00
Matt Friedman
5530942468 [ticket/12062] Fix to allow extensions to use INCLUDEJS in the ACP
PHPBB3-12062
2013-12-05 09:55:52 -08:00
Nathan Guse
b878763ba5 Merge pull request #1914 from VSEphpbb/ticket/12059
[ticket/12059] Allow INCLUDECSS to work with ACP templates
2013-12-04 15:54:09 -08:00
Matt Friedman
097fba9fdf [ticket/12059] Allow INCLUDECSS to work with ACP templates
PHPBB3-12059
2013-12-04 15:51:14 -08:00
Nathan Guse
e3a0540fa6 Merge pull request #1912 from marc1706/ticket/12058
[ticket/12058] Add missing apostrophe to avatar_types migration queries
2013-12-04 14:43:30 -08:00
Marc Alexander
53be0a4432 [ticket/12058] Add missing apostrophe to avatar_types migration queries
PHPBB3-12058
2013-12-04 23:40:38 +01:00
Nathan Guse
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
Nathan Guse
97bf88dd32 Merge pull request #1879 from Pico88/ticket/12026
[ticket/12026] Correct path for template files
2013-12-04 13:59:59 -08:00
Nathan Guse
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
Joas Schilling
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
Joas Schilling
fa33abaf0d Merge remote-tracking branch 'bantu/ticket/12056-develop' into develop
* bantu/ticket/12056-develop:
  [ticket/12056] group_user_attributes: Fix "Creating ... from empty value".
  [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"
  [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"
  [ticket/12056] Fix "Call to a member function trigger_event() on a non-object".
  [ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()".
  [ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()".
  [ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()"
  [ticket/12056] validate_config_vars: Fix "Creating ... from empty value".
  [ticket/12056] validate_range: Fix "Creating default object from empty value"
  [ticket/12056] build_select: Fix "Creating default object from empty value"
  [ticket/12056] h_radio test: Fix "Creating default object from empty value"
2013-12-04 16:01:32 +01:00
Marc Alexander
80fa658e8f [ticket/11842] Add functional test for creating group
PHPBB3-11842
2013-12-04 15:58:07 +01:00
Joas Schilling
8087a76c36 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
2013-12-04 15:57:25 +01:00
Joas Schilling
0e93c2516c Merge remote-tracking branch 'bantu/ticket/12056' into develop-olympus
* bantu/ticket/12056:
  [ticket/12056] Fix failure due to "Creating default object from empty value".
2013-12-04 15:56:03 +01:00
Marc Alexander
abb2def48d [ticket/11842] Use avatar_data for obtaining driver that should be deleted
PHPBB3-11842
2013-12-04 15:42:17 +01:00
Andreas Fischer
3a03b01ce0 [ticket/12056] group_user_attributes: Fix "Creating ... from empty value".
PHPBB3-12056
2013-12-04 14:22:33 +01:00
Andreas Fischer
ffc24a507d [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"
PHPBB3-12056
2013-12-04 14:16:10 +01:00
Andreas Fischer
d589696827 [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"
PHPBB3-12056
2013-12-04 14:13:59 +01:00
Andreas Fischer
b41781ed64 [ticket/12056] Fix "Call to a member function trigger_event() on a non-object".
PHPBB3-12056
2013-12-04 13:51:42 +01:00
Andreas Fischer
d63ac61b19 [ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()".
PHPBB3-12056
2013-12-04 13:46:51 +01:00
Andreas Fischer
417fddf710 [ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()".
PHPBB3-12056
2013-12-04 13:44:33 +01:00
Andreas Fischer
7e160e4fc0 [ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()"
PHPBB3-12056
2013-12-04 13:37:56 +01:00
Andreas Fischer
0f41241273 [ticket/12056] validate_config_vars: Fix "Creating ... from empty value".
PHPBB3-12056
2013-12-04 13:36:23 +01:00
Andreas Fischer
70e47bc929 [ticket/12056] validate_range: Fix "Creating default object from empty value"
PHPBB3-12056
2013-12-04 13:33:19 +01:00
Andreas Fischer
c07b44716c [ticket/12056] build_select: Fix "Creating default object from empty value"
PHPBB3-12056
2013-12-04 13:31:12 +01:00
Andreas Fischer
c659fe4cbe [ticket/12056] h_radio test: Fix "Creating default object from empty value"
PHPBB3-12056
2013-12-04 13:29:40 +01:00
Andreas Fischer
e41cd384f5 [ticket/12056] Fix failure due to "Creating default object from empty value".
PHPBB3-12056
2013-12-04 13:22:47 +01:00
Joas Schilling
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
Pico88
9e18867cc5 Merge pull request #1 from nickvergessen/ticket/pico88/12026-2
Ticket/pico88/12026
2013-12-03 10:53:50 -08:00
Joas Schilling
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
Joas Schilling
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
Joas Schilling
9fbeae3e0c [ticket/12026] Add functional test for ucp extension module
PHPBB3-12026
2013-12-03 18:10:33 +01:00
Joas Schilling
a5f1dc67b9 [ticket/12026] Remove root path, its prepended later
PHPBB3-12026
2013-12-03 18:10:20 +01:00