aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-05-263-19/+48
|\
| * Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympusAndreas Fischer2013-05-263-6/+46
| |\
| | * [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-193-5/+7
| | * [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-193-4/+5
| | * Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket...Marc Alexander2013-05-171-1/+1
| | |\
| | * | [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-163-3/+25
| | * | [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-152-2/+2
| | * | [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-142-11/+11
| | * | [ticket/11538] Fix incorrect regex and test for duplicate # in color stringMarc Alexander2013-05-141-1/+1
| | * | [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-141-5/+9
| | * | [ticket/11538] Make sure group color can't exceed maximum of 6 charactersMarc Alexander2013-05-141-0/+10
* | | | Merge remote-tracking branch 'EXreaction/ticket/11435-2' into developDavid King2013-05-222-30/+78
|\ \ \ \
| * | | | [ticket/11435] Create new template filter option (cleanup)Nathan Guse2013-05-202-30/+78
* | | | | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-219-83/+116
|\ \ \ \ \
| * | | | | [ticket/11010] properly tabifying 'max_autologin_time'Senky2013-05-211-1/+1
| * | | | | [ticket/11010] resolving latest commentsSenky2013-05-212-2/+2
| * | | | | [ticket/11010] Fixes for number input in acpVjacheslav Trushkin2013-05-205-9/+9
| * | | | | [ticket/11010] updating testsSenky2013-05-201-3/+2
| * | | | | [ticket/11010] dealing with dimensions problem, removing extra codeSenky2013-05-202-5/+8
| * | | | | [ticket/11010] Add all HTML5 input types to ACPVjacheslav Trushkin2013-05-201-0/+12
| * | | | | [ticket/11010] validation to match typeSenky2013-05-202-48/+48
| * | | | | [ticket/11010] displaying min and max only if they are setSenky2013-05-201-2/+2
| * | | | | [ticket/11010] replacing maxlenght with maxSenky2013-05-203-62/+64
| * | | | | [ticket/11010] applying some of EXreaction notesSenky2013-05-202-4/+4
| * | | | | [ticket/11010] adding type="url" to 'site_home_url'Senky2013-05-201-1/+1
| * | | | | [ticket/11010] adding type="number" to inputs in functions_profile_fields.phpSenky2013-05-201-9/+9
| * | | | | [ticket/11010] fixing problems with 4th parameter in number typeSenky2013-05-201-1/+2
| * | | | | [ticket/11010] adding type="number" in ACP; adding type="email" in installSenky2013-05-203-59/+73
| * | | | | [ticket/11010] changing email and url input types in php filesSenky2013-05-203-6/+6
| * | | | | [ticket/11010] adding new input types into build_cfg_template()Senky2013-05-201-0/+2
| |/ / / /
* | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-05-202-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | [ticket/11551] Fix error in system tab if get_remote_file returns empty stringDavid King2013-05-202-2/+2
| | |/ | |/|
* | | Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-208-119/+306
|\ \ \
| * | | [ticket/11413] Revert some cache service related changes from earlierNathaniel Guse2013-05-131-3/+3
| * | | [ticket/11413] $user should have been $this->userNathaniel Guse2013-05-131-1/+1
| * | | [ticket/11413] Translate the errorNathan Guse2013-05-101-1/+1
| * | | [ticket/11413] Rename file to something more helpfulNathan Guse2013-05-101-1/+1
| * | | [ticket/11413] Remove remaining irrelevant code to this PRNathaniel Guse2013-05-031-3/+3
| * | | [ticket/11413] Remove conversion of user_notificationsNathaniel Guse2013-05-021-90/+0
| * | | [ticket/11413] Correct copyright yearNathaniel Guse2013-05-021-1/+1
| * | | [ticket/11413] Remove changes for ticket 11420 from this branchNathaniel Guse2013-05-021-0/+64
| * | | [ticket/11413] Don't use the database for the convert testNathaniel Guse2013-04-301-1/+10
| * | | [ticket/11413] Use sql_insert_bufferNathaniel Guse2013-04-301-19/+8
| * | | [ticket/11413] Fix notification testsNathaniel Guse2013-04-293-4/+33
| * | | [ticket/11413] Prevent recursive function callsNathaniel Guse2013-04-291-1/+4
| * | | [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-296-70/+57
| * | | [ticket/11413] Rename columns in notification/manager.phpNathaniel Guse2013-04-281-111/+165
| * | | [ticket/11413] Schema changes and migration fileNathaniel Guse2013-04-282-64/+206
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-07 06:08:41 +0000