aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-072-46/+38
|\
| * [ticket/11201] Revert WLM dropping because it is still used in China.Andreas Fischer2013-02-041-0/+4
| * [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-111-4/+0
| * [ticket/10949] Converted missing code to new JS coding guidelinesMarc Alexander2013-01-042-46/+38
* | [feature/avatars] Remove not needed inline styleMarc Alexander2013-01-081-1/+1
* | [feature/avatars] Change avatar javascript to conform to new coding guidelinesMarc Alexander2013-01-041-3/+3
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-01-042-4/+4
|\ \ | |/
| * Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-292-4/+4
| |\
| | * [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-092-4/+4
* | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-247-0/+11
|\ \ \ | |/ /
| * | [feature/events] Remove extraneous spaceDavid King2012-12-171-1/+1
| * | [feature/events] Append "_append" to acp_simple_header_headDavid King2012-12-171-1/+1
| * | [feature/events] acp_simple_footer_end -> acp_simple_footer_afterDavid King2012-12-171-1/+1
| * | [feature/events] Append "_append" to acp_overall_header_headDavid King2012-12-171-1/+1
| * | [feature/events] Change _end suffix to _after in acp_overall_footer_endDavid King2012-12-171-1/+1
| * | [feature/events] Append "_append" to acp_users_overview_optionsDavid King2012-12-171-1/+1
| * | [feature/events] Fix names of events in adm/style/acp_main.htmlDavid King2012-12-171-2/+2
| * | [feature/events] Append "_append" to acp_forums_normal_settingsDavid King2012-12-171-1/+1
| * | [feature/events] Rename event_main_actions to acp_main_actionsJoas Schilling2012-12-171-1/+1
| * | [feature/events] Adding acp prefix to acp event namesMichael Cullum2012-12-177-8/+8
| * | [feature/events] Adding forums_normal_settings acp template ledgeMichael Cullum2012-12-171-0/+1
| * | [feature/events] Adding simple_footer_end acp template eventMichael Cullum2012-12-171-0/+1
| * | [feature/events] Adding simple_header_head acp template eventMichael Cullum2012-12-171-0/+1
| * | [feature/events] Add users_overview_options acp template eventMichael Cullum2012-12-171-0/+1
| * | [feature/events] Add overall_footer_end acp template eventMichael Cullum2012-12-171-0/+2
| * | [feature/events] Adding overall_header_head acp template eventMichael Cullum2012-12-171-0/+1
| * | [feature/events] Add main_actions acp template eventMichael Cullum2012-12-171-0/+2
| * | [feature/events] Add main_notice ACP template eventMichael Cullum2012-12-171-0/+2
| |/
* | [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-112-4/+4
* | Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-092-35/+57
|\ \ | |/
| * [ticket/11209] Clone disable moving images to allow multiple per pageJoas Schilling2012-11-161-4/+4
| * [ticket/11198] Remove additional asterix as /** is doc-block onlyJoas Schilling2012-11-151-4/+4
| * [ticket/11198] Store the swapping partners in vars and simplify the logicJoas Schilling2012-11-141-39/+47
| * [ticket/11198] Correctly set links after an item is moved up/down with AJAXJoas Schilling2012-11-142-15/+29
* | [feature/avatars] Minor variable naming fixesMarc Alexander2012-12-042-4/+4
* | [feature/avatars] Remove unnecessary abbreviationsMarc Alexander2012-11-257-36/+36
* | [feature/avatars] Remove duplicate form enctypeMarc Alexander2012-11-221-1/+1
* | [feature/avatars] Miscellaenous template fixesMarc Alexander2012-11-181-2/+1
* | [feature/avatars] Fix local and upload avatar in the ACPMarc Alexander2012-11-182-5/+4
* | [feature/avatars] Handle deletion of avatarsMarc Alexander2012-11-182-0/+2
* | [feature/avatars] Fix acp front-end of user and group avatarsMarc Alexander2012-11-174-49/+17
* | [feature/avatars] Replace colon usage with {L_COLON}Marc Alexander2012-11-125-7/+7
* | [feature/avatars] add missing html closing tags and fix tabbingMarc Alexander2012-11-121-4/+5
* | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur...Marc Alexander2012-11-126-85/+112
|\ \ | |/ |/|
| * Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-2112-37/+81
| |\
| * | [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-273-42/+21
| * | Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-278-39/+44
| |\ \