aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-111-1/+1
* Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-0/+10
|\
| * [ticket/10840] Add check_form_key to acp_groups.phpJoas Schilling2013-06-031-0/+10
* | [ticket/11409] Add success message after updating group position settingsOliver Schramm2013-05-311-0/+2
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-261-5/+13
|\ \ | |/
| * Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympusAndreas Fischer2013-05-261-5/+13
| |\
| | * [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-191-1/+1
| | * [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4
| | * [ticket/11538] Merge calls to validate_data() in acp_groupsMarc Alexander2013-05-191-11/+12
| | * [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colourMarc Alexander2013-05-191-1/+1
| | * [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-161-1/+1
| | * [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-151-1/+1
| | * [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-141-0/+7
* | | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-212-63/+64
|\ \ \
| * | | [ticket/11010] properly tabifying 'max_autologin_time'Senky2013-05-211-1/+1
| * | | [ticket/11010] resolving latest commentsSenky2013-05-211-1/+2
| * | | [ticket/11010] Fixes for number input in acpVjacheslav Trushkin2013-05-201-2/+2
| * | | [ticket/11010] validation to match typeSenky2013-05-202-48/+48
| * | | [ticket/11010] replacing maxlenght with maxSenky2013-05-202-51/+51
| * | | [ticket/11010] applying some of EXreaction notesSenky2013-05-201-1/+1
| * | | [ticket/11010] adding type="url" to 'site_home_url'Senky2013-05-201-1/+1
| * | | [ticket/11010] adding type="number" in ACP; adding type="email" in installSenky2013-05-202-56/+56
| * | | [ticket/11010] changing email and url input types in php filesSenky2013-05-202-5/+5
* | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-05-201-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | [ticket/11551] Fix error in system tab if get_remote_file returns empty stringDavid King2013-05-201-1/+1
| |/
* | Merge remote-tracking branch 'marc1706/ticket/11535' into developAndreas Fischer2013-05-191-2/+8
|\ \
| * | [ticket/11535] Correctly merge avatar_errors array into primary error arrayMarc Alexander2013-05-131-2/+8
* | | Merge remote-tracking branch 'EXreaction/ticket/11415' into developDavid King2013-05-181-9/+25
|\ \ \ | |/ / |/| |
| * | [ticket/11415] Move while loop from ext manager to acp_extensions.phpNathaniel Guse2013-05-011-9/+25
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-126-72/+68
|\ \ \
| * \ \ Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-081-0/+1
| |\ \ \
| | * | | [ticket/10325] change language varDhruv2013-04-251-1/+1
| | * | | [ticket/10325] add allow forgot password option in acpDhruv2013-04-251-0/+1
| * | | | [ticket/11450] Fix all instances of phpbb_extension_metadata_managerJoas Schilling2013-05-081-1/+1
| | |/ / | |/| |
| * | | Merge PR #1371 branch 'EXreaction/ticket/11236' into developOleg Pudeyev2013-04-261-2/+2
| |\ \ \
| | * | | [ticket/11236] Do not require group selection in prune usersNathaniel Guse2013-04-251-1/+1
| | * | | [ticket/11236] Correct HTMLNathaniel Guse2013-04-251-1/+1
| | |/ /
| * | | [ticket/11237] Fix PHP error in acp_prune.phpNathaniel Guse2013-04-251-21/+15
| |/ /
| * | Merge pull request #1369 from EXreaction/ticket/11335Nils Adermann2013-04-251-1/+1
| |\ \
| | * | [ticket/11335] Replace "$phpEx" with $phpExNathaniel Guse2013-04-241-1/+1
| | * | [ticket/11335] (more) Make php_ext 'php' not '.php'Nathan Guse2013-04-241-1/+1
| * | | [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-242-5/+4
| |/ /
| * | Merge branch 'develop-olympus' into developNils Adermann2013-04-121-41/+42
| |\ \ | | |/
| | * [ticket/11358] Removed all trailing white spaces.erangamapa2013-04-121-4/+4
| | * [ticket/11358] Fixed the code according to coding guidlines.erangamapa2013-04-121-42/+43
| * | [ticket/11116] Made ACP "extension not available" error message E_USER_WARNINGrechosen2013-04-111-2/+2
| * | Migration file and change board_home_text to board_index_textTabitha Backoff2013-03-281-1/+1
| * | Ticket# 11477 - Allow customisation of "Board index"Tabitha Backoff2013-03-281-0/+1
* | | [ticket/11465] Check if class exists before including info fileMarc Alexander2013-04-141-1/+1
* | | [ticket/11465] The info file does not have _info suffixJoas Schilling2013-04-101-3/+4