aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developDhruv2013-06-052-3/+10
|\
| * Merge remote-tracking branch 'bantu/ticket/11583' into develop-olympusDhruv2013-06-052-3/+10
| |\
| | * [ticket/11583] Use a new lang key instead of giving the old one a new meaning.Andreas Fischer2013-06-032-2/+2
| | * [ticket/11583] Allow FULLTEXT indexes on InnoDB when on MySQL 5.6.4 or higher.Andreas Fischer2013-06-012-2/+9
* | | [ticket/11586] Move $filedata['thumbnail'] to where it might be returned.Andreas Fischer2013-06-031-3/+3
* | | [ticket/11586] Combine $filedata['post_attach'] assign into a single statement.Andreas Fischer2013-06-031-8/+1
* | | [ticket/11586] Use a variable for $cat_id == ATTACHMENT_CATEGORY_IMAGE.Andreas Fischer2013-06-031-8/+8
* | | [ticket/11586] Combine administrator/moderator checks together.Andreas Fischer2013-06-031-7/+7
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-10/+10
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'erangamapa/ticket/11145' into develop-olympusAndreas Fischer2013-06-031-10/+10
| |\ \
| | * | [ticket/11145] Wrong error thrown when uploading a bigger image.erangamapa2013-05-251-10/+10
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-0/+10
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'nickvergessen/ticket/10840' into develop-olympusAndreas Fischer2013-06-031-0/+10
| |\ \ \
| | * | | [ticket/10840] Add check_form_key to acp_groups.phpJoas Schilling2013-06-031-0/+10
| | | |/ | | |/|
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-031-2/+3
|\ \ \ \ | |/ / /
| * | | [ticket/11122] Add dhruv to active authorsJoas Schilling2013-06-031-0/+1
| * | | [ticket/11122] Remove Oleg and igorw from active authorsJoas Schilling2013-06-031-2/+2
| |/ /
* | | Merge remote-tracking branch 'nickvergessen/ticket/11549' into developDavid King2013-05-311-1/+0
|\ \ \
| * | | [ticket/11549] Do not set extension dir path for style in adm/index.phpJoas Schilling2013-05-311-1/+0
* | | | Merge remote-tracking branch 'Elsensee/ticket/11409' into developJoas Schilling2013-05-311-0/+2
|\ \ \ \
| * | | | [ticket/11409] Add success message after updating group position settingsOliver Schramm2013-05-311-0/+2
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11387' into developJoas Schilling2013-05-311-3/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/11387] Log module added only after it has been addedNathaniel Guse2013-03-021-3/+2
* | | | | [ticket/11570] Fix link and make the notice more conspiciuousOliver Schramm2013-05-311-3/+3
* | | | | [ticket/11570] Add link back to update processOliver Schramm2013-05-301-1/+12
| |/ / / |/| | |
* | | | Merge remote-tracking branch 'Elsensee/ticket/11569' into developJoas Schilling2013-05-291-2/+1
|\ \ \ \
| * | | | [ticket/11569] Add type parameter and fix language variableOliver Schramm2013-05-291-1/+1
| * | | | [ticket/11569] Add parameter to URL and remove commentOliver Schramm2013-05-291-2/+1
| * | | | [ticket/11569] Fixing link to continue updateOliver Schramm2013-05-261-1/+1
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/encryptedmind/11516' into ...Andreas Fischer2013-05-281-1/+1
|\ \ \ \ \
| * | | | | [ticket/11516] Upgrading the .live jquery function because it is deprecated.Jesús Rafael Cova Huerta2013-05-281-1/+1
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | [ticket/11578] Add missing underscore after 'validate' function prefixmarc17062013-05-271-1/+1
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.Andreas Fischer2013-05-261-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-265-20/+50
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympusAndreas Fischer2013-05-265-7/+48
| |\ \ \
| | * | | [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-172-3/+3
| | |\ \ \
| | * | | | [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-144-13/+13
| | * | | | [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-142-5/+10
| | * | | | [ticket/11538] Make sure group color can't exceed maximum of 6 charactersMarc Alexander2013-05-141-0/+10
* | | | | | [ticket/11567] Renamed extension_manager variable to avoid fatal errorOliver Schramm2013-05-261-2/+2
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/11560' into developAndreas Fischer2013-05-241-0/+1
|\ \ \ \ \ \