aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles
Commit message (Expand)AuthorAgeFilesLines
* [feature/oauth] Start building the templateJoseph Warner2013-08-091-0/+8
* [feature/oauth] Fix ucp_auth_link headers/footersJoseph Warner2013-08-091-2/+2
* [feature/oauth] Start general auth linking pageJoseph Warner2013-08-051-0/+3
* [feature/oauth] Finish updating interface and related codeJoseph Warner2013-08-022-9/+12
* [feature/oauth] Login_link register formJoseph Warner2013-07-301-0/+9
* [feature/oauth] Login works on login_link now, still does not actually linkJoseph Warner2013-07-291-1/+1
* [feature/oauth] Basic checking for data needed in login linkingJoseph Warner2013-07-291-0/+4
* [feature/oauth] More work on login linking accountsJoseph Warner2013-07-251-0/+34
* [feature/oauth] Template for ucp_login_link startedJoseph Warner2013-07-251-0/+11
* [feature/oauth] Initial UI element added, this is non-finalJoseph Warner2013-07-221-1/+6
* [feature/oauth] Possible way of getting the login data to login_box()Joseph Warner2013-07-221-1/+1
* [feature/oauth] Initial step in creating OAuth login supportJoseph Warner2013-07-221-1/+5
* Merge pull request #1429 from cyberalien/ticket/11553Nathan Guse2013-07-136-29/+85
|\
| * [ticket/11553] TypoVjacheslav Trushkin2013-07-111-1/+1
| * [ticket/11553] Replace bullet with unicodeVjacheslav Trushkin2013-07-111-2/+2
| * [ticket/11553] Move bulletin points to pseudo classVjacheslav Trushkin2013-07-116-29/+85
* | Merge pull request #1550 from nickvergessen/ticket/9649Nathan Guse2013-07-132-2/+13
|\ \
| * | [ticket/9649] Display information on index for moderators on unapproved postsJoas Schilling2013-07-132-2/+13
* | | Merge pull request #1436 from cyberalien/ticket/11563Nathan Guse2013-07-135-50/+50
|\ \ \ | |/ / |/| |
| * | [ticket/11563] Remove duplicate codeVjacheslav Trushkin2013-07-111-1/+1
| * | [ticket/11563] Dynamically generate panels listVjacheslav Trushkin2013-07-113-3/+6
| * | [ticket/11563] Remove unused JS variablesVjacheslav Trushkin2013-07-111-3/+0
| * | [ticket/11563] Fix subPanels()Vjacheslav Trushkin2013-07-114-47/+47
| |/
* | Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-1311-14/+22
|\ \
| * | [ticket/11388] INCLUDECSSNathaniel Guse2013-07-112-0/+4
| * | [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for coreNathan Guse2013-07-052-3/+7
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-043-1/+13
| |\ \ | | |/
| * | [feature/twig] INCLUDEJS behavior now supports local relative pathsNathaniel Guse2013-07-028-10/+10
| * | [feature/twig] INCLUDEJS now uses the definition classNathaniel Guse2013-07-022-2/+2
| * | [feature/twig] Changing INCLUDEJS behavior slightlyNathaniel Guse2013-07-018-8/+8
| * | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0112-25/+25
| |\ \
| * \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-241-0/+4
| |\ \ \
| * | | | [feature/twig] Changing INCLUDEJS behaviorNathan Guse2013-06-248-9/+9
* | | | | [ticket/9657] Add new line after opening diffJoas Schilling2013-07-111-2/+4
* | | | | [ticket/9657] Fix labels on confirm_delete_body.htmlJoas Schilling2013-07-111-3/+3
* | | | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis...Joas Schilling2013-07-1177-1187/+1202
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'VSEphpbb/ticket/11577' into developAndreas Fischer2013-07-031-1/+1
| |\ \ \ \
| | * | | | [ticket/11577] Readjust min-height to 35pxMatt Friedman2013-06-291-1/+1
| | * | | | [ticket/11577] Correct over-sized Topic RowsMatt Friedman2013-05-281-1/+1
| * | | | | Merge branch 'ticket/11566' into ticket/11566-developDhruv2013-07-012-0/+12
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/11566] Subsilver template error displayed after table headersDhruv2013-07-011-4/+4
| | * | | | [ticket/11566] Add captcha to report post template in subsilverDhruv2013-07-011-0/+8
| | * | | | [ticket/11566] add error in templateDhruv2013-07-011-0/+1
| | * | | | [ticket/11566] add interface for captchaDhruv2013-07-011-0/+3
| * | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into developJoas Schilling2013-06-2912-25/+25
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/9341] Use U_PREVIOUS and U_NEXT in template filesDhruv2013-06-2212-25/+25
| | | |_|/ | | |/| |
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-201-0/+4
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | [ticket/11094] Add textbox for jabber while memberlist searchDhruv2013-06-151-0/+4
| * | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' in...Nathaniel Guse2013-06-062-75/+3
| |\ \ \
| | * | | [feature/editor-code-tabs] Check for browser support in functionVjacheslav Trushkin2013-05-201-3/+0