aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
|\
| * [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| * [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| * [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
* | Merge branch 'develop-olympus' into developJoas Schilling2013-07-311-0/+3
|\ \
| * | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-251-0/+3
* | | Merge pull request #1597 from marc1706/ticket/11723Nathan Guse2013-07-291-3/+3
|\ \ \
| * | | [ticket/11723] Correctly redirect user to agreement page and let him leaveMarc Alexander2013-07-221-3/+3
* | | | [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-201-1/+1
|/ / /
* | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-131-1/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
| |\ \ | | |/
| | * [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-1/+2
* | | [ticket/9657] Use the service instead of the static classJoas Schilling2013-07-111-2/+4
* | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-119-27/+50
|\ \ \ | |/ /
| * | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-111-1/+1
| * | [ticket/11587] Pass legend and teampage settings to group_create()Marc Alexander2013-06-041-4/+13
| * | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-261-0/+7
| |\ \ | | |/
| | * [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-191-1/+1
| | * [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-11/+4
| | * [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
| * | [ticket/11535] Correctly merge avatar_errors array into primary error arrayMarc Alexander2013-05-131-2/+8
| * | [ticket/11533] Columns counter for notification settingsVjacheslav Trushkin2013-05-111-0/+4
| * | Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into developOleg Pudeyev2013-05-081-0/+5
| |\ \
| | * | [ticket/10325] fix language keyDhruv2013-04-251-1/+1
| | * | [ticket/10325] fix language variableDhruv2013-04-251-1/+1
| | * | [ticket/10325] change language varDhruv2013-04-251-1/+1
| | * | [ticket/10325] fix languageDhruv2013-04-251-1/+1
| | * | [ticket/10325] trigger error if forgot password option disabledDhruv2013-04-251-0/+5
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-061-7/+4
| |\ \ \ | | |/ / | |/| / | | |/
| | * [ticket/11144] Add missing {FORUM_NAME} variableGaƫtan Muller2013-05-061-7/+4
| * | [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-246-12/+7
| * | Merge pull request #1287 from erangamapa/ticket/11106Nils Adermann2013-03-311-2/+1
| |\ \
| | * | [ticket/11106] Added missing line breaks.erangamapa2013-03-161-1/+1
| | * | [ticket/11106] Undefined index EDITED_TIME_TOTAL notice.erangamapa2013-03-121-2/+1
| * | | Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-091-0/+1
| |\ \ \
| | * | | [ticket/11303] remove additional bracketsDhruv2013-02-121-1/+1
| | * | | [ticket/11303] add S_TZ_PRESELECT template varDhruv2013-02-081-0/+1
* | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-054-147/+177
|\ \ \ \ \ | |/ / / /
| * | | | [feature/avatars] Reduce module auth of ucp avatar settingsMarc Alexander2013-03-041-1/+1
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-043-7/+261
| |\ \ \ \
| * | | | | [feature/avatars] Remove trailing whitespace from avatar codeMarc Alexander2013-02-191-3/+3
| * | | | | [feature/avatars] Pass phpbb_user to prepare and process form functionsMarc Alexander2013-02-192-4/+4
| * | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-073-3/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | |