aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11103] Mark Private Messages as readNathan Guse2012-09-141-1/+5
* [ticket/11103] Mark all post/quote notifications read when marking topicsNathan Guse2012-09-141-0/+15
* Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-09-1415-28/+225
|\
| * Merge remote-tracking branch 'imkingdavid/ticket/11086' into developAndreas Fischer2012-09-141-13/+33
| |\
| | * [ticket/11086] Move DI processing below $request definitionDavid King2012-09-131-8/+7
| | * [ticket/11086] Fix database_update.php to use Dependency Injection ContainerDavid King2012-09-131-13/+34
| * | Merge remote-tracking branch 'igorw/ticket/11101' into developAndreas Fischer2012-09-143-15/+15
| |\ \
| | * | [ticket/11101] Delay execution of container processorsIgor Wiedler2012-09-083-15/+15
| * | | Merge remote-tracking branch 'bantu/ticket/11109' into developAndreas Fischer2012-09-141-2/+13
| |\ \ \
| | * | | [ticket/11109] Re-add file conflict checks to compress classFyorl2012-09-141-2/+13
| |/ / /
| * | | Merge branch 'develop-olympus' into developAndreas Fischer2012-09-1411-0/+166
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote-tracking branch 'Fyorl/ticket/11045' into develop-olympusAndreas Fischer2012-09-1411-0/+166
| | |\ \
| | | * | [ticket/11045] Removed file conflict tests for compress classFyorl2012-09-111-13/+2
| | | * | [ticket/11045] Replaced __DIR__ with dirname(__FILE__)Fyorl2012-09-011-8/+8
| | | * | [ticket/11045] Opening brace on its own lineFyorl2012-08-281-1/+2
| | | * | [ticket/11045] Explicitely check for zlib and bz2Fyorl2012-08-281-2/+1
| | | * | [ticket/11045] Added tests for file conflictsFyorl2012-08-281-5/+21
| | | * | [ticket/11045] Added unit tests for the compress classFyorl2012-08-2811-0/+161
* | | | | [ticket/11103] Store the item's parent id for marking things readNathan Guse2012-09-1410-88/+190
* | | | | [ticket/11103] Allow notification types to override update functionalityNathan Guse2012-09-146-10/+92
* | | | | [ticket/11103] Quote notificationsNathan Guse2012-09-124-1/+160
* | | | | [ticket/11103] Jabber notification methodNathan Guse2012-09-123-8/+43
* | | | | [ticket/11103] Correctly find users for notification for new topicsNathan Guse2012-09-122-3/+16
* | | | | [ticket/11103] Add ability for notification types to load special dataNathan Guse2012-09-124-3/+105
* | | | | [ticket/11103] Use the Topic/Forum Subscriptions systemNathan Guse2012-09-122-4/+28
* | | | | [ticket/11103] Add topic ID to view post URLNathan Guse2012-09-122-3/+6
* | | | | [ticket/11103] Remove notifications to posts/topics when they are deletedNathan Guse2012-09-091-0/+10
* | | | | [ticket/11103] Coding guidelines (SQL Queries)Nathan Guse2012-09-092-4/+8
* | | | | [ticket/11103] Restyle the notification listNathan Guse2012-09-0910-30/+98
* | | | | [ticket/11103] Update notifications on post/topic editNathan Guse2012-09-094-13/+34
* | | | | [ticket/11103] Use the language system, topic notificationsNathan Guse2012-09-095-8/+200
* | | | | [ticket/11103] Post notificationsNathan Guse2012-09-095-241/+122
* | | | | [ticket/11103] Do not initialize the notifications in common.phpNathan Guse2012-09-091-3/+0
* | | | | [ticket/11103] General notification email template.Nathan Guse2012-09-098-25/+65
* | | | | [ticket/11103] The service now handles all user loading itselfNathan Guse2012-09-097-220/+152
* | | | | Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-09-094-21/+39
|\ \ \ \ \
| * | | | | [ticket/11103] Move banned user checking to email methodNathaniel Guse2012-09-082-14/+14
| * | | | | [ticket/11103] Full url functionNathaniel Guse2012-09-083-6/+19
| * | | | | [ticket/11103] Order notifications properlyNathaniel Guse2012-09-081-1/+6
* | | | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103Nathan Guse2012-09-093-3/+6
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/10876' into developDavid King2012-09-081-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | [ticket/10876] Update regex to a version which still matches our testsJoas Schilling2012-08-211-1/+1
| | * | | [ticket/10876] Revert "add newline after php tag"-regex back to 3.0 versionJoas Schilling2012-08-051-1/+1
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11092' into developAndreas Fischer2012-09-082-2/+5
| |\ \ \ \
| | * | | | [ticket/11092] phpbb_gen_download_links strict standards errorsNathan Guse2012-09-072-2/+5
* | | | | | [ticket/11103] Some fixes for the email methodNathan Guse2012-09-084-26/+20
* | | | | | [ticket/11103] Fixing some db columns that were of the incorrect typeNathan Guse2012-09-086-12/+22
* | | | | | [ticket/11103] Jabber notification method baseNathan Guse2012-09-081-0/+36
* | | | | | [ticket/11103] Work on the pm type and email methodNathan Guse2012-09-087-28/+159
* | | | | | [ticket/11103] Forgot a constantNathan Guse2012-09-084-1/+14