aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* [feature/purge-cache] Allow all admins to purge cacheVjacheslav Trushkin2012-02-181-5/+0
* Merge branch 'develop-olympus' into developIgor Wiedler2012-02-071-9/+8
|\
| * [ticket/10616] Add template inheritance to exported templateVjacheslav Trushkin2012-02-031-9/+8
* | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-031-7/+0
|\ \
| * | [ticket/10535] Removed email confirm field from acp_users moduleDavid King2011-12-231-7/+0
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-061-0/+3
|\ \ \ | | |/ | |/|
| * | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-021-0/+3
* | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-021-1/+1
* | | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-0263-128/+64
|\ \ \
| * | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-3163-128/+64
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-0/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
| |\ \ \
| | * | | [ticket/9681] Add password length to security settingsIgor Wiedler2011-12-231-0/+2
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-21/+36
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'p/ticket/10428' into develop-olympusAndreas Fischer2011-12-251-21/+36
| |\ \ \ \
| | * | | | [ticket/10428] Documentation for optionget/optionset functions.Oleg Pudeyev2011-12-251-2/+21
| | * | | | [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.Oleg Pudeyev2011-12-251-16/+12
| | * | | | [ticket/10428] Compare $data to false strictly.Oleg Pudeyev2011-12-251-4/+4
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-241-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympusOleg Pudeyev2011-12-241-1/+6
| |\ \ \ \
| | * | | | [ticket/10507] Sort styles in acpVjacheslav Trushkin2011-12-151-1/+6
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-231-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/10546] Add missing argument to adm_back_link in acp_captcha.Oleg Pudeyev2011-12-231-1/+1
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'imkingdavid/ticket/10541' into developOleg Pudeyev2011-12-221-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/10541] Fixed empty drop-down menu bugDavid King2011-12-211-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-2/+16
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-2/+16
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/10531] Disallow deleting of the last styleJoas Schilling2011-12-151-2/+16
* | | | [ticket/10463] removed extra comma in malformed query in acp_styles.phpDavid King2011-12-151-1/+1
| |_|/ |/| |
* | | [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functionsJoas Schilling2011-11-302-4/+4
* | | [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-251-2/+2
* | | [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-255-29/+14
* | | [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-251-2/+2
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-251-11/+15
|\ \ \ | |/ /
| * | [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
| |/
* | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-203-20/+5
|\ \ | |/
| * [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-203-5/+5
| * [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-203-20/+5
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-3/+6
|\ \ | |/
| * Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-3/+6
| |\
| | * [ticket/10239] Correct undefined variable error.Chris Smith2011-11-181-2/+1
| | * [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-1/+5
* | | [feature/extension-manager] Removing now unused acp_search codeNils Adermann2011-11-181-22/+0
* | | Merge branch 'develop' into feature/extension-managerNils Adermann2011-11-1810-26/+69
|\ \ \
| * \ \ Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-171-1/+8
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympusOleg Pudeyev2011-11-171-1/+8
| | |\ \
| | | * | [ticket/10157] Add notification to update cpfs when installing a language.Joas Schilling2011-11-171-1/+8
| | | |/
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-151-0/+11
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympusAndreas Fischer2011-11-151-0/+11
| | |\ \
| | | * | [ticket/10419] Reword some language strings, minor code changesrxu2011-11-051-4/+4