aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [feature/events] Adds overall_footer_copyright template ledgeMichael Cullum2012-12-172-2/+4
* [feature/events] Add overall_header_nav template ledgeMichael Cullum2012-12-171-0/+1
* [feature/events] Added overall_header_head ledge.Oleg Pudeyev2012-12-172-0/+5
* Merge PR #1140 branch 'develop-olympus' into developOleg Pudeyev2012-12-164-58/+168
|\
| * Merge PR #1140 branch 'EXreaction/ticket/8610' into develop-olympusOleg Pudeyev2012-12-164-58/+168
| |\
| | * [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | * [ticket/8610] Do not use requests to submit posts except in posting_test.phpNathan Guse2012-12-153-137/+108
| | * [ticket/8610] Move posting helpers to separate fileNathan Guse2012-12-133-105/+137
| | * [ticket/8610] Create helper functions to create topic/post in functional testsNathan Guse2012-12-132-78/+112
| | * Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-1312-45/+693
| | |\ | | |/ | |/|
| | * [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 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
* | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 04:34:21 +0000