aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-111-5/+5
|\
| * [ticket/13823] Move the part of the query, so the update will get it correctlyJoas Schilling2015-06-091-5/+5
| | | | | | | | PHPBB3-13823
* | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-093-6/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-083-6/+6
| | | | | | | | PHPBB3-13930
* | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-092-3/+3
|\ \ | |/ |/| | | [ticket/13685] Allow modifying the query for mysql native fulltext search
| * [ticket/13685] This should take care of the restbrunoais2015-06-081-1/+1
| | | | | | | | PHPBB3-13685
| * [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-072-3/+3
| | | | | | | | PHPBB3-13685
* | [ticket/13823] Remove the unnecessary bracketsJoas Schilling2015-06-071-2/+2
| | | | | | | | | | | | | | This changes the line with non-whitespace changes, so the packaging script should correctly detect them as changed and put the file into the update. PHPBB3-13823
* | [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-041-0/+9
| | | | | | | | SECURITY-184
* | [ticket/sec-184] Do not output Jabber password to HTMLJoas Schilling2015-06-041-2/+5
| | | | | | | | SECURITY-184
* | [ticket/sec-184] Do not output config passwords to the HTML pageJoas Schilling2015-06-041-1/+8
|/ | | | SECURITY-184
* [ticket/13838] Fix coding styleNicofuma2015-05-141-1/+2
| | | | PHPBB3-13838
* [ticket/13819] Add missing sql_freeresult() to files in includes/Marc Alexander2015-05-051-0/+1
| | | | PHPBB3-13819
* Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-291-1/+1
|\ | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3376
| * Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-061-1/+1
| |\ | | | | | | | | | | | | | | | 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 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 #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
* | | | | [ticket/13719] Remove superfluous $search_options in acp_search.brunoais2015-03-231-1/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-13719
* | | | | 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
* | | | | [ticket/13587] SQL syntax errors in get_prune_users()RMcGirr832015-02-241-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-13587
* | | | [ticket/13597] Modify variable-variable syntax to be compatible with PHP7Marc Alexander2015-02-111-1/+1
|/ / / | | | | | | | | | PHPBB3-13597
* | | Merge pull request #3325 from rxu/ticket/13536Joas Schilling2015-02-021-0/+26
|\ \ \ | | | | | | | | | | | | [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-231-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=33744 PHPBB3-13536
* | | | 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 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
| * | | [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
| | |/ | |/| | | | | | | PHPBB3-13519
* | | 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
* | | | [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
* | | [ticket/13470] Fix non-empty username array if no usernames are givenOliver Schramm2015-01-081-1/+1
| | | | | | | | | | | | PHPBB3-13470
* | | [ticket/13439] Update event version to 3.1.3-RC1Matt Friedman2015-01-041-1/+1
| | | | | | | | | | | | PHPBB3-13439
* | | [ticket/13439] Add event core.acp_users_overview_beforeMatt Friedman2015-01-031-0/+15
| | | | | | | | | | | | PHPBB3-13439
* | | [ticket/13312] Use empty for usernames arrayOliver Schramm2014-11-261-2/+2
| | | | | | | | | | | | PHPBB3-13312
* | | [ticket/13312] Add event core.acp_email_send_beforeOliver Schramm2014-11-261-19/+52
|/ / | | | | | | PHPBB3-13312
* | Merge pull request #3157 from marc1706/ticket/13358Joas Schilling2014-11-221-1/+1
|\ \ | | | | | | | | | [ticket/13358] Add class for retrieving remote file data
| * | [ticket/13358] Correctly create version_helper in acp_extensionsMarc Alexander2014-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | The full namespace for the file_downloader is now also being used in version_helper. PHPBB3-13358
* | | Merge pull request #3123 from Elsensee/ticket/13310Joas Schilling2014-11-221-7/+21
|\ \ \ | | | | | | | | | | | | [ticket/13310] Add event core.acp_email_modify_sql
| * | | [ticket/13310] Add event core.acp_email_modify_sqlOliver Schramm2014-11-091-1/+11
| | | | | | | | | | | | | | | | PHPBB3-13310
| * | | [ticket/13310] Always use sql_build_query in acp_email.phpOliver Schramm2014-11-091-6/+10
| | | | | | | | | | | | | | | | PHPBB3-13310
* | | | [ticket/10744] Fix some doc blocksJoas Schilling2014-11-211-2/+3
| | | | | | | | | | | | | | | | PHPBB3-10744
* | | | [ticket/10744] Type hint objects for IDE usagesJoas Schilling2014-11-211-0/+15
| | | | | | | | | | | | | | | | PHPBB3-10744