aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-222-1/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12332] Fix plupload attachments with long names overflow
| * | | | Merge pull request #2638 from VSEphpbb/ticket/12332Joas Schilling2014-06-222-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12332] Fix plupload attachments with long names * VSEphpbb/ticket/12332: [ticket/12332] Fix plupload attachments with long names overflow
| | * | | | [ticket/12332] Fix plupload attachments with long names overflowMatt Friedman2014-06-222-1/+5
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-12332
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-224-5/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12740] Use class for logo in css
| * | | | Merge pull request #2617 from hanakin/ticket/12740Joas Schilling2014-06-224-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12740] Use .logo instead of #logo in css * hanakin/ticket/12740: [ticket/12740] Use class for logo in css
| | * | | | [ticket/12740] Use class for logo in csshanakin2014-06-204-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12740
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-221-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATION
| * | | | | Merge pull request #2632 from Dragooon/ticket/12753Joas Schilling2014-06-221-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUAION * Dragooon/ticket/12753: [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATION
| | * | | | | [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATIONShitiz Garg2014-06-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12753
* | | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-06-229-1/+136
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12730] Update Google+ button class to use proper identification [ticket/12730] Update maxlen for type_googleplus to 255 [ticket/12730] Fix type_googleplus_test to use same validation rule as the field [ticket/12730] Update field_length to be 20 by default for Google+ [ticket/12730] Google+ field_order should be 13 [ticket/12730] Switch service name to googleplus for type_googleplus [ticket/12730] Restore field_length to 10 for type_googleplus [ticket/12730] Add functional test for Google+ field [ticket/12730] Value shouldn't be escaped for schema_data.sql [ticket/12730] Missing newline at type_googleplus_test.php [ticket/12730] Set field_active to 1 for Google+ field [ticket/12730] Add unit test for type_googleplus [ticket/12730] Add missing brackets to type_googleplus.php [ticket/12730] Update field_order for Google+ CPF [ticket/12730] Use string template for Google+ CPF instead of a new one [ticket/12730] Minor formatting fixes [ticket/12730] Incorrect indentation for type_googleplus [ticket/12730] Spaces in block header [ticket/12730] Add a Google+ field by default [ticket/12730] Add Google+ profile field type
| * | | | | | Merge pull request #2615 from Dragooon/ticket/12730Joas Schilling2014-06-229-1/+136
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12730] Add Google+ profile field * Dragooon/ticket/12730: [ticket/12730] Update Google+ button class to use proper identification [ticket/12730] Update maxlen for type_googleplus to 255 [ticket/12730] Fix type_googleplus_test to use same validation rule as the field [ticket/12730] Update field_length to be 20 by default for Google+ [ticket/12730] Google+ field_order should be 13 [ticket/12730] Switch service name to googleplus for type_googleplus [ticket/12730] Restore field_length to 10 for type_googleplus [ticket/12730] Add functional test for Google+ field [ticket/12730] Value shouldn't be escaped for schema_data.sql [ticket/12730] Missing newline at type_googleplus_test.php [ticket/12730] Set field_active to 1 for Google+ field [ticket/12730] Add unit test for type_googleplus [ticket/12730] Add missing brackets to type_googleplus.php [ticket/12730] Update field_order for Google+ CPF [ticket/12730] Use string template for Google+ CPF instead of a new one [ticket/12730] Minor formatting fixes [ticket/12730] Incorrect indentation for type_googleplus [ticket/12730] Spaces in block header [ticket/12730] Add a Google+ field by default [ticket/12730] Add Google+ profile field type
| | * | | | | | [ticket/12730] Update Google+ button class to use proper identificationShitiz Garg2014-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Update maxlen for type_googleplus to 255Shitiz Garg2014-06-213-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Update field_length to be 20 by default for Google+Shitiz Garg2014-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Google+ field_order should be 13Shitiz Garg2014-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Switch service name to googleplus for type_googleplusShitiz Garg2014-06-211-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Restore field_length to 10 for type_googleplusShitiz Garg2014-06-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Value shouldn't be escaped for schema_data.sqlShitiz Garg2014-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Set field_active to 1 for Google+ fieldShitiz Garg2014-06-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Add missing brackets to type_googleplus.phpShitiz Garg2014-06-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Update field_order for Google+ CPFShitiz Garg2014-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Use string template for Google+ CPF instead of a new oneShitiz Garg2014-06-213-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Minor formatting fixesShitiz Garg2014-06-212-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Incorrect indentation for type_googleplusShitiz Garg2014-06-211-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Spaces in block headerShitiz Garg2014-06-211-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Add a Google+ field by defaultShitiz Garg2014-06-216-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12730
| | * | | | | | [ticket/12730] Add Google+ profile field typeShitiz Garg2014-06-214-0/+71
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google+ has a "+" before a custom URL but doesn't for those which are using their integer ID. To cover that we need to have an extra profile field PHPBB3-12730