| Commit message (Expand) | Author | Age | Files | Lines |
* | [feature/oauth] Start building the template | Joseph Warner | 2013-08-09 | 1 | -0/+8 |
* | [feature/oauth] Fix ucp_auth_link headers/footers | Joseph Warner | 2013-08-09 | 1 | -2/+2 |
* | [feature/oauth] Start general auth linking page | Joseph Warner | 2013-08-05 | 1 | -0/+3 |
* | [feature/oauth] Finish updating interface and related code | Joseph Warner | 2013-08-02 | 2 | -9/+12 |
* | [feature/oauth] Login_link register form | Joseph Warner | 2013-07-30 | 1 | -0/+9 |
* | [feature/oauth] Login works on login_link now, still does not actually link | Joseph Warner | 2013-07-29 | 1 | -1/+1 |
* | [feature/oauth] Basic checking for data needed in login linking | Joseph Warner | 2013-07-29 | 1 | -0/+4 |
* | [feature/oauth] More work on login linking accounts | Joseph Warner | 2013-07-25 | 1 | -0/+34 |
* | [feature/oauth] Template for ucp_login_link started | Joseph Warner | 2013-07-25 | 1 | -0/+11 |
* | [feature/oauth] Initial UI element added, this is non-final | Joseph Warner | 2013-07-22 | 1 | -1/+6 |
* | [feature/oauth] Possible way of getting the login data to login_box() | Joseph Warner | 2013-07-22 | 1 | -1/+1 |
* | [feature/oauth] Initial step in creating OAuth login support | Joseph Warner | 2013-07-22 | 1 | -1/+5 |
* | Merge pull request #1429 from cyberalien/ticket/11553 | Nathan Guse | 2013-07-13 | 6 | -29/+85 |
|\ |
|
| * | [ticket/11553] Typo | Vjacheslav Trushkin | 2013-07-11 | 1 | -1/+1 |
| * | [ticket/11553] Replace bullet with unicode | Vjacheslav Trushkin | 2013-07-11 | 1 | -2/+2 |
| * | [ticket/11553] Move bulletin points to pseudo class | Vjacheslav Trushkin | 2013-07-11 | 6 | -29/+85 |
* | | Merge pull request #1550 from nickvergessen/ticket/9649 | Nathan Guse | 2013-07-13 | 2 | -2/+13 |
|\ \ |
|
| * | | [ticket/9649] Display information on index for moderators on unapproved posts | Joas Schilling | 2013-07-13 | 2 | -2/+13 |
* | | | Merge pull request #1436 from cyberalien/ticket/11563 | Nathan Guse | 2013-07-13 | 5 | -50/+50 |
|\ \ \
| |/ /
|/| | |
|
| * | | [ticket/11563] Remove duplicate code | Vjacheslav Trushkin | 2013-07-11 | 1 | -1/+1 |
| * | | [ticket/11563] Dynamically generate panels list | Vjacheslav Trushkin | 2013-07-11 | 3 | -3/+6 |
| * | | [ticket/11563] Remove unused JS variables | Vjacheslav Trushkin | 2013-07-11 | 1 | -3/+0 |
| * | | [ticket/11563] Fix subPanels() | Vjacheslav Trushkin | 2013-07-11 | 4 | -47/+47 |
| |/ |
|
* | | Merge remote-tracking branch 'phpbb/develop' into ticket/9657 | Joas Schilling | 2013-07-13 | 11 | -14/+22 |
|\ \ |
|
| * | | [ticket/11388] INCLUDECSS | Nathaniel Guse | 2013-07-11 | 2 | -0/+4 |
| * | | [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for core | Nathan Guse | 2013-07-05 | 2 | -3/+7 |
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig | Nathaniel Guse | 2013-07-04 | 3 | -1/+13 |
| |\ \
| | |/ |
|
| * | | [feature/twig] INCLUDEJS behavior now supports local relative paths | Nathaniel Guse | 2013-07-02 | 8 | -10/+10 |
| * | | [feature/twig] INCLUDEJS now uses the definition class | Nathaniel Guse | 2013-07-02 | 2 | -2/+2 |
| * | | [feature/twig] Changing INCLUDEJS behavior slightly | Nathaniel Guse | 2013-07-01 | 8 | -8/+8 |
| * | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig | Nathaniel Guse | 2013-07-01 | 12 | -25/+25 |
| |\ \ |
|
| * \ \ | Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twig | Nathan Guse | 2013-06-24 | 1 | -0/+4 |
| |\ \ \ |
|
| * | | | | [feature/twig] Changing INCLUDEJS behavior | Nathan Guse | 2013-06-24 | 8 | -9/+9 |
* | | | | | [ticket/9657] Add new line after opening diff | Joas Schilling | 2013-07-11 | 1 | -2/+4 |
* | | | | | [ticket/9657] Fix labels on confirm_delete_body.html | Joas Schilling | 2013-07-11 | 1 | -3/+3 |
* | | | | | Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permis... | Joas Schilling | 2013-07-11 | 77 | -1187/+1202 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | Merge remote-tracking branch 'VSEphpbb/ticket/11577' into develop | Andreas Fischer | 2013-07-03 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | [ticket/11577] Readjust min-height to 35px | Matt Friedman | 2013-06-29 | 1 | -1/+1 |
| | * | | | | [ticket/11577] Correct over-sized Topic Rows | Matt Friedman | 2013-05-28 | 1 | -1/+1 |
| * | | | | | Merge branch 'ticket/11566' into ticket/11566-develop | Dhruv | 2013-07-01 | 2 | -0/+12 |
| |\ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| | * | | | | [ticket/11566] Subsilver template error displayed after table headers | Dhruv | 2013-07-01 | 1 | -4/+4 |
| | * | | | | [ticket/11566] Add captcha to report post template in subsilver | Dhruv | 2013-07-01 | 1 | -0/+8 |
| | * | | | | [ticket/11566] add error in template | Dhruv | 2013-07-01 | 1 | -0/+1 |
| | * | | | | [ticket/11566] add interface for captcha | Dhruv | 2013-07-01 | 1 | -0/+3 |
| * | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/9341' into develop | Joas Schilling | 2013-06-29 | 12 | -25/+25 |
| |\ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| | * | | | | [ticket/9341] Use U_PREVIOUS and U_NEXT in template files | Dhruv | 2013-06-22 | 12 | -25/+25 |
| | | |_|/
| | |/| | |
|
| * | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-06-20 | 1 | -0/+4 |
| |\ \ \ \
| | |/ / /
| |/| / /
| | |/ / |
|
| | * | | [ticket/11094] Add textbox for jabber while memberlist search | Dhruv | 2013-06-15 | 1 | -0/+4 |
| * | | | Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' in... | Nathaniel Guse | 2013-06-06 | 2 | -75/+3 |
| |\ \ \ |
|
| | * | | | [feature/editor-code-tabs] Check for browser support in function | Vjacheslav Trushkin | 2013-05-20 | 1 | -3/+0 |