aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-121-31/+0
|\
| * [ticket/11744] Move notification from ucp_groups to group_user_addNathaniel Guse2013-07-261-7/+0
| * [ticket/11744] Group join request notificationNathan Guse2013-07-261-29/+5
* | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauthJoseph Warner2013-09-101-1/+76
|\ \
| * \ Merge pull request #1618 from VSEphpbb/ticket/11747Nathan Guse2013-09-051-1/+76
| |\ \
| | * | [ticket/11747] ucp_prefs_post core eventsMatt Friedman2013-07-261-0/+25
| | * | [ticket/11747] ucp_prefs_view core eventsMatt Friedman2013-07-261-0/+25
| | * | [ticket/11747] ucp_prefs_personal core eventsMatt Friedman2013-07-261-0/+25
| | * | [ticket/11747] Add $phpbb_dispatcher to globalMatt Friedman2013-07-261-1/+1
| | |/
* | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ...Joseph Warner2013-09-065-30/+13
|\ \ \ | |/ /
| * | Merge branch 'develop-olympus' into developJoas Schilling2013-08-261-0/+2
| |\ \
| | * | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| * | | Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
| |\ \ \
| | * | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | * | | [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| | * | | [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| | * | | [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| | * | | [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
| * | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-311-0/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-251-0/+3
| * | | | Merge pull request #1597 from marc1706/ticket/11723Nathan Guse2013-07-291-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [ticket/11723] Correctly redirect user to agreement page and let him leaveMarc Alexander2013-07-221-3/+3
| * | | | [ticket/11717] Use topic_posts_approved instead of topic_repliesMarc Alexander2013-07-201-1/+1
| |/ / /
* | | | [feature/oauth] Fix bug on ucp_auth_link related to error displayJoseph Warner2013-09-021-0/+1
* | | | [feature/oauth] More small fixesJoseph Warner2013-09-021-1/+1
* | | | [feature/oauth] More minor changes from reviewJoseph Warner2013-09-022-4/+5
* | | | [feature/oauth] Fix small issues on ucp pagesJoseph Warner2013-09-022-2/+3
* | | | [feature/oauth] A few more minor changesJoseph Warner2013-08-241-0/+13
* | | | [feature/oauth] Changes due to code reviewJoseph Warner2013-08-242-19/+17
* | | | [feature/oauth] Fix issues on ucp_login_link from reviewJoseph Warner2013-08-241-3/+38
* | | | [feature/oauth] Clean up TODOsJoseph Warner2013-08-241-1/+0
* | | | [feature/oauth] Fix template not refreshing issueJoseph Warner2013-08-141-0/+3
* | | | [feature/oauth] Fix bug found in testingJoseph Warner2013-08-141-3/+3
* | | | [feature/oauth] Implement unlinking in OAuthJoseph Warner2013-08-141-0/+3
* | | | [feature/oauth] Fix errors found in testing linkingJoseph Warner2013-08-141-1/+1
* | | | [feature/oauth] Refactor oauth::link_account for two pathsJoseph Warner2013-08-141-1/+13
* | | | [feature/oauth] Update link_account to allow for two methods of linkingJoseph Warner2013-08-142-1/+7
* | | | [feature/oauth] Fix errors in ucp_auth_linkJoseph Warner2013-08-141-2/+2
* | | | [feature/oauth] Start implementing link/unlink actionsJoseph Warner2013-08-141-0/+13
* | | | [feature/oauth] Handle hidden fieldsJoseph Warner2013-08-121-0/+13
* | | | [feature/oauth] Get the OAuth template in place for ucp_auth_linkJoseph Warner2013-08-121-0/+13
* | | | [feature/oauth] Error handling on pageJoseph Warner2013-08-121-4/+22
* | | | [feature/oauth] More template workJoseph Warner2013-08-091-0/+3
* | | | [feature/oauth] Add method to return necessary data for auth_linkJoseph Warner2013-08-091-1/+10
* | | | [feature/oauth] Start building the templateJoseph Warner2013-08-091-0/+28
* | | | [feature/oauth] Default auth_link into UCP_PROFILE not UCP_MAINJoseph Warner2013-08-091-1/+1
* | | | [feature/oauth] Forgot to have login_link be "in login" in ucpJoseph Warner2013-08-051-0/+34
* | | | [feature/oauth] Start general auth linking pageJoseph Warner2013-08-051-0/+27
* | | | [feature/oauth] Login_link works with ucp_register nowJoseph Warner2013-07-311-7/+21
* | | | [feature/oauth] Fix errors on ucp_login_linkJoseph Warner2013-07-311-5/+4