aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* 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] Also check if absolute_path_writable is writableMarc Alexander2015-02-061-1/+1
| | | | | | | | | | | | PHPBB3-13568
| | * [ticket/13568] Correctly check rpath and rwpath validation optionsMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | PHPBB3-13568
| | * [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-022-40/+9
| | | | | | | | | | | | PHPBB3-13568
| | * [ticket/13568] Validate imagick path as readable absolute pathMarc Alexander2015-02-022-1/+37
| | | | | | | | | | | | PHPBB3-13568
* | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-03-261-3/+7
|\ \ \ | | | | | | | | | | | | | | | | * 3.0.x: [ticket/13555] Render poll options separately when previewing.
| * \ \ Merge pull request #3493 from prototech/ticket/13555Andreas Fischer2015-03-261-3/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13555] Render poll options separately when previewing. * prototech/ticket/13555: [ticket/13555] Render poll options separately when previewing.
| | * | | [ticket/13555] Render poll options separately when previewing.JoshyPHP2015-03-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents an option from being split into two when a line break is present inside of it. PHPBB3-13555
* | | | | [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31xNicofuma2015-03-251-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/AUTHORS PHPBB3-13723
| * | | | [ticket/13723] Add Elsensee to authors listNicofuma2015-03-251-1/+2
| |/ / / | | | | | | | | | | | | PHPBB3-13723
* | | | 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 pull request #3501 from prototech/ticket/13698Nicofuma2015-03-241-13/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
| * | | | | [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
* | | | | | [ticket/13271] Fix URL Rewriting on IIS7Oliver Schramm2015-03-231-0/+12
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-13271
* | | | | [ticket/13719] Remove superfluous $search_options in acp_search.brunoais2015-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13719
* | | | | Merge remote-tracking branch 'Senky/ticket/9457' into 3.1.xCesar G2015-03-188-10/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/9457: [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
| * | | | | [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template filesJakub Senko2015-02-168-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9457
* | | | | | [ticket/13550] Check that the Plupload temp directory is writable before movingCesar G2015-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a PHP warning from being issued that results in an invalid JSON response being returned to the user. PHPBB3-13550
* | | | | | Merge branch 'ticket/13702' into 3.1.xDhruv2015-03-156-5/+6
|\ \ \ \ \ \
| * | | | | | [ticket/13702] Add initial-scale to viewport in page headercyberalien2015-03-146-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13702
* | | | | | | Merge pull request #3476 from brunoais/ticket/13674Dhruv Goel2015-03-141-11/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [ticket/13674] Change MySQL native total search results calculation
| * | | | | | [ticket/13674] Missing space after "if"brunoais2015-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13674
| * | | | | | [ticket/13674] Change MySQL native total search results calculationbrunoais2015-03-061-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes how the native FULLTEXT search calculates the total match number for MySQL. This should improve performance as there is one less query being made and it is being searched using the technique mentioned in the manual PHPBB3-13674
* | | | | | | Merge pull request #3428 from prototech/ticket/13463Marc Alexander2015-03-111-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13463] Correctly position notification mark read icon in RTL.
| * | | | | | | [ticket/13463] Correctly position notification mark read icon in RTL.Scout4all2015-02-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13463
* | | | | | | | Merge pull request #3477 from n-aleha/ticket/13679Marc Alexander2015-03-102-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13679] Add template event overall_header_searchbox_before
| * | | | | | | | [ticket/13679] Add template event overall_header_searchbox_beforen-aleha2015-03-082-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13679
* | | | | | | | | 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 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 pull request #3473 from RMcGirr83/ticket/13675Marc Alexander2015-03-063-2/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-063-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for acp users profile PHPBB3-13675
* | | | | | | | | | | 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 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 pull request #3405 from brunoais/ticket/13625Marc Alexander2015-03-061-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | [ticket/13625] Adding multiple variables to core.viewforum_get_topic_data
| * | | | | | | | | | | [ticket/13625] Added forum_id to allow more flexibility and possibilities.brunoais2015-03-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13625
| * | | | | | | | | | | [ticket/13625] Adding multiple variables to core.viewforum_get_topic_databrunoais2015-02-161-0/+12
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added topics_count, sort_days, sort_key and sort_dir to core.viewforum_get_topic_data and adjusted the event's comment explaining it's possible extended purpose now that it has more variables. PHPBB3-13625
* | | | | | | | | | | Merge remote-tracking branch 'marc1706/ticket/13666' into 3.1.xCesar G2015-03-051-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/13666: [ticket/13666] Remove data-clicked attribute from all of form's submit buttons