aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Nicofuma2015-03-292-5/+10
|\
| * Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-292-5/+10
| |\ | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3376
| | * Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-062-5/+10
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/index.php phpBB/includes/acp/acp_attachments.php
| | | * [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13568
| | | * [ticket/13568] Validate imagick path as readable absolute pathMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13568
| | | * Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-291-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
| | | | * Merge pull request #3348 from bantu/ticket/13549Andreas Fischer2015-01-291-1/+1
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME... * bantu/ticket/13549: [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
| | | | | * [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.Marc Alexander2015-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ORIG_PATH_INFO on IIS also contains the script name. Only use that for killing the script after removing the script name from ORIG_PATH_INFO. PHPBB3-13549
| | | * | | Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-291-1/+1
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | * prep-release-3.0.13: [ticket/12933] Handle case when * is last character of word
| | | | * | [ticket/12933] Handle case when * is last character of wordDhruv2015-01-281-1/+1
| | | | |/ | | | | | | | | | | | | | | | PHPBB3-12933
| | | | * [prep-release-3.0.13] Bump version numbers for 3.0.13 releaseNils Adermann2015-01-261-1/+1
| | | | |
* | | | | Merge branch '3.1.x'Nicofuma2015-03-241-5/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3398 from marc1706/ticket/13612Nicofuma2015-03-241-5/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13612] Run meta refresh until extension is fully enabled
| | * | | | [ticket/13612] Always display success message if extension was enabledMarc Alexander2015-02-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An error will already be triggered if enable_step() is not successful. Redirecting for no obvious reason will just confuse users. PHPBB3-13612
* | | | | | Merge branch '3.1.x'Nicofuma2015-03-241-13/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.Cesar G2015-03-231-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid while hitting the LOGIN_ERROR_ATTEMPTS error. PHPBB3-13698
* | | | | | Merge branch '3.1.x'Cesar G2015-03-231-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13719] Remove superfluous $search_options in acp_search.
| * | | | | [ticket/13719] Remove superfluous $search_options in acp_search.brunoais2015-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13719
* | | | | | Merge branch '3.1.x'Marc Alexander2015-03-101-3/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3445 from RMcGirr83/ticket/13650Marc Alexander2015-03-101-3/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13650] Move core event
| | * | | | | [ticket/13650] Move core eventRMcGirr832015-02-251-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13650
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-071-1/+27
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3452 from RobertHeim/ticket/13658Marc Alexander2015-03-071-1/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13658] add event before and after topics are deleted
| | * | | | | | [ticket/13658] renamed events and added table_ary parameterRobert Heim2015-02-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added suffix '_query' to event names - added table_ary to before event PHPBB3-13658
| | * | | | | | [ticket/13658] add event before and after topics are deletedRobertHeim2015-02-271-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13658
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-061-1/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3473 from RMcGirr83/ticket/13675Marc Alexander2015-03-061-1/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13675] Add validate to acp_profile event and add template events
| | * | | | | | | [ticket/13675] Add validate to acp_profile event and add template eventsRichard McGirr2015-03-061-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for acp users profile PHPBB3-13675
* | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-061-23/+51
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3450 from brunoais/ticket/13142Marc Alexander2015-03-061-23/+51
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13142] Before query to get the total number of reports
| | * | | | | | | | [ticket/13142] Default $total to -1 before the event for more flexibilitybrunoais2015-02-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| | * | | | | | | | [ticket/13142] Removed surperfulous spacebrunoais2015-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| | * | | | | | | | [ticket/13142] Removed surperfulous new linebrunoais2015-02-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
| | * | | | | | | | [ticket/13142] Place the event in the most meaningful placebrunoais2015-02-261-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event now has nearly all variables and it is in the place where it can most influence this method's outcome without requiring the extension to re-process phpBB's code. PHPBB3-13142
| | * | | | | | | | [ticket/13142] Delete event in order to move it.brunoais2015-02-261-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13142
* | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-061-0/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge pull request #3426 from kinerity/ticket/13637Marc Alexander2015-03-061-0/+26
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13637] Add core.ucp_pm_compose_alter_vars PHP event
| | * | | | | | | | | [ticket/13637] Update msg_id docblockKailey Truscott2015-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change topic_id to post_id PHPBB3-13637
| | * | | | | | | | | [ticket/13637] Update event name and docblockKailey Truscott2015-02-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the event name to core.ucp_pm_compose_modify_data Change description of to_group_id and submit dockblock PHPBB3-13637
| | * | | | | | | | | [ticket/13637] Add core.ucp_pm_compose_alter_vars PHP eventKailey Truscott2015-02-191-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new PHP event to ucp_pm_compose to alter the default vars PHPBB3-13637
* | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-051-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #3413 from kasimi/ticket/13540Marc Alexander2015-03-051-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | [ticket/13540] Add topic info and total posts count to mcp_topic_review_modify_row event
| | * | | | | | | | | [ticket/13540] Add total post count to mcp_topic_review_modify_row eventkasimi2015-02-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13540
| | * | | | | | | | | [ticket/13540] Add topic_info to mcp_topic_review_modify_row eventkasimi2015-02-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13540
* | | | | | | | | | | Merge pull request #3434 from nickvergessen/ticket/13647Marc Alexander2015-03-055-5/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13647] Move FAQ page to a controller
| * | | | | | | | | | | [ticket/13647] Generate route links for faqJoas Schilling2015-02-225-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13647
* | | | | | | | | | | | Merge branch '3.1.x'Marc Alexander2015-02-271-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3388 from rxu/ticket/13596Marc Alexander2015-02-271-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13596] Add display_forums() event to allow modifying forums list data
| | * | | | | | | | | | | [ticket/13596] Add display_forums() event to allow modifying forums list datarxu2015-02-101-0/+22
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add display_forums() core event in includes/functions_display.php to allow modifying forums list data before the list is being generated and dumped to the template. PHPBB3-13596
* | | | | | | | | | | | Merge branch '3.1.x'Joas Schilling2015-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/functions_mcp.php