aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Expand)AuthorAgeFilesLines
* [ticket/9657] Adapt confirm box templates to new layoutJoas Schilling2013-03-072-20/+19
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-075-8/+94
|\
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-0655-368/+1138
| |\
| * | [ticket/11166] Fix several custom confirm templates in prosilverJoas Schilling2013-03-033-2/+75
| * | [ticket/11166] Add caption to AJAX confirm box default templateJoas Schilling2013-01-151-0/+1
| * | [ticket/11166] Use provided custom templates on AJAX confirm boxJoas Schilling2012-12-183-8/+20
* | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-0515-182/+274
|\ \ \ | | |/ | |/|
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-0414-63/+614
| |\ \
| * | | [feature/avatars] Auto-clear avatar dimensions when first changing avatarsMarc Alexander2013-02-282-0/+28
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-0715-112/+124
| |\ \ \
| * | | | [feature/avatars] Change avatar javascript to conform to new coding guidelinesMarc Alexander2013-01-042-6/+6
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-041-3/+0
| |\ \ \ \
| * | | | | [feature/avatars] Inform user of no available local avatarsMarc Alexander2013-01-042-0/+10
| * | | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-2419-14/+132
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-0927-70/+80
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-042-6/+6
| * | | | | | [feature/avatars] Remove unnecessary abbreviationsMarc Alexander2012-11-2513-58/+58
| * | | | | | [feature/avatars] Add support for modularized avatars to ucp groupsMarc Alexander2012-11-224-67/+34
| * | | | | | [feature/avatars] Miscellaenous template fixesMarc Alexander2012-11-182-2/+6
| * | | | | | [feature/avatars] Handle deletion of avatarsMarc Alexander2012-11-181-0/+1
| * | | | | | [feature/avatars] Add subsilver2 supportMarc Alexander2012-11-186-54/+101
| * | | | | | [feature/avatars] Add missing language variables for avatarsMarc Alexander2012-11-163-6/+6
| * | | | | | [feature/avatars] Add barebone gravatar driverMarc Alexander2012-11-131-0/+11
| * | | | | | [feature/avatars] Replace colon usage with {L_COLON}Marc Alexander2012-11-123-5/+5
| * | | | | | [feature/avatars] add missing html closing tags and fix tabbingMarc Alexander2012-11-121-0/+1
| * | | | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur...Marc Alexander2012-11-126-62/+85
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-2143-161/+569
| | |\ \ \ \ \ \
| | * | | | | | | [feature/avatars] Fixup avatars.js rewriteIgor Wiedler2012-06-271-2/+2
| | * | | | | | | [feature/avatars] Add self-invoking closure around avatars.jsIgor Wiedler2012-06-271-0/+6
| | * | | | | | | [feature/avatars] Rewrite avatars event handler to use jQueryIgor Wiedler2012-06-271-12/+4
| | * | | | | | | [feature/avatars] Move avatars JavaScript code to external JS fileIgor Wiedler2012-06-272-22/+19
| | * | | | | | | [feature/avatars] Remove empty script tagIgor Wiedler2012-06-271-3/+0
| | * | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-27105-505/+490
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-0738-641/+500
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | [feature/avatars] Made ACP avatar gallery in Manage Users prettierCullen Walsh2012-03-181-4/+6
| | * | | | | | | | | [feature/avatars] Rework UCP to be simpler/more consistentCullen Walsh2012-03-181-5/+44
| | * | | | | | | | | [feature/avatars] Support proper avatar deletion, stub ACPCullen Walsh2012-03-181-6/+1
| | * | | | | | | | | [feature/avatars] Fixing remote avatars size checksCullen Walsh2012-03-181-2/+2
| | * | | | | | | | | [feature/avatars] Implement UCP remote/local avatarsCullen Walsh2012-03-184-16/+14
| | * | | | | | | | | [feature/avatars] UCP Avatar InterfaceCullen Walsh2012-03-185-52/+50
* | | | | | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softde...Joas Schilling2013-03-0327-177/+736
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-022-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympusNathaniel Guse2013-03-022-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | [ticket/6723] Show info that message has been deleted before deliveryMarc Alexander2013-03-032-2/+2
| * | | | | | | | | | | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathaniel Guse2013-03-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | [ticket/11368] Fix background color for PM report rows by using accessing var.Andreas Fischer2013-02-261-1/+1
| | |/ / / / / / / / / /
| * | | | | | | | | | | [ticket/11103] Revert whitespace changesNathan Guse2013-02-281-0/+2
| * | | | | | | | | | | Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ticket/...Nathan Guse2013-02-286-9/+25
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [ticket/11103] Remove padding from notifications for now.Matt Friedman2013-02-272-5/+1
| | * | | | | | | | | | | [ticket/11103] Add newlines to bottom of css fileMatt Friedman2013-02-151-1/+2