aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-03-043-91/+101
|\
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2013-01-155-16/+83
| |\
| * | [ticket/11103] Mark topic/post subscription notification read when approvedNathan Guse2012-12-151-1/+13
| * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-152-13/+11
| |\ \
| * | | [ticket/11103] Instantiate $phpbb_notifications as neededNathan Guse2012-12-133-10/+20
| * | | [ticket/11103] Create user loader class, update for DICNathan Guse2012-11-203-20/+20
| * | | Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103Nathaniel Guse2012-11-107-16/+16
| |\ \ \
| * | | | [ticket/11103] Use the full class name as the item_type/methodNathan Guse2012-10-203-18/+22
| * | | | [ticket/11103] Remove unnecessary commentsNathan Guse2012-10-183-13/+0
| * | | | [ticket/11103] Ability to query data before running create_insert_array()Nathan Guse2012-10-121-0/+7
| * | | | [ticket/11103] Finishing up report post/pm and adding report closedNathan Guse2012-10-111-22/+12
| * | | | [ticket/11103] Finishing up PM Report notificationsNathan Guse2012-10-091-0/+4
| * | | | Merge branch 'ticket/11140' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-10-091-1/+1
| |\ \ \ \
| * | | | | [ticket/11103] Working on report notifications (post/pm)Nathan Guse2012-10-091-1/+5
| * | | | | [ticket/11103] Make $phpbb_notifications a global and use it everywhereNathan Guse2012-10-041-4/+2
| * | | | | [ticket/11103] Topic/Post in queue notificationNathan Guse2012-09-151-1/+20
| * | | | | [ticket/11103] Topic and post dis/approval notificationsNathan Guse2012-09-151-46/+36
| * | | | | [ticket/11103] Starting approve_post type notificationNathan Guse2012-09-151-25/+8
| * | | | | [ticket/11103] Normalization of $phpbb_notifications variable nameNathan Guse2012-09-141-3/+3
| * | | | | [ticket/11103] Add/Update/Mark Read functions accept an array for the typeNathan Guse2012-09-141-1/+1
| * | | | | [ticket/11103] Restyle the notification listNathan Guse2012-09-091-1/+3
| * | | | | [ticket/11103] Post notificationsNathan Guse2012-09-091-3/+3
* | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatarsMarc Alexander2013-02-072-14/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into developNathan Guse2013-01-141-14/+7
| |\ \ \ \ \
| | * | | | | [ticket/11171] Cleanup of leftoversBruno Ais2012-12-071-12/+1
| | * | | | | [ticket/11171] Use the options stored to decide how to show itBruno Ais2012-12-071-2/+6
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-061-0/+1
| |\ \ \ \ \
| | * | | | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
* | | | | | | [feature/avatars] Add phpbb prefix to new functionsMarc Alexander2013-01-042-6/+6
* | | | | | | Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatarsMarc Alexander2012-12-243-11/+82
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge PR #1140 branch 'develop-olympus' into developOleg Pudeyev2012-12-163-2/+75
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | * | | | Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-132-16/+12
| | |\ \ \ \
| | * | | | | [ticket/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-132-22/+6
| | * | | | | [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-133-12/+3
| | * | | | | [ticket/8610] Add some commentsNathan Guse2012-12-132-0/+4
| | * | | | | [ticket/8610] Update Bookmarks and Subscriptions when splitting topicsNathaniel Guse2012-12-132-4/+64
| | * | | | | [ticket/8610] Update Bookmarks when merging posts into another topicNathaniel Guse2012-12-131-1/+9
| | * | | | | [ticket/8610] Update Bookmarks when forking topicsNathaniel Guse2012-12-131-1/+21
| | * | | | | [ticket/8610] Update Bookmarks when merging topicsNathaniel Guse2012-12-131-1/+9
| * | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-142-13/+11
| |\ \ \ \ \ \ | | | |/ / / / | | |/| / / / | | |_|/ / / | |/| | | |
| | * | | | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-122-2/+2
| | * | | | [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | * | | | [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | * | | | [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | * | | | [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| | |/ / /
* | | | | Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into featur...Marc Alexander2012-11-122-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'develop' into feature/avatarsIgor Wiedler2012-07-218-17/+36
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into feature/avatarsIgor Wiedler2012-06-272-4/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into feature/avatarsIgor Wiedler2012-04-073-8/+36
| |\ \ \ \ \ \
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-27 04:05:07 +0000