aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developNils Adermann2014-06-238-963/+984
|\ | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12612] Move functions from mcp.php to functions_mcp.php [ticket/12612] Move function from ucp.php to functions_user.php [ticket/12612] Move functions from memberlist.php to functions_display.php [ticket/12612] Move functions from posting.php to functions_posting.php
| * Merge remote-tracking branch 'github-nickvergessen/ticket/12612-ascraeus' ↵Nils Adermann2014-06-238-963/+984
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop-ascraeus * github-nickvergessen/ticket/12612-ascraeus: [ticket/12612] Move functions from mcp.php to functions_mcp.php [ticket/12612] Move function from ucp.php to functions_user.php [ticket/12612] Move functions from memberlist.php to functions_display.php [ticket/12612] Move functions from posting.php to functions_posting.php
| | * [ticket/12612] Move functions from mcp.php to functions_mcp.phpJoas Schilling2014-06-182-646/+667
| | | | | | | | | | | | PHPBB3-12612
| | * [ticket/12612] Move function from ucp.php to functions_user.phpJoas Schilling2014-06-182-20/+20
| | | | | | | | | | | | PHPBB3-12612
| | * [ticket/12612] Move functions from memberlist.php to functions_display.phpJoas Schilling2014-06-182-163/+163
| | | | | | | | | | | | PHPBB3-12612
| | * [ticket/12612] Move functions from posting.php to functions_posting.phpJoas Schilling2014-06-182-134/+134
| | | | | | | | | | | | PHPBB3-12612
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-231-0/+0
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12761] Remove the execute bit from functions_user.php
| * | [ticket/12761] Remove the execute bit from functions_user.phpn-aleha2014-06-231-0/+0
| | | | | | | | | | | | PHPBB3-12761
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-231-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12726] Fix coding style [ticket/12726] Update error message [ticket/12726] Fix coding style [ticket/12726] Ensure PHP files do not contain any unused use statements [ticket/12726] PSR2.Namespaces.NamespaceDeclaration
| * | Merge pull request #2625 from Nicofuma/ticket/12726Andreas Fischer2014-06-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12726] Add Code Sniffer sniff ensuring PHP files do not contain any unused use statements * Nicofuma/ticket/12726: [ticket/12726] Fix coding style [ticket/12726] Update error message [ticket/12726] Fix coding style [ticket/12726] Ensure PHP files do not contain any unused use statements [ticket/12726] PSR2.Namespaces.NamespaceDeclaration
| | * | [ticket/12726] Ensure PHP files do not contain any unused use statementsTristan Darricau2014-06-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12726
* | | | Merge branch 'develop-ascraeus' into developCesar G2014-06-2221-73/+425
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12608] Change CSS classes to prevent styling conflicts [ticket/12608] Add subSilver [ticket/12608] Changed get_styling() to get_style_class() [ticket/12608] Remove somewhat redundant reported color style [ticket/12608] Improved LTR and various bugfixes [ticket/12608] Clean up whitespace [ticket/12608] Add styling (CSS class) options to notifications [ticket/12608] Updated tests [ticket/12608] Improve notifications drop-down menu styling in header
| * | | Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeusCesar G2014-06-2221-73/+425
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12608: [ticket/12608] Change CSS classes to prevent styling conflicts [ticket/12608] Add subSilver [ticket/12608] Changed get_styling() to get_style_class() [ticket/12608] Remove somewhat redundant reported color style [ticket/12608] Improved LTR and various bugfixes [ticket/12608] Clean up whitespace [ticket/12608] Add styling (CSS class) options to notifications [ticket/12608] Updated tests [ticket/12608] Improve notifications drop-down menu styling in header
| | * | | [ticket/12608] Change CSS classes to prevent styling conflictsPayBas2014-06-225-12/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| | * | | [ticket/12608] Add subSilverPayBas2014-06-154-8/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| | * | | [ticket/12608] Changed get_styling() to get_style_class()PayBas2014-06-156-22/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| | * | | [ticket/12608] Remove somewhat redundant reported color stylePayBas2014-06-151-2/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| | * | | [ticket/12608] Improved LTR and various bugfixesPayBas2014-06-156-15/+59
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| | * | | [ticket/12608] Clean up whitespacePayBas2014-06-151-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
| | * | | [ticket/12608] Add styling (CSS class) options to notificationsPayBas2014-06-159-6/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow different notifications to have different styles PHPBB3-12608
| | * | | [ticket/12608] Improve notifications drop-down menu styling in headerPayBas2014-06-1516-52/+296
| | | | | | | | | | | | | | | | | | | | PHPBB3-12608
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-06-2221-1088/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird
| * | | | Merge pull request #2629 from nickvergessen/ticket/12747Andreas Fischer2014-06-2221-1088/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12747] Drop support for Firebird * nickvergessen/ticket/12747: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird Conflicts: phpBB/phpbb/db/driver/firebird.php
| | * | | | [ticket/12747] Drop support for FirebirdJoas Schilling2014-06-2021-1080/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12747
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-2211-2/+82
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12704] Improve the load time information in the footer when enabled
| * | | | | Merge pull request #2591 from rxu/ticket/12704Joas Schilling2014-06-2211-2/+82
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12704] Improve the load time information in the footer when enabled * rxu/ticket/12704: [ticket/12704] Improve the load time information in the footer when enabled
| | * | | | | [ticket/12704] Improve the load time information in the footer when enabledrxu2014-06-2011-2/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #2570 has added new constant to display load time information without debug mode is being on (https://tracker.phpbb.com/browse/PHPBB3-12687). This patch expands the total load time info with SQL/PHP load times, while hiding the additional info with <abbr> element. PHPBB3-12704
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12714] Move "allow all forums" in its own dd-element
| * | | | | | Merge pull request #2597 from Skouat/ticket/12714Joas Schilling2014-06-221-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12714] Switching the description of radio buttons to align the correct description above the listbox * Skouat/ticket/12714: [ticket/12714] Move "allow all forums" in its own dd-element
| | * | | | | | [ticket/12714] Move "allow all forums" in its own dd-elementMario Skouat2014-06-221-2/+2
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | PHPBB3-12714
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-1/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12691] Comment change [ticket/12691] Change event to core.delete_pm_before [ticket/12691] Add core.delete_pm to funtion delete_pm
| * | | | | | Merge pull request #2575 from lucifer4o/ticket/12691Joas Schilling2014-06-221-1/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12691] Add core.delete_pm to funtion delete_pm * lucifer4o/ticket/12691: [ticket/12691] Comment change [ticket/12691] Change event to core.delete_pm_before [ticket/12691] Add core.delete_pm to funtion delete_pm
| | * | | | | | [ticket/12691] Comment changeStanislav Atanasov2014-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change a bit the core event comment PHPBB3-12691
| | * | | | | | [ticket/12691] Change event to core.delete_pm_beforeStanislav Atanasov2014-06-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a requested change by nickvergessen PHPBB3-12691
| | * | | | | | [ticket/12691] Add core.delete_pm to funtion delete_pmStanislav Atanasov2014-06-221-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.delete_pm to funtion delete_pm. Event will return: int $user_id - ID of the user requested the message delete array $msg_ids - array of all messages to be deleted int $folder_id - ID of the user folder where the messages are stored Justification: Allow extensions to capture this event and act as intended by ext author PHPBB3-12691
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-1/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12701] Add change [ticket/12701] Rmove before event and expand modify_data [ticket/12701] Add events to user_add function
| * | | | | | | Merge pull request #2586 from lucifer4o/ticket/12701Joas Schilling2014-06-221-1/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/12701] Add events to user_add function * lucifer4o/ticket/12701: [ticket/12701] Add change [ticket/12701] Rmove before event and expand modify_data [ticket/12701] Add events to user_add function
| | * | | | | | | [ticket/12701] Add changeStanislav Atanasov2014-06-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change back to since Add change PHPBB3-12701
| | * | | | | | | [ticket/12701] Rmove before event and expand modify_dataStanislav Atanasov2014-06-221-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing core.user_add_before Adding $user_row and $cp_data to core.user_add_modify_data PHPBB3-12701
| | * | | | | | | [ticket/12701] Add events to user_add functionStanislav Atanasov2014-06-221-0/+23
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two new events to user_add function in ./includes/functions_user.php. core.user_add_before - allow modification of submitted to function data. Returns: @var array $user_row - user_row array - User array @var array $cp_data - cp_data array - CPF array core.user_add_after - return user_id, user_row and cp_data after user registration Returns: @var int $user_id - user_id of the new user @var array $user_row - user_row array - User array @var array $cp_data - cp_data array - CPF array Justification: Allow extensions to parse data before and after creation of the user. PHPBB3-12701
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-224-6/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12646] Changed to navlinks.MICRODATA [ticket/12646] Add check for navlinks.FORUM_ID [ticket/12646] Changed index/home data attr & updated subsilver [ticket/12646] Add data-f attribute to breadcrumb links
| * | | | | | | Merge pull request #2530 from PayBas/ticket/12646Joas Schilling2014-06-224-6/+14
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12646] Add data-# attribute to breadcrumb links * PayBas/ticket/12646: [ticket/12646] Changed to navlinks.MICRODATA [ticket/12646] Add check for navlinks.FORUM_ID [ticket/12646] Changed index/home data attr & updated subsilver [ticket/12646] Add data-f attribute to breadcrumb links
| | * | | | | | [ticket/12646] Changed to navlinks.MICRODATAPayBas2014-06-103-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12646
| | * | | | | | [ticket/12646] Add check for navlinks.FORUM_IDPayBas2014-06-102-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12646
| | * | | | | | [ticket/12646] Changed index/home data attr & updated subsilverPayBas2014-06-013-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12646
| | * | | | | | [ticket/12646] Add data-f attribute to breadcrumb linksPayBas2014-06-012-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12646
* | | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12758] Add @changed to doc block [ticket/12758] Add show_results var to core.search_modify_rowset
| * | | | | | | Merge pull request #2635 from PayBas/ticket/12758Joas Schilling2014-06-221-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12758] Add show_results var to core.search_modify_rowset * PayBas/ticket/12758: [ticket/12758] Add @changed to doc block [ticket/12758] Add show_results var to core.search_modify_rowset
| | * | | | | | | [ticket/12758] Add @changed to doc blockPayBas2014-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12758
| | * | | | | | | [ticket/12758] Add show_results var to core.search_modify_rowsetPayBas2014-06-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12758