aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Expand)AuthorAgeFilesLines
* [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
* | | | [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
|\ \ \ \
| * \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11103Nathaniel Guse2013-02-113-3/+3
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-151-3/+3
| |\ \ \ \
| * | | | | [ticket/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-131-1/+3
| * | | | | [ticket/11103] Use $request->variable rather than request_varNathan Guse2012-12-081-4/+4
| * | | | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-073-1/+39
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-111-2/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-104-6/+6
| |\ \ \ \ \ \ \
| * | | | | | | | [ticket/11103] Use phpBB Container to load types/methodsNathaniel Guse2012-11-091-12/+12
| * | | | | | | | [ticket/11103] Set basic notifications to be enabled by defaultNathan Guse2012-10-291-13/+12
| * | | | | | | | [ticket/11103] Re-add notify method to the UCP preferencesNathan Guse2012-10-201-0/+11
| * | | | | | | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-201-2/+2
| * | | | | | | | [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-181-4/+0
| * | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-181-1/+2
| |\ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/11103] Remove todo comments that are no longer todoNathan Guse2012-10-141-1/+0
| * | | | | | | | | [ticket/11103] UCP Notification option groupingNathan Guse2012-10-131-28/+39
| * | | | | | | | | [ticket/11103] UCP Notification ListNathan Guse2012-10-132-5/+78
| * | | | | | | | | [ticket/11103] Starting work on UCP Notifications listNathan Guse2012-10-131-41/+48
| * | | | | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-10-122-5/+5
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/11103] Move UCP Notification Options to Board Preferences tabNathan Guse2012-10-051-1/+1
| * | | | | | | | | | [ticket/11103] trigger_error message when preferences updated in UCPNathan Guse2012-10-051-0/+4