aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12009] Prevent user from enabling invalid extension through direct URLCesar G2013-12-121-0/+10
| | | | PHPBB3-12009
* Merge remote-tracking branch 'imkingdavid/ticket/12069' into developAndreas Fischer2013-12-081-1/+1
|\ | | | | | | | | * imkingdavid/ticket/12069: [ticket/12069] Globalize in submit_post()
| * [ticket/12069] Globalize in submit_post()David King2013-12-081-1/+1
| | | | | | | | PHPBB3-12069
* | Merge pull request #1926 from imkingdavid/ticket/12069Nathan Guse2013-12-081-2/+2
|\ \ | |/ | | [ticket/12069] Fix event documentation
| * [ticket/12069] Fix event documentationDavid King2013-12-081-2/+2
| | | | | | | | PHPBB3-12069
* | Merge pull request #1925 from imkingdavid/ticket/12069Nathan Guse2013-12-081-0/+17
|\ \ | |/ | | [ticket/12069] Add core.submit_post_end event
| * [ticket/12069] Add core.submit_post_end eventDavid King2013-12-081-0/+17
| | | | | | | | PHPBB3-12069
* | [ticket/11241] Consolidate topic actions into "Topic tools" dropdown.Cesar G2013-12-061-0/+2
| | | | | | | | PHPBB3-11241
* | 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
| * | | | | [ticket/11507] Allow the posts awaiting approval value to be 0.Cesar G2013-11-271-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-11507
* | | | | [ticket/11869] Fix strict standards error when registering.Cesar G2013-11-271-1/+2
|/ / / / | | | | | | | | | | | | PHPBB3-11869
* | | | Merge pull request #1854 from Pico88/ticket/12005Nathan Guse2013-11-215-34/+0
|\ \ \ \ | | | | | | | | | | [ticket/12005] Remove code responsible for PM popup completely
| * | | | [ticket/12005] Remove PM popupLukasz2013-11-081-2/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| * | | | [ticket/12005] Remove PM popup UCP moduleLukasz2013-11-082-28/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| * | | | [ticket/12005] Remove PM popup from converterLukasz2013-11-081-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
| * | | | [ticket/12005] Remove PM popup setting from user preferencesLukasz2013-11-081-3/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12005
* | | | | Merge pull request #1869 from prototech/ticket/10810Nathan Guse2013-11-212-2/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | [ticket/10810] Move color swatches from popup windows to inline blocks.
| * | | | [ticket/10810] Remove obsolete swatch code.Cesar G2013-11-132-2/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-10810
* | | | | [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constantJoas Schilling2013-11-191-1/+1
| | | | |
* | | | | [prep-release-3.1.0-a2] Update version to 3.1.0-a2Joas Schilling2013-11-191-1/+1
| | | | |
* | | | | Merge remote-tracking branch 'Marc/ticket/11896' into developJoas Schilling2013-11-191-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Marc/ticket/11896: [ticket/11896] Use $form_time and fix out of bounds $form_time [ticket/11896] Correctly document return of null in docblocks [ticket/11896] Minor code improvements in phpbb_functional_test_case [ticket/11896] Add functional tests for marking all notifications read [ticket/11896] Add ability to define expected message after posting [ŧicket/11896] Set form_time with time() when marking all notifications read