1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

19221 Commits

Author SHA1 Message Date
Matt Friedman
88aa7b88a4 [ticket/12063] Remove obsolete valign attributes from tr tags
PHPBB3-12063
2013-12-05 16:25:51 -08: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
Joas Schilling
a8e29f0804 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11699] Also exclude the phpBB/cache directory.
  [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
  [ticket/11699] Exclude build/new_version and build/old_versions from lint.
2013-12-02 23:33:24 +01:00
Joas Schilling
1977a10efb Merge remote-tracking branch 'bantu/ticket/11699' into develop-olympus
* bantu/ticket/11699:
  [ticket/11699] Also exclude the phpBB/cache directory.
  [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
  [ticket/11699] Exclude build/new_version and build/old_versions from lint.
2013-12-02 23:32:39 +01:00
Joas Schilling
dfe7896a4d Merge remote-tracking branch 'bantu/ticket/12050' into develop
* bantu/ticket/12050:
  [ticket/12050] Make phpbb_notification_submit_post_base abstract.
2013-12-02 22:21:50 +01:00
Joas Schilling
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
Joas Schilling
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
Joas Schilling
be338864ef Merge remote-tracking branch 'prototech/ticket/12048' into develop-olympus
* prototech/ticket/12048:
  [ticket/12048] Fix the regexp for language keys in custom bbcodes.
2013-12-02 10:07:06 +01:00
Cesar G
eef1b586d5 [ticket/12048] Fix the regexp for language keys in custom bbcodes.
PHPBB3-12048
2013-12-02 00:53:42 -08:00
Cesar G
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
Andreas Fischer
0b55ab720c [ticket/12050] Make phpbb_notification_submit_post_base abstract.
PHPBB3-12050
2013-12-01 13:03:03 +01:00
Dhruv
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
Dhruv
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
Andreas Fischer
981df153d2 [ticket/11699] Also exclude the phpBB/cache directory.
PHPBB3-11699
2013-11-29 14:02:50 +01:00
Andreas Fischer
0834a749e7 [ticket/11699] Properly exclude the .git directory. Namely missing dot prefix.
PHPBB3-11699
2013-11-29 14:00:55 +01:00
Andreas Fischer
97b1d70a37 [ticket/11699] Exclude build/new_version and build/old_versions from lint.
PHPBB3-11699
2013-11-29 10:50:38 +01:00
Joas Schilling
5d69eddcf5 [ticket/12045] Only display group selection if there are groups
Also fixed the empty option which is not allowed.

PHPBB3-12045
2013-11-28 13:22:25 +01:00
Joas Schilling
d9c754a650 [ticket/12045] Correctly close <span> before closing parent tag
PHPBB3-12045
2013-11-28 13:17:38 +01:00