aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2 from VSEphpbb/ticket/11103-VSENathan Guse2012-12-263-15/+61
|\
| * [ticket/11103-VSE] Updated notification AJAX stylingMatt Friedman2012-12-253-15/+61
* | [ticket/11103] Fix merge conflictNathaniel Guse2012-12-261-6/+1
* | [ticket/11103] Remove global $db usage in testNathaniel Guse2012-12-261-6/+4
|/
* [ticket/11103] updating commentsNathan Guse2012-12-151-3/+3
* [ticket/11103] remove is_enabledNathan Guse2012-12-151-1/+0
* [ticket/11103] data -> notification_dataNathan Guse2012-12-1512-33/+33
* [ticket/11103] unread -> notification_readNathan Guse2012-12-1516-44/+51
* [ticket/11103] time -> notification_timeNathan Guse2012-12-1522-56/+55
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-152-5/+5
|\
| * Merge remote-tracking branch 'remotes/bantu/ticket/11273' into developNathan Guse2012-12-151-1/+1
| |\
| | * [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.Andreas Fischer2012-12-151-1/+1
| * | Merge remote-tracking branch 'remotes/Oleg/ticket/11162' into developNathan Guse2012-12-151-4/+4
| |\ \ | | |/ | |/|
| | * [ticket/11162] Chase dbal autoloading changes in develop.Oleg Pudeyev2012-12-131-4/+4
* | | [ticket/11103] Move is_enabled to a separate table for better performanceNathan Guse2012-12-1517-101/+187
* | | [ticket/11103] Prune notifications functionNathan Guse2012-12-151-3/+15
* | | Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-1512-48/+777
|\ \ \
| * | | [ticket/11103] Mark topic/post subscription notification read when approvedNathan Guse2012-12-152-11/+13
| * | | Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-151-0/+1
| |\ \ \
| * \ \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-1510-37/+764
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'p/ticket/11268' into developAndreas Fischer2012-12-151-1/+0
| | |\ \ \
| | | * | | [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.Oleg Pudeyev2012-12-141-1/+0
| | |/ / /
| | * | | Merge PR #1142 branch 'nickvergessen/ticket/11250' into developOleg Pudeyev2012-12-142-23/+248
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | [ticket/11250] Use user defined message as incomplete messageJoas Schilling2012-12-141-3/+2
| | | * | [ticket/11250] Add tests for simple nesting and codeJoas Schilling2012-12-141-7/+44
| | | * | [ticket/11250] Run tests by default and add an option for incomplete onesJoas Schilling2012-12-141-1/+4
| | | * | [ticket/11250] Fix parsing result with special charsJoas Schilling2012-12-141-35/+40
| | | * | [ticket/11250] Add tests for size and attachmentJoas Schilling2012-12-141-0/+10
| | | * | [ticket/11250] Fix method namesJoas Schilling2012-12-141-3/+3
| | | * | [ticket/11250] Add some comments and fix a descriptionJoas Schilling2012-12-141-6/+4
| | | * | [ticket/11250] Add some more tests for quotesJoas Schilling2012-12-141-0/+26
| | | * | [ticket/11250] Move quote special cases from class to unit testsJoas Schilling2012-12-142-11/+26
| | | * | [ticket/11250] Add parsing tests for our basic bbcodes in simple casesJoas Schilling2012-12-141-8/+140
| | |/ /
| | * | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-147-13/+516
| | |\ \
| | | * \ Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-147-13/+516
| | | |\ \
| | | | * | [ticket/11162] Reformat.Oleg Pudeyev2012-12-131-1/+1
| | | | * | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-127-4/+4
| | | | * | [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | | | * | [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-052-7/+8
| | | | * | [ticket/11162] Reformat.Oleg Pudeyev2012-12-051-3/+5
| | | | * | [ticket/11162] Newlines to LF.Oleg Pudeyev2012-12-051-208/+208
| | | | * | [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | | | * | [ticket/11162] Account for notify_status.Oleg Pudeyev2012-12-053-10/+239
| | | | * | [ticket/11162] This test really only works for bookmarks.Oleg Pudeyev2012-12-043-3/+50
| | | | * | [ticket/11162] The test is not at all trivial.Oleg Pudeyev2012-12-041-1/+1
| | | | * | [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | * | [ticket/11162] Move to a separate file to avoid blowing out functions.php.Oleg Pudeyev2012-12-044-88/+104
| | | | * | [ticket/11162] No whitespace changes in olympus.Oleg Pudeyev2012-12-011-1/+1
| | | | * | [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