Commit graph

20231 commits

Author SHA1 Message Date
Matt Friedman
5195f9c299 [ticket/12060] Add event core.display_custom_bbcodes_modify_sql
Modify the SQL statement retrieving the custom bbcodes

PHPBB3-12060
2013-12-04 16:44:21 -08:00
Matt Friedman
8f309a70db [ticket/12060] Add $phpbb_dispatcher to acp_bbcodes.php for events
PHPBB3-12060
2013-12-04 16:43:26 -08:00
Matt Friedman
2e33095177 [ticket/12060] Add acp event core.acp_bbcodes_display_bbcodes
Modify display of bbcodes in the form

PHPBB3-12060
2013-12-04 16:42:55 -08:00
Matt Friedman
79b8ecad4d [ticket/12060] Add acp event core.acp_bbcodes_display_form
Modify bbcode template data before we display the form

PHPBB3-12060
2013-12-04 16:42:07 -08:00
Matt Friedman
226376c573 [ticket/12060] Add acp event core.acp_bbcodes_modify_create
Modify bbcode data before modify/create

PHPBB3-12060
2013-12-04 16:40:41 -08:00
Matt Friedman
a4d20d988b [ticket/12060] Add acp event core.acp_bbcodes_edit_add
Modify bbcode template before we display the add/edit form

PHPBB3-12060
2013-12-04 16:39:10 -08:00
Matt Friedman
bd8c444c12 [ticket/12060] Wrap subsilver2 posting buttons in div with id tags
Wrap the posting buttons in div tags with id attributes to allow needed
ability to process them with CSS, for example, to hide them.

PHPBB3-12060
2013-12-04 16:37:16 -08:00
Matt Friedman
35da9ab9cf [ticket/12060] Add template events posting_editor_buttons_before/after
PHPBB3-12060
2013-12-04 16:35:11 -08:00
Matt Friedman
60a51eddd4 [ticket/12060] Add template event acp_bbcodes_actions_prepend/append
PHPBB3-12060
2013-12-04 16:32:47 -08:00
Matt Friedman
b3a96f0a70 [ticket/12060] Add template event acp_bbcodes_edit_form_append
PHPBB3-12060
2013-12-04 16:32:27 -08:00
Matt Friedman
097fba9fdf [ticket/12059] Allow INCLUDECSS to work with ACP templates
PHPBB3-12059
2013-12-04 15:51:14 -08:00
Cesar G
03509f2f97 [ticket/12055] Alternate table row background colors using nth-child rule.
PHPBB3-12055
2013-12-04 14:53:07 -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
Matt Friedman
186f3ecb7e [ticket/12054] Update index_body_linklist_before/after template events
PHPBB3-12054
2013-12-03 17:20:32 -08: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
86e629e533 [ticket/12039] Remove debug code
PHPBB3-12039
2013-12-02 13:26:49 +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
Marc Alexander
6618f0ea24 [ticket/11859] Make avatar drivers return template filename
The service name might not follow the expected naming scheme which would
cause abnormally long filenames and confusion for authors that might add
more avatar drivers.

PHPBB3-11859
2013-11-27 15:18:42 +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
Joas Schilling
de727b80e2 [ticket/12039] Fix option descriptions
PHPBB3-12039
2013-11-27 15:16:40 +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
Joas Schilling
e6749261f1 [ticket/12039] Use an abstract class and some more minor adjustments
PHPBB3-12039
2013-11-27 14:16:34 +01:00
Cesar G
680f8eae50 [ticket/12040] Prevent AJAX background animation flicker in ACP
PHPBB3-12040
2013-11-26 10:18:53 -08:00
Joas Schilling
d5743f008d [ticket/12039] Add config:* to the command line interface tool
PHPBB3-12039
2013-11-26 18:11:54 +01:00