aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12060] Fix u_action comments in docblocksMatt Friedman2013-12-121-2/+2
| | | | PHPBB3-12060
* [ticket/12060] Change @since in event docblocksMatt Friedman2013-12-123-7/+7
| | | | PHPBB3-12060
* [ticket/12060] Update the docblock comments in acp core eventsMatt Friedman2013-12-121-4/+4
| | | | PHPBB3-12060
* [ticket/12060] Refactor u_action in the events that use itMatt Friedman2013-12-121-9/+7
| | | | PHPBB3-12060
* [ticket/12060] Use $sql_ary instead of $sqlMatt Friedman2013-12-122-16/+20
| | | | PHPBB3-12060
* [ticket/12060] Update docblock for core event due to addition of another varMatt Friedman2013-12-121-5/+6
| | | | PHPBB3-12060
* [ticket/12060] Add $update_this_message var to the core eventMatt Friedman2013-12-121-1/+1
| | | | PHPBB3-12060
* [ticket/12060] Adjust last item in array to use a comma instead of closing ↵Matt Friedman2013-12-121-2/+2
| | | | | | parenthesis PHPBB3-12060
* [ticket/12060] Copy this_u_action back to original this->u_action varMatt Friedman2013-12-121-0/+2
| | | | PHPBB3-12060
* [ticket/12060] Fix typo in core.acp_bbcodes_edit_add doc blockMatt Friedman2013-12-051-1/+1
| | | | PHPBB3-12060
* [ticket/12060] Add bbcode tokens array to core.acp_bbcodes_edit_addMatt Friedman2013-12-051-5/+7
| | | | PHPBB3-12060
* [ticket/12060] Fix a core typo in display_custom_bbcodes doc blockMatt Friedman2013-12-041-1/+1
| | | | PHPBB3-12060
* [ticket/12060] Add event core.modify_text_for_format_display_afterMatt Friedman2013-12-041-0/+22
| | | | | | Use this event to modify the text after it is parsed PHPBB3-12060
* [ticket/12060] Add event core.modify_bbcode_initMatt Friedman2013-12-041-0/+17
| | | | | | Use this event to modify the bbcode data for later parsing PHPBB3-12060
* [ticket/12060] Add event core.display_custom_bbcodes_modify_sqlMatt Friedman2013-12-041-0/+11
| | | | | | Modify the SQL statement retrieving the custom bbcodes PHPBB3-12060
* [ticket/12060] Add $phpbb_dispatcher to acp_bbcodes.php for eventsMatt Friedman2013-12-041-1/+1
| | | | PHPBB3-12060
* [ticket/12060] Add acp event core.acp_bbcodes_display_bbcodesMatt Friedman2013-12-041-2/+17
| | | | | | Modify display of bbcodes in the form PHPBB3-12060
* [ticket/12060] Add acp event core.acp_bbcodes_display_formMatt Friedman2013-12-041-2/+20
| | | | | | Modify bbcode template data before we display the form PHPBB3-12060
* [ticket/12060] Add acp event core.acp_bbcodes_modify_createMatt Friedman2013-12-041-4/+24
| | | | | | Modify bbcode data before modify/create PHPBB3-12060
* [ticket/12060] Add acp event core.acp_bbcodes_edit_addMatt Friedman2013-12-041-2/+16
| | | | | | Modify bbcode template before we display the add/edit form PHPBB3-12060
* Merge pull request #1879 from Pico88/ticket/12026Nathan Guse2013-12-041-4/+4
|\ | | | | [ticket/12026] Correct path for template files
| * [ticket/12026] Remove root path, its prepended laterJoas Schilling2013-12-031-2/+2
| | | | | | | | PHPBB3-12026
| * [ticket/12026] Remove phpbb root pathLukasz2013-11-201-1/+1
| | | | | | | | PHPBB3-12026
| * [ticket/12026] Correct path for template filesLukasz2013-11-201-4/+4
| | | | | | | | | | | | | | Correct path for template files in MCP and UCP modules, which are added via extenstions PHPBB3-12026
* | Merge pull request #1887 from nickvergessen/ticket/skouat/10910Nathan Guse2013-12-041-1/+3
|\ \ | | | | | | [ticket/10910] Function build_cfg_template() allow $size for $tpl_type = select
| * | [ticket/10910] Do not add size when its 1 (default)Joas Schilling2013-11-221-1/+1
| | | | | | | | | | | | PHPBB3-10910
| * | [ticket/10910] Allow setting size selects in build_cfg_template()Mario Skouat2013-11-221-1/+3
| | | | | | | | | | | | PHPBB3-10910
* | | Merge remote-tracking branch 'Marc/ticket/11842' into developJoas Schilling2013-12-045-10/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | [ticket/11842] Use avatar_data for obtaining driver that should be deletedMarc Alexander2013-12-044-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11842
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842Marc Alexander2013-11-2731-176/+224
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_groups.php
| * | | [ticket/11842] Add missing prefix for group id in avatar dataMarc Alexander2013-11-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11842
| * | | [ticket/11842] Use only new avatar type in user_delete functionMarc Alexander2013-11-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11842
| * | | [ticket/11842] Replace outdated occurences of user and group avatar_typeMarc Alexander2013-10-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | user_avatar_type und group_avatar_type are now a string and should therefore be treated accordingly. PHPBB3-11842
| * | | [ticket/11842] Use group_id 0 and correct avatar name after creating groupMarc Alexander2013-10-242-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems like the function group_correct_avatar() was forgotten while adding the new avatar system. We now pass the group_id 0 to the upload avatar and let the function group_correct_avatar() fix the avatar filename after creating the group like it was done previously. PHPBB3-11842
* | | | Merge remote-tracking branch 'prototech/ticket/11672' into developJoas Schilling2013-12-033-122/+114
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | [ticket/11672] Move the reapply_sid() call before meta_refresh() is called.Cesar G2013-11-212-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | [ticket/11672] Remove duplicate $request global.Cesar G2013-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| * | | | [ticket/11672] The json response call exits so the else is not necessary.Cesar G2013-11-191-23/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| * | | | [ticket/11672] Remove the messages for lock/unlock/change topic type.Cesar G2013-11-191-22/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| * | | | [ticket/11672] Clean up the logic in mcp_queue.php.Cesar G2013-11-191-97/+75
| | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| * | | | [ticket/11672] Remove some messages that were missed in mcp_queue.php.Cesar G2013-11-191-2/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| * | | | [ticket/11672] Replace sprintf() usage with $user->lang().Cesar G2013-11-192-5/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11672
| * | | | [ticket/11672] Removed unnecessary text from alerts.callumacrae2013-11-192-7/+26
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Messages like "Return to forum last visited" are entirely unnecessary when using AJAX to delete a post, so this commit removes them. PHPBB3-11672
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-12-021-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12048] Fix the regexp for language keys in custom bbcodes.
| * | | | [ticket/12048] Fix the regexp for language keys in custom bbcodes.Cesar G2013-12-021-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12048
* | | | | [ticket/12045] Only display group selection if there are groupsJoas Schilling2013-11-281-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed the empty option which is not allowed. PHPBB3-12045
* | | | | Merge remote-tracking branch 'prototech/ticket/11507' into developJoas Schilling2013-11-281-28/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | | [ticket/11507] Handle empty sets correctly.Cesar G2013-11-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | [ticket/11507] Allow group & unapproved post count options to be used alone.Cesar G2013-11-271-21/+37
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11507
| * | | | | [ticket/11507] Fix the unapproved posts count query.Cesar G2013-11-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only unapproved posts should be counted. PHPBB3-11507