aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/8319' into ticket/8319-develop2Joas Schilling2013-07-101-3/+11
|\
| * [ticket/8319] Do not repeat the replacementJoas Schilling2013-07-101-9/+5
| * [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URLJoas Schilling2013-06-031-2/+2
| * [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL partsJoas Schilling2013-06-031-0/+4
| * [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuseJoas Schilling2013-06-031-1/+9
* | Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into developDavid King2013-07-031-87/+40
|\ \
| * | [feature/auth-refactor] Fix code style issueJoseph Warner2013-07-021-2/+2
| * | [feature/auth-refactor] Removed no longer used variableJoseph Warner2013-06-261-1/+0
| * | [feature/auth-refactor] Fix errors in acp_boardJoseph Warner2013-06-251-2/+2
| * | [feature/auth-refactor] Fix indentation on acp_boardJoseph Warner2013-06-251-41/+38
| * | [feature/auth-refactor] Refactor auth in acp_boardJoseph Warner2013-06-251-22/+3
| * | [feature/auth-refactor] Don't truncate name then reattach same thingJoseph Warner2013-06-251-4/+4
| * | [feature/auth-refactor] Remove references to old auth pluginsJoseph Warner2013-06-251-29/+9
| * | [feature/auth-refactor] Refactor code to use servicesJoseph Warner2013-06-211-9/+6
| * | [feature/auth-refactor] Refactor acp_board for new auth interfaceJoseph Warner2013-06-191-18/+17
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-031-0/+2
|\ \ \
| * | | [ticket/11617] Remove spaces and tabs from empty linesMatt Friedman2013-07-021-1/+1
| * | | [ticket/11617] Missing U_ACTION in acp_captcha.phpMatt Friedman2013-07-021-0/+2
* | | | [ticket/11585] Make $auth_admin class propertyDhruv2013-07-021-13/+12
| |/ / |/| |
* | | [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
| |\ \ \