aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into developNathaniel Guse2013-07-122-1/+33
|\
| * [ticket/11626] Make identifier uppercase per style requirementsJoseph Warner2013-07-111-1/+1
| * [ticket/11626] Change the identifier template file in the templateJoseph Warner2013-07-111-1/+1
| * [ticket/11626] Include the template file in acp_boardJoseph Warner2013-07-111-1/+1
| * [ticket/11626] LDAP Auth ACP Template FileJoseph Warner2013-07-111-0/+32
* | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-011-2/+2
|\ \ | |/
| * [ticket/9341] Use U_PREVIOUS and U_NEXT in template filesDhruv2013-06-221-2/+2
* | [feature/twig] Fix improper template syntax in acp_forums.htmlNathaniel Guse2013-06-141-1/+1
|/
* Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' in...Nathaniel Guse2013-06-062-3/+3
|\
| * [feature/editor-code-tabs] Apply code editor to everythingVjacheslav Trushkin2013-05-202-3/+3
* | [ticket/11549] Do not set extension dir path for style in adm/index.phpJoas Schilling2013-05-311-1/+0
* | Merge remote-tracking branch 'remotes/Senky/ticket/11010' into developNathaniel Guse2013-05-2117-42/+42
|\ \
| * | [ticket/11010] Fixes for number input in acpVjacheslav Trushkin2013-05-2014-33/+33
| * | [ticket/11010] Fix input type for urlsVjacheslav Trushkin2013-05-202-2/+2
| * | [ticket/11010] Fix email inputsVjacheslav Trushkin2013-05-202-3/+3
| * | [ticket/11010] applying some of EXreaction notesSenky2013-05-201-4/+4
| * | [ticket/11010] Changing email and url types in adm templatesVinny2013-05-202-4/+4
| |/
* | [ticket/11279] Clearer AJAX errorsVjacheslav Trushkin2013-05-201-1/+1
|/
* [ticket/10741] Do not resize textarea.no-auto-resizeVjacheslav Trushkin2013-04-121-1/+1
* [ticket/10741] Automatically resize textareas in prosilver and ACPVjacheslav Trushkin2013-04-121-0/+6
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-2611-163/+222
|\
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166Joas Schilling2013-03-0623-211/+257
| |\
| | * Merge remote-tracking branch 'remotes/marc/feature/avatars' into developNathaniel Guse2013-03-047-126/+122
| | |\
| | | * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-042-2/+14
| | | |\
| | | * \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-072-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-044-7/+4
| | | |\ \ \
| | | * \ \ \ Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-249-2/+13
| | | |\ \ \ \
| | | * | | | | [feature/avatars] Add more consistency to codebaseMarc Alexander2012-12-112-4/+4
| | | * | | | | Merge branch 'develop' into feature/avatarsMarc Alexander2012-12-092-35/+57
| | | |\ \ \ \ \
| | | * | | | | | [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-2114-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-279-41/+46
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-0720-390/+392
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | [feature/avatars] Support editing of group avatars in ACPCullen Walsh2012-03-182-59/+41
| | | | * | | | | | | | | [feature/avatars] Made ACP avatar gallery in Manage Users prettierCullen Walsh2012-03-181-14/+25