aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2748 from carlo94it/ticket/12765Marc Alexander2014-09-051-142/+3
|\ | | | | | | [ticket/12765] Use db_tools instead of generating queries at moment
| * [ticket/12765] Execute query directly from db toolsCarlo2014-08-101-4/+2
| | | | | | | | PHPBB3-12765
| * [ticket/12765] Use db_tools instead of generating queries at momentCarlo2014-08-101-142/+5
| | | | | | | | PHPBB3-12765
* | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-161-1/+1
| | | | | | | | PHPBB3-12990
* | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-112-40/+40
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| * | [ticket/12822] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-072-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
* | | [ticket/11854] Rename captchas.factory service to captcha.factoryTristan Darricau2014-08-111-2/+2
| | | | | | | | | | | | PHPBB3-11854
* | | [ticket/11854] Move captcha stuff to phpbb/ and use DI for pluginsTristan Darricau2014-08-111-9/+8
| |/ |/| | | | | PHPBB3-11854
* | [ticket/10404] Fix codesniffer complaint about anonymous functionMarc Alexander2014-08-081-1/+4
| | | | | | | | PHPBB3-10404
* | [ticket/10404] Use anonymous function instead of create_function in acp/authMarc Alexander2014-08-081-1/+1
|/ | | | PHPBB3-10404
* Merge pull request #2812 from bantu/ticket/12826Joas Schilling2014-08-071-1/+1
|\ | | | | | | | | | | | | | | [ticket/12826] Add root namespace indicator to exception catching. * bantu/ticket/12826: [ticket/12826] Add optional root namespace indicator for consistency. [ticket/12826] Add mandatory root namespace indicator to exception catching.
| * [ticket/12826] Add optional root namespace indicator for consistency.Andreas Fischer2014-08-071-1/+1
| | | | | | | | PHPBB3-12826
* | Merge pull request #2720 from PayBas/ticket/12838Joas Schilling2014-08-071-5/+41
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12838] Add ACP events to acp_ranks * PayBas/ticket/12838: [ticket/12838] Simplify normal special rank array creation [ticket/12838] Update RC2 to RC3 [ticket/12838] Update events.md to RC3 [ticket/12838] Allow for extra columns in cache obtain_ranks() [ticket/12838] Add raw row-data to acp_ranks core event [ticket/12838] Simplify special rank template conditional [ticket/12838] Add core events to acp_ranks.php [ticket/12838] Update events.md [ticket/12838] Add _before versions [ticket/12838] Add template events to acp_ranks.html
| * [ticket/12838] Update RC2 to RC3PayBas2014-07-161-3/+3
| | | | | | | | PHPBB3-12838
| * [ticket/12838] Add raw row-data to acp_ranks core eventPayBas2014-07-101-3/+4
| | | | | | | | PHPBB3-12838
| * [ticket/12838] Add core events to acp_ranks.phpPayBas2014-07-101-5/+40
| | | | | | | | PHPBB3-12838
* | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-071-0/+12
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12847] Allow the extensions to say if they can be enabled * Nicofuma/ticket/12847: [ticket/12847] Allow the extensions to say if they can be enabled
| * | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-131-0/+12
| |/ | | | | | | PHPBB3-12847
* | Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-072-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12557] Fix doc block errors found by Sami for ascraeus * n-aleha/ticket/12557ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
| * | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+0
| | | | | | | | | | | | | | | | | | More corrections. PHPBB3-12557
| * | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+2
| | | | | | | | | | | | PHPBB3-12557
* | | [ticket/12901] Fix another wrong type hint for $levelJoas Schilling2014-08-031-1/+1
| | | | | | | | | | | | PHPBB3-12901
* | | [ticket/12901] Fix type hinting of style $leveljeroendedauw2014-08-031-1/+1
|/ / | | | | | | PHPBB3-12901
* | Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeusMarc Alexander2014-07-281-43/+12
|\ \
| * | [ticket/12891] Replace template loops with 1 loop to reduce generation timeJoas Schilling2014-07-251-43/+12
| |/ | | | | | | PHPBB3-12891
* | [ticket/12896] Add php event for admin noticesForumhulp.com2014-07-271-1/+9
|/ | | | PHPBB3-12896
* Merge remote-tracking branch 'github-nicofuma/ticket/12446' into ↵Nils Adermann2014-07-0411-30/+30
|\ | | | | | | | | | | | | develop-ascraeus * github-nicofuma/ticket/12446: [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
| * [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_extsTristan Darricau2014-06-2611-30/+30
| | | | | | | | PHPBB3-12446
* | Merge pull request #2669 from Nicofuma/ticket/12777Joas Schilling2014-06-291-6/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12777] Rename extension status functions and add is_configured() * Nicofuma/ticket/12777: [ticket/12777] Add tests for unavailable extension [ticket/12777] Add tests [ticket/12777] Add is_purged() [ticket/12777] Update doc block of is_configured() [ticket/12777] Rename extension status functions and add is_configured()
| * | [ticket/12777] Rename extension status functions and add is_configured()Tristan Darricau2014-06-271-6/+6
| |/ | | | | | | PHPBB3-12777
* | [ticket/12196] Fix typo in "referrer"Joas Schilling2014-06-261-1/+1
| | | | | | | | | | | | Referer is a typo in the HTTP RFC and should not be used in the UI PHPBB3-12196
* | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-261-1/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/12196] Revert Fix typo "referer" in acp/attachments
| * | [ticket/12196] Revert Fix typo "referer" in acp/attachmentsDhruv2014-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2. https://tracker.phpbb.com/browse/PHPBB3-12196 PHPBB3-12196
* | | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-261-1/+1
|\ \ \ | |/ / | | / | |/ |/| | | | | # By Joas Schilling # Via Dhruv (1) and Joas Schilling (1) * develop-olympus: [ticket/12196] Fix typo "referer" in acp/attachments
| * [ticket/12196] Fix typo "referer" in acp/attachmentsJoas Schilling2014-06-251-1/+1
| | | | | | | | PHPBB3-12196
* | Merge pull request #2571 from Crizz0/ticket/12563Dhruv Goel2014-06-231-2/+2
|\ \ | | | | | | [ticket/12563] Changes 2 style specific language variables for better understanding
| * | [ticket/12563] Adds « and » to the links in acp_styles.phpCrizzo2014-06-221-2/+2
| | | | | | | | | | | | PHPBB3-12563
| * | [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>Crizzo2014-06-121-2/+2
| | | | | | | | | | | | PHPBB3-12563
| * | [ticket/12563] Changes 2 language variables to better understandable namesCrizzo2014-06-101-2/+2
| | | | | | | | | | | | PHPBB3-12563
* | | Merge pull request #2629 from nickvergessen/ticket/12747Andreas Fischer2014-06-225-257/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12747] Drop support for Firebird * nickvergessen/ticket/12747: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird Conflicts: phpBB/phpbb/db/driver/firebird.php
| * | | [ticket/12747] Drop support for FirebirdJoas Schilling2014-06-205-257/+0
| | | | | | | | | | | | | | | | PHPBB3-12747
* | | | [ticket/12723] Add Sniff ensuring PHP files use the correct file headerTristan Darricau2014-06-222-6/+15
|/ / / | | | | | | | | | PHPBB3-12723
* | | [ticket/12721] Add Squiz.Arrays.ArrayBracketSpacing in the legacy rulesetTristan Darricau2014-06-161-1/+1
| | | | | | | | | | | | PHPBB3-12721
* | | [ticket/12722] Add Generic.Formatting.SpaceAfterCast in the legacy rulesetTristan Darricau2014-06-162-8/+8
| | | | | | | | | | | | PHPBB3-12722
* | | Merge pull request #2431 from Nicofuma/ticket/12109Dhruv Goel2014-06-151-8/+16
|\ \ \ | | | | | | | | [ticket/12109] Bug when setting permissions with "Select all users"
| * | | [ticket/12109] Fix coding styleTristan Darricau2014-05-101-4/+4
| | | | | | | | | | | | | | | | PHPBB3-12109
| * | | [ticket/12109] Bug when setting permissions with "Select all users"Tristan Darricau2014-05-101-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12109 PHPBB3-12109
* | | | [ticket/12694] Remove whitespace at end of line from acp_groupsMarc Alexander2014-06-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12694
* | | | Merge remote-tracking branch 'github-marc1706/ticket/12352' into ↵Nils Adermann2014-06-111-1/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12352: (33 commits) [ticket/12352] Do not check hashes that don't have the necessary length [ticket/12352] Update file headers to fit new format [ticket/12352] Use custom provider collection for auth providers [ticket/12352] Add checks for existing user_pass_convert to migrations [ticket/12352] Remove usages of user_pass_convert column [ticket/12352] Update schema json file [ticket/12352] Remove user_pass_convert column from database [ticket/12352] Check each newly added passwords driver in manager_test [ticket/12352] Add get_settings_only method to passwords driver base [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords [ticket/12352] Add tests for wcf1 and wcf2 drivers [ticket/12352] Add driver for woltlab community framework 1 passwords [ticket/12352] Add driver for woltlab community framework 2 passwords [ticket/12352] Add missing $ to md5_mybb and md5_vb driver [ticket/12352] Fix spacing in passwords tests [ticket/12352] Add passwords driver for vB passwords [ticket/12352] Use correct hashing method in md5_mybb driver [ticket/12352] Add driver for myBB md5 passwords [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers [ticket/12352] Add passwords driver for sha1 password hashes ...
| * | | [ticket/12352] Remove usages of user_pass_convert columnMarc Alexander2014-06-011-1/+0
| | | | | | | | | | | | | | | | PHPBB3-12352