aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3326 from Wolfsblvt-Test/ticket/13537Joas Schilling2015-02-021-5/+87
|\ | | | | | | Add core events on mcp_queue for approval and disapproval
| * [ticket/13537] Add core events on mcp_queue for approval and disapprovalWolfsblvt2015-01-231-5/+87
| | | | | | | | | | | | | | | | Events added for the functions approve_posts(), approve_topics() and disapprove_posts() in mcp_queue.php, so that you can send notifications during approval and disapproval. PHPBB3-13537
* | Merge pull request #3325 from rxu/ticket/13536Joas Schilling2015-02-022-1/+49
|\ \ | | | | | | | | | [ticket/13536] Add ACP/UCP core events to allow modifying user profile data on editing
| * | [ticket/13536] Add core events to allow modifying user profile data on editingrxu2015-01-232-1/+49
| |/ | | | | | | | | | | Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744 PHPBB3-13536
* | Merge pull request #3324 from rxu/ticket/13336Joas Schilling2015-02-021-1/+31
|\ \ | | | | | | | | | [ticket/13336] Add core events to the function user_active_flip()
| * | [ticket/13336] Add core events to the function user_active_flip()rxu2015-01-231-1/+31
| |/ | | | | | | | | | | | | | | Add core events to the function user_active_flip() in includes/functions_user.php to allow checking/modifying data while activating/deactivating users. PHPBB3-13336
* | Merge pull request #3323 from rxu/ticket/13535Joas Schilling2015-02-021-0/+22
|\ \ | | | | | | | | | [ticket/13535] Add core event to allow modifying account settings on editing
| * | [ticket/13535] Add core event to allow modifying account settings on editingrxu2015-01-221-0/+22
| |/ | | | | | | | | | | Add ucp_profile.php core event to allow modifying account settings on editing. PHPBB3-13535
* | Merge pull request #3317 from Wolfsblvt/ticket/13532Joas Schilling2015-02-021-0/+19
|\ \ | | | | | | | | | Add core event to get_unread_topics() in functions.php
| * | [ticket/13532] Add core event to get_unread_topics() in functions.phpWolfsblvt2015-01-231-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Adding core event core.get_unread_topics_modify_sql to to funtion get_unread_topics() in functions.php, so that you now are able to modify the sql query that retrieves the unread topics. PHPBB3-13532
* | | Merge pull request #3305 from Wolfsblvt/ticket/13518Joas Schilling2015-02-021-1/+34
|\ \ \ | | | | | | | | | | | | Add core event to markread() in functions.php
| * | | [ticket/13518] Add core event to markread() in functions.phpWolfsblvt2015-01-231-1/+34
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Adding core event core.markread_before to to funtion markread() in functions.php, so that you now are able to add additional stuff inside the markread process, for example notifications designed in extensions. PHPBB3-13518
* | | Merge pull request #3282 from Elsensee/ticket/13313Joas Schilling2015-02-021-2/+16
|\ \ \ | | | | | | | | | | | | [ticket/13313] Add event core.acp_email_display
| * | | [ticket/13313] Update version in @since tag of eventOliver Schramm2015-01-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13313
| * | | [ticket/13313] Add event core.acp_email_displayOliver Schramm2015-01-111-2/+16
| | | | | | | | | | | | | | | | PHPBB3-13313
* | | | Merge pull request #3334 from paul999/ticket/13542Marc Alexander2015-02-021-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/13542] Update core.ucp_prefs_personal_data to include $error
| * | | | [ticket/13542] Added sentenence of what is changed in the eventpaulsohier2015-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13542
| * | | | [ticket/13542] Merge result of validation into existing $errorpaulsohier2015-01-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because extensions can set a entry in $error, the result of the validate needs to be merged into it. PHPBB3-13542
| * | | | [ticket/13542] Update core.ucp_prefs_personal_data to include $errorpaulsohier2015-01-241-1/+3
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Update the event so extensions will be able to validate (and deny) changes. PHPBB3-13542
* | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-311-1/+1
|\ \ \ \
| * | | | [prep-release-3.1.3] Update version to 3.1.3-RC2Joas Schilling2015-01-311-1/+1
| | | | |
* | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusDhruv2015-01-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | [prep-release-3.1.3] Update version to 3.1.2-RC1Joas Schilling2015-01-261-1/+1
| |/ / /
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-281-5/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13414] Set Content-Length header only if status is not 304 Conflicts: phpBB/download/file.php
| * | | [develop-olympus] Increment version number to 3.0.14-dev.Andreas Fischer2015-01-211-1/+1
| | | |
| * | | [develop-olympus] Bump version numbers for 3.0.13-RC1 release.Andreas Fischer2015-01-211-1/+1
| | | |
| * | | [ticket/13531] Send 404 Not Found.Andreas Fischer2015-01-211-1/+15
| | | | | | | | | | | | | | | | PHPBB3-13531
| * | | [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).Marc Alexander2015-01-211-0/+34
| | | | | | | | | | | | | | | | PHPBB3-13531
| * | | Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-4/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13527] Escape information received from version server * bantu/ticket/13527: [ticket/13527] Apply htmlspecialchars() to data from version server. [ticket/13527] Remove two unused variables.
| | * | | [ticket/13527] Apply htmlspecialchars() to data from version server.Andreas Fischer2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13527
| | * | | [ticket/13527] Remove two unused variables.Andreas Fischer2015-01-201-3/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13527
| * | | | Merge pull request #3311 from bantu/ticket/13526Andreas Fischer2015-01-201-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13526] Correctly validate the ucp_pm_options form key. * bantu/ticket/13526: [ticket/13526] Correctly validate the ucp_pm_options form key.
| | * | | | [ticket/13526] Correctly validate the ucp_pm_options form key.Joas Schilling2015-01-201-1/+5
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-13526
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13519] Correctly validate imagick path as path and not string Conflicts: phpBB/includes/acp/acp_attachments.php
| * | | | Merge pull request #3306 from marc1706/ticket/13519Andreas Fischer2015-01-201-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/13519] Correctly validate imagick path as path and not string * marc1706/ticket/13519: [ticket/13519] Correctly validate imagick path as path and not string
| | * | | [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13519
| * | | | Merge pull request #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
| |\ \ \ \ | | |/ / / | |/| | | [ticket/10985] Error bbcode.html not found when updating with custom style inheriting from prosilver
| | * | | [ticket/10985] Add fix to properly inherit style during update processJakub Senko2014-09-231-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10985
| * | | | [ticket/11613] Allow cookies to work on netbios domainsJakub Senko2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11613
* | | | | Merge pull request #3226 from prototech/ticket/13420Joas Schilling2015-01-201-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.
| * | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.Cesar G2014-12-091-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-13420
* | | | | Merge pull request #3278 from rxu/ticket/13492Joas Schilling2015-01-201-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13492] Fix IDN support for custom BBCode URL tokens
| * | | | | [ticket/13492] Add the migration to update custom bbcodes with IDN regexpsrxu2015-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the $utf8 checking regexp removing the curly braces. PHPBB3-13492
| * | | | | [ticket/13492] Add IDN support for custom BBCode URL tokensrxu2015-01-111-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom BBCode URL tokens does not support IDN. Custom BBCodes added earlier than IDN has been applied are unaffected. PHPBB3-13492
* | | | | Merge pull request #3055 from marc1706/ticket/13192Tristan Darricau2015-01-191-23/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13192] Add method for generating valid user page links based on mod_rewrite * marc1706/ticket/13192: [ticket/13192] Add test for app.php in external subfolder [ticket/13192] Use ltrim() instead of preg_replace() [ticket/13192] Order test cases consistently [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root [ticket/13192] Pass correct parameters and rename method to get_valid_page [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals [ticket/13192] Use get_valid_user_page method in build_url function [ticket/13192] Add method for generating valid user page links
| * | | | [ticket/13192] Pass correct parameters and rename method to get_valid_pageMarc Alexander2014-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-13192
| * | | | [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globalsMarc Alexander2014-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $request global existed twice and the $phpEx global is not being used in confirm_box(). PHPBB3-13192
| * | | | [ticket/13192] Use get_valid_user_page method in build_url functionMarc Alexander2014-10-211-20/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13192
* | | | | Merge pull request #3189 from rxu/ticket/12926Joas Schilling2015-01-102-9/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12926] Support for IDN (IRI)
| * | | | | [ticket/12926] Get rid of the $scheme and $inline vars, fix regex_idn.phprxu2015-01-101-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the $scheme and $inline vars, fix regex_idn.php to generate both common and inline mode regexes all at once. PHPBB3-12926