aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | * | [ticket/10419] Add mbstring PHP ini parameters checks to ACPrxu2011-10-181-0/+11
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-11-131-5/+29
| |\| | |
| | * | | Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympusAndreas Fischer2011-11-131-5/+29
| | |\ \ \
| | | * | | [ticket/10087] Organize bans in acp_baninto optgroupsIgor Wiedler2011-11-111-5/+29
| | | | |/ | | | |/|
| * | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-131-6/+2
| |\| | |
| | * | | Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympusIgor Wiedler2011-11-131-6/+2
| | |\ \ \
| | | * | | [ticket/10190] Do not show hint about permissions when editing forum settings.Andreas Fischer2011-10-291-6/+2
| | | | |/ | | | |/|
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10410' into developAndreas Fischer2011-11-011-6/+6
| |\ \ \ \
| | * | | | [ticket/10410] Add option to display users in their first teampage groupJoas Schilling2011-10-281-6/+6
| * | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-2/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympusIgor Wiedler2011-10-291-2/+3
| | |\ \ \ \
| | | * | | | [ticket/9307] Remove hardcoded chunk size of mass emails.Chris Smith2011-09-241-2/+3
| | | | |_|/ | | | |/| |
| * | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-10-291-1/+1
| |\| | | |
| | * | | | [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.phpAndreas Fischer2011-10-181-1/+1
| | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'VSEphpbb/ticket/10390' into developOleg Pudeyev2011-10-201-0/+1
| |\ \ \ \
| | * | | | [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACPMatt Friedman2011-09-271-11/+1
| | * | | | [ticket/10390] Allow option for jQuery to be hosted by a remote CDNMatt Friedman2011-09-261-0/+11
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-10-171-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympusAndreas Fischer2011-10-171-1/+1
| | |\ \ \ \
| | | * | | | [ticket/9525] Minimum post length 0 is accepted but not working.Joas Schilling2011-10-141-1/+1
| | | | |/ / | | | |/| |
| * | | | | Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+1
| |\| | | |
| | * | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into develop...Nils Adermann2011-10-141-1/+1
| | |\ \ \ \
| | | * | | | [ticket/10074] Change default value of 'Set as special rank' to NoJoas Schilling2011-10-141-1/+1
| | | |/ / /
| * | | | / Merge branch 'develop-olympus' into developNils Adermann2011-10-141-1/+1
| |\| | | | | | |_|_|/ | |/| | |
| | * | | Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympusNils Adermann2011-10-141-1/+1
| | |\ \ \