mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00
Code Issues Releases Wiki Activity
19,243 Commits 17 Branches 190 Tags
Commit Graph

8225 Commits

Author SHA1 Message Date
Matt Friedman
75831dc2d0 [ticket/12060] Change @since in event docblocks 
PHPBB3-12060
 2013-12-12 14:09:30 -08:00
Matt Friedman
730a05bd30 [ticket/12060] Update the docblock comments in acp core events 
PHPBB3-12060
 2013-12-12 13:59:30 -08:00
Matt Friedman
caca36bc50 [ticket/12060] Refactor u_action in the events that use it 
PHPBB3-12060
 2013-12-12 13:58:59 -08:00
Matt Friedman
6ccec39e43 [ticket/12060] Use $sql_ary instead of $sql 
PHPBB3-12060
 2013-12-12 13:50:13 -08:00
Matt Friedman
b6eb1f66e1 [ticket/12060] Update docblock for core event due to addition of another var 
PHPBB3-12060
 2013-12-12 10:37:11 -08:00
Matt Friedman
0156136c85 [ticket/12060] Add $update_this_message var to the core event 
PHPBB3-12060
 2013-12-12 09:56:00 -08:00
Matt Friedman
b1e05be6ea [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis 
PHPBB3-12060
 2013-12-12 09:55:21 -08:00
Matt Friedman
3659ba884e [ticket/12060] Copy this_u_action back to original this->u_action var 
PHPBB3-12060
 2013-12-12 09:54:46 -08:00
Matt Friedman
f41638ebbf [ticket/12060] Fix typo in core.acp_bbcodes_edit_add doc block 
PHPBB3-12060
 2013-12-05 13:52:20 -08:00
Matt Friedman
d93200c973 [ticket/12060] Add bbcode tokens array to core.acp_bbcodes_edit_add 
PHPBB3-12060
 2013-12-05 13:49:47 -08:00
Matt Friedman
02ddc181d6 [ticket/12060] Fix a core typo in display_custom_bbcodes doc block 
PHPBB3-12060
 2013-12-04 16:46:28 -08:00
Matt Friedman
feb4ae13f4 [ticket/12060] Add event core.modify_text_for_format_display_after 
Use this event to modify the text after it is parsed

PHPBB3-12060
 2013-12-04 16:45:30 -08:00
Matt Friedman
e179f25154 [ticket/12060] Add event core.modify_bbcode_init 
Use this event to modify the bbcode data for later parsing

PHPBB3-12060
 2013-12-04 16:45:02 -08:00
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
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
a5f1dc67b9 [ticket/12026] Remove root path, its prepended later 
PHPBB3-12026
 2013-12-03 18:10:20 +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
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
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
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
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
Marc Alexander
b5e6d107ae [ticket/11842] Add missing prefix for group id in avatar data 
PHPBB3-11842
 2013-11-23 01:05:39 +01:00
Joas Schilling
2f4d15015e [ticket/10910] Do not add size when its 1 (default) 
PHPBB3-10910
 2013-11-22 15:52:59 +01:00
Mario Skouat
3a00cb0c08 [ticket/10910] Allow setting size selects in build_cfg_template() 
PHPBB3-10910
 2013-11-22 15:02:44 +01:00
Nathan Guse
df7fa8e499 Merge pull request #1854 from Pico88/ticket/12005 
[ticket/12005] Remove code responsible for PM popup completely
 2013-11-21 14:01:23 -08:00
Nathan Guse
6f419b0049 Merge pull request #1869 from prototech/ticket/10810 
[ticket/10810] Move color swatches from popup windows to inline blocks.
 2013-11-21 13:41:03 -08:00
Cesar G
6d45146df7 [ticket/11672] Move the reapply_sid() call before meta_refresh() is called. 
The $redirect assignment is not necessary because the variable  has already been
set near the start of the functions. The redirect value will also never default
to index.php because a default value has already been provided when $redirect
is initially assigned and passed to the template as a hidden field.

PHPBB3-11672
 2013-11-21 04:45:16 -08:00
Lukasz
fc778fe637 [ticket/12026] Remove phpbb root path 
PHPBB3-12026
 2013-11-20 23:12:35 +01:00
Lukasz
fa31096cb9 [ticket/12026] Correct path for template files 
Correct path for template files in MCP and UCP modules, which are added
via extenstions

PHPBB3-12026
 2013-11-20 22:57:41 +01:00
Marc Alexander
3caeb09b18 [ticket/11842] Use only new avatar type in user_delete function 
PHPBB3-11842
 2013-11-20 17:15:32 +01:00
Cesar G
bc33fd9950 [ticket/11672] Remove duplicate $request global. 
PHPBB3-11672
 2013-11-19 07:34:37 -08:00
Cesar G
03e78c33fa [ticket/11672] The json response call exits so the else is not necessary. 
PHPBB3-11672
 2013-11-19 07:32:49 -08:00
Cesar G
cccb4fb83d [ticket/11672] Remove the messages for lock/unlock/change topic type. 
PHPBB3-11672
 2013-11-19 07:32:49 -08:00
Cesar G
10bfb212c4 [ticket/11672] Clean up the logic in mcp_queue.php. 
PHPBB3-11672
 2013-11-19 07:32:49 -08:00
Cesar G
3eda261b8d [ticket/11672] Remove some messages that were missed in mcp_queue.php. 
PHPBB3-11672
 2013-11-19 07:32:49 -08:00
Cesar G
c6473da412 [ticket/11672] Replace sprintf() usage with $user->lang(). 
PHPBB3-11672
 2013-11-19 07:32:49 -08:00