aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1812 from prototech/ticket/11746Nathan Guse2013-11-022-35/+13
|\
| * [ticket/11746] Delete the notification after user is approved & fix language.Cesar G2013-10-261-1/+1
| * [ticket/11746] Add "admin activation required" notification.Cesar G2013-10-242-35/+13
* | [ticket/11983] Add missing argument to docblock in ucp_notificationsMarc Alexander2013-11-021-0/+1
* | [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-301-1/+1
* | Merge remote-tracking branch 'marc1706/ticket/11981' into developAndreas Fischer2013-10-291-6/+6
|\ \
| * | [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-281-6/+6
| |/
* | Merge pull request #1784 from nickvergessen/ticket/11924Nils Adermann2013-10-281-1/+1
|\ \ | |/ |/|
| * [ticket/11924] Fix some minor issues with the php event docsJoas Schilling2013-10-161-1/+1
* | [ticket/11923] Attempt to translate errors only if user can change avatar.Cesar G2013-10-171-3/+3
* | [ticket/11921] Move any HTML for Notifications to the templatesMatt Friedman2013-10-161-1/+1
|/
* [feature/plupload/integration] Integration of PluploadAndreas Fischer2013-10-111-1/+9
* Merge pull request #1654 from rechosen/ticket/11786Nathan Guse2013-10-031-2/+2
|\
| * Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786rechosen2013-09-237-38/+579
| |\
| * | [ticket/11786] Fix PHPDoc documentation of a few eventsrechosen2013-08-131-2/+2
* | | [ticket/11868] Replace phpbb_request_interface referencesVjacheslav Trushkin2013-09-262-6/+6
* | | [ticket/11700] Correct ucp_auth_link request interface referencesNils Adermann2013-09-191-3/+3
* | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-169-68/+590
|\ \ \ | | |/ | |/|
| * | 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