aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2013-02-2511-70/+99
|\
| * Merge branch 'develop-olympus' into developNils Adermann2013-02-241-18/+32
| |\
| | * [ticket/11358] Changed the name of post parameter.erangamapa2013-02-241-2/+2
| | * [ticket/11358] Changed the action parameter value to represent the link.erangamapa2013-02-241-20/+30
| | * [ticket/11358] Enabled link making all users default for a group.erangamapa2013-02-241-2/+40
| | * [ticket/11358] Removed redundant code and referred proper variable.erangamapa2013-02-241-40/+2
| | * [ticket/11358] Success message even without selecting a user.erangamapa2013-02-241-0/+4
| * | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-0/+4
| |\ \ | | |/
| | * [ticket/11355] Referred proper variable when validating selection.erangamapa2013-02-241-1/+1
| | * [ticket/11355] Wrong error message when no user is selected.erangamapa2013-02-241-1/+5
| * | Merge branch 'develop-olympus' into developNils Adermann2013-02-241-2/+2
| |\ \ | | |/
| | * [ticket/10896] Adds email validation to email settings in ACPDavid Tobin2013-02-041-2/+2
| * | [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSIONDavid King2013-02-231-2/+2
| * | [feature/migrations] Use getLocalisedMessage() function to get error messageNathan Guse2013-02-151-2/+2
| * | [feature/migrations] Catch and display errors from the migratorNathaniel Guse2013-02-091-7/+21
| * | [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-041-0/+4
| * | [ticket/9492] Ensure to update all avatar values when the avatar is changedJoas Schilling2013-01-171-1/+1
| * | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-111-4/+0
| * | [ticket/11305] Retrieve cache driver from container rather than cache service.Oleg Pudeyev2013-01-021-3/+3
| * | Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-291-7/+7
| |\ \
| | * | [ticket/11259] htmlspecialchars($phpbb_admin_path)Nathan Guse2012-12-101-7/+7
| * | | [ticket/10758] Extract obtain_user_data for the benefit of tests.Oleg Pudeyev2012-12-191-6/+1
| * | | [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-151-2/+2
| * | | [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-154-21/+23
| * | | [ticket/11088] Move style, extension and language pack management to customiseDavid King2012-12-122-3/+3
| |/ /
* | | [ticket/10411] Use template loops instead of defining the html in php filesJoas Schilling2013-02-251-6/+12
* | | [ticket/10411] Ensure we only get services that do existJoas Schilling2013-02-251-1/+1
* | | [ticket/10411] Rename template variable CUR_ to CURRENT_Joas Schilling2012-12-061-1/+1
* | | [ticket/10411] Move globals to the top and use array for cache destroyJoas Schilling2012-11-161-4/+2
* | | [ticket/10411] Use the objects instead of the deprecated wrappersJoas Schilling2012-11-141-8/+8
* | | [ticket/10411] Use AJAX to move items up/down and delete themJoas Schilling2012-11-141-6/+12
* | | [ticket/10411] Use DIC to get the groupposition classesJoas Schilling2012-11-141-9/+5
* | | [ticket/10411] Fix create_group and delete_group functionsJoas Schilling2012-11-141-3/+6
* | | [ticket/10411] Use new teampage and legend class in ACP and memberlistJoas Schilling2012-11-141-44/+122
|/ /
* | Merge remote-tracking branch 'Fyorl/ticket/10939' into developAndreas Fischer2012-11-101-2/+4
|\ \
| * | [ticket/10939] Modified acp_groups.php to not use $_FILESFyorl2012-08-151-2/+4
* | | Merge branch 'develop-olympus' into developNils Adermann2012-11-091-1/+1
|\ \ \ | | |/ | |/|
| * | [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]Igor Wiedler2012-11-091-1/+1
* | | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-0665-4004/+1996
|\ \ \
| * | | [ticket/11099] Mark acp_ban::display_ban_options() as static.Andreas Fischer2012-10-301-2/+2
| * | | [ticket/11157] get_captcha_types is an instance method.Oleg Pudeyev2012-10-291-1/+2
| * | | [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968Joas Schilling2012-10-176-12/+11
| * | | Merge PR #993 branch 'bantu/ticket/8713' into developOleg Pudeyev2012-10-102-6/+27
| |\ \ \
| | * | | [ticket/8713] Revert changes to ucp_profile, ucp_register and acp_users.Andreas Fischer2012-09-091-2/+2
| | * | | [ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.Andreas Fischer2012-09-081-3/+24
| | * | | [ticket/8713] Rename untrimed_variable() to untrimmed_variable().Andreas Fischer2012-09-082-5/+5
| | * | | [ticket/8713] Do not trim login inputsNathaniel Guse2012-09-032-6/+6
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11021' into developAndreas Fischer2012-09-151-0/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/11021] Add the option to specify a Site home URL and textNathan Guse2012-07-221-0/+2
| * | | | [ticket/10631] Fix a spelling typoMichael C.2012-09-011-1/+1