1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

16870 Commits

Author SHA1 Message Date
Andreas Fischer
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
David King
6b081433c5 [ticket/12069] Globalize in submit_post()
PHPBB3-12069
2013-12-08 15:08:30 -05:00
Nathan Guse
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
Nathan Guse
e379b84c7b Merge pull request #1926 from imkingdavid/ticket/12069
[ticket/12069] Fix event documentation
2013-12-08 12:03:33 -08:00
David King
0b76880816 [ticket/12069] Fix event documentation
PHPBB3-12069
2013-12-08 15:01:53 -05:00
Nathan Guse
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
David King
fdac051956 [ticket/12069] Add core.submit_post_end event
PHPBB3-12069
2013-12-08 14:42:46 -05:00
Cesar G
6098134cc6 [ticket/12067] Remove double scrollbar from notifications dropdown.
PHPBB3-12067
2013-12-07 00:43:55 -08: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
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
Matt Friedman
097fba9fdf [ticket/12059] Allow INCLUDECSS to work with ACP templates
PHPBB3-12059
2013-12-04 15:51:14 -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
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
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
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
a5f1dc67b9 [ticket/12026] Remove root path, its prepended later
PHPBB3-12026
2013-12-03 18:10:20 +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
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
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
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
Joas Schilling
371cfa4bfc [ticket/12045] Correctly close <dd> with </dd>
PHPBB3-12045
2013-11-28 13:17:07 +01:00
Joas Schilling
f58add8d79 Merge remote-tracking branch 'prototech/ticket/11507' into develop
* prototech/ticket/11507:
  [ticket/11507] Handle empty sets correctly.
  [ticket/11507] Allow group & unapproved post count options to be used alone.
  [ticket/11507] Fix the unapproved posts count query.
  [ticket/11507] Allow the posts awaiting approval value to be 0.
2013-11-28 13:12:12 +01:00
Joas Schilling
13bed15363 Merge remote-tracking branch 'prototech/ticket/12040' into develop
* prototech/ticket/12040:
  [ticket/12040] Prevent AJAX background animation flicker in ACP
2013-11-28 12:20:56 +01:00
Joas Schilling
3585d167ad Merge remote-tracking branch 'prototech/ticket/11869' into develop
* prototech/ticket/11869:
  [ticket/11869] Fix strict standards error when registering.
2013-11-28 12:10:41 +01:00
Cesar G
7da4490402 [ticket/11507] Handle empty sets correctly.
Using the last parameter in $db->sql_in_set() does not give the correct
behaviour expected here. The query should not be negated if the set is empty.

PHPBB3-11507
2013-11-27 21:26:23 -08:00
Cesar G
ef2e5ca966 [ticket/11507] Allow group & unapproved post count options to be used alone.
PHPBB3-11507
2013-11-27 21:26:22 -08:00
Cesar G
c5656747d8 [ticket/11507] Fix the unapproved posts count query.
Only unapproved posts should be counted.

PHPBB3-11507
2013-11-27 21:26:22 -08:00
Cesar G
b41e2d335a [ticket/11507] Allow the posts awaiting approval value to be 0.
PHPBB3-11507
2013-11-27 21:26:18 -08:00
Cesar G
83b1278273 [ticket/11869] Fix strict standards error when registering.
PHPBB3-11869
2013-11-27 20:05:00 -08:00
Joas Schilling
f3d7823050 [ticket/12042] Replace B with a more meaningful key name
PHPBB3-12042
2013-11-27 18:54:51 +01:00
Joas Schilling
6a2d0c345c [ticket/12042] Add all language strings from PLUpload 2.0 to the language file
PHPBB3-12042
2013-11-27 18:09:38 +01:00
Joas Schilling
e3eb82cf7d Merge remote-tracking branch 'Marc/ticket/11914' into develop
* Marc/ticket/11914:
  [ticket/11914] Add assets version to included plupload scripts
  [ticket/11914] Update plupload to 2.0.0
  [ticket/11914] Use unix line endings in plupload queue css file
2013-11-27 15:18:39 +01:00
Marc Alexander
33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842
Conflicts:
	phpBB/includes/acp/acp_groups.php
2013-11-27 14:55:24 +01:00