aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/events] Adding overall_footer_index_link template ledgeMichael Cullum2012-12-171-1/+2
| | | | | | Used by board3portal PHPBB3-9550
* [feature/events] Adding overall_header_index_link template ledgeMichael Cullum2012-12-171-1/+3
| | | | | | Used by board3portal PHPBB3-9550
* [feature/events] Add posting_editor_options template ledgeMichael Cullum2012-12-172-0/+2
| | | | | | This is needed for options for posts and is used by topic as link MOD PHPBB3-9550
* [feature/events] Adds overall_footer_copyright template ledgeMichael Cullum2012-12-172-2/+4
| | | | | | This allows people to add copyright information to the footer PHPBB3-9550
* [feature/events] Add overall_header_nav template ledgeMichael Cullum2012-12-171-0/+1
| | | | | | Adds a ledge next to the FAQ button for extensions to put links on the navigation bar PHPBB3-9550
* [feature/events] Added overall_header_head ledge.Oleg Pudeyev2012-12-172-0/+5
| | | | | | This will be used by the trivial-css mod. PHPBB3-9550
* Merge PR #1140 branch 'develop-olympus' into developOleg Pudeyev2012-12-164-58/+168
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8610] Update comment [ticket/8610] Do not use requests to submit posts except in posting_test.php [ticket/8610] Move posting helpers to separate file [ticket/8610] Create helper functions to create topic/post in functional tests [ticket/8610] Use phpbb_update_rows_avoiding_duplicates [ticket/8610] Revert some funky merging I did from rebase [ticket/8610] Add some comments [ticket/8610] Update Bookmarks and Subscriptions when splitting topics [ticket/8610] Update Bookmarks when merging posts into another topic [ticket/8610] Update Bookmarks when forking topics [ticket/8610] Update Bookmarks when merging topics
| * Merge PR #1140 branch 'EXreaction/ticket/8610' into develop-olympusOleg Pudeyev2012-12-164-58/+168
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/8610: [ticket/8610] Update comment [ticket/8610] Do not use requests to submit posts except in posting_test.php [ticket/8610] Move posting helpers to separate file [ticket/8610] Create helper functions to create topic/post in functional tests [ticket/8610] Use phpbb_update_rows_avoiding_duplicates [ticket/8610] Revert some funky merging I did from rebase [ticket/8610] Add some comments [ticket/8610] Update Bookmarks and Subscriptions when splitting topics [ticket/8610] Update Bookmarks when merging posts into another topic [ticket/8610] Update Bookmarks when forking topics [ticket/8610] Update Bookmarks when merging topics
| | * [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | | | | | PHPBB3-8610
| | * [ticket/8610] Do not use requests to submit posts except in posting_test.phpNathan Guse2012-12-153-137/+108
| | | | | | | | | | | | | | | | | | | | | | | | Moving my functional test functions from posting_helpers.php to posting_test.php since it is a bit nicer and more reusable if posting_test.php is to be expanded in the future. PHPBB3-8610
| | * [ticket/8610] Move posting helpers to separate fileNathan Guse2012-12-133-105/+137
| | | | | | | | | | | | | | | | | | This is to prevent cluttering up the functional test case class more PHPBB3-8610
| | * [ticket/8610] Create helper functions to create topic/post in functional testsNathan Guse2012-12-132-78/+112
| | | | | | | | | | | | | | | | | | | | | | | | This will be used to test splitting/copying/merging/etc in functional tests Also convert functional posting_test.php to use these functions PHPBB3-8610
| | * Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-1312-45/+693
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (29) and others # Via Andreas Fischer (3) and others * 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits) [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11162] Reformat. [ticket/10491] Make recreate_database static. [ticket/11162] Rename tricky updates to database helper. [ticket/10491] Install board once per test run. [ticket/10972] Drop user deletion. [ticket/10972] Tweak user addition. [ticket/10972] Add destroy method to mock cache. [ticket/10972] Add mock null cache. [ticket/10972] Backport get_db from develop. [ticket/10972] Added explicit checks for creating duplicate users. [ticket/10972] Moved tests into appropriate places and added comments [ticket/10972] Added methods for creating and deleting basic users [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. ... Conflicts: phpBB/includes/mcp/mcp_topic.php
| | * [ticket/8610] Use phpbb_update_rows_avoiding_duplicatesNathan Guse2012-12-132-22/+6
| | | | | | | | | | | | PHPBB3-8610
| | * [ticket/8610] Revert some funky merging I did from rebaseNathan Guse2012-12-133-12/+3
| | | | | | | | | | | | PHPBB3-8610
| | * [ticket/8610] Add some commentsNathan Guse2012-12-132-0/+4
| | | | | | | | | | | | PHPBB3-8610
| | * [ticket/8610] Update Bookmarks and Subscriptions when splitting topicsNathaniel Guse2012-12-132-4/+64
| | | | | | | | | | | | | | | | | | | | | Update bookmarks and subscriptions to add bookmarks/subscriptions to the new topic when using the split_topic function PHPBB3-8610
| | * [ticket/8610] Update Bookmarks when merging posts into another topicNathaniel Guse2012-12-131-1/+9
| | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when merging posts into another topic using the merge_posts function. PHPBB3-8610
| | * [ticket/8610] Update Bookmarks when forking topicsNathaniel Guse2012-12-131-1/+21
| | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when forking topics using the mcp_fork_topic function. PHPBB3-8610
| | * [ticket/8610] Update Bookmarks when merging topicsNathaniel Guse2012-12-131-1/+9
| | | | | | | | | | | | | | | | | | | | | Update bookmarks to the new topic when merging multiple topics using the merge_topics function. PHPBB3-8610
* | | Merge remote-tracking branch 'remotes/bantu/ticket/11273' into developNathan Guse2012-12-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * remotes/bantu/ticket/11273: [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
| * | | [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.Andreas Fischer2012-12-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11273
* | | | Merge remote-tracking branch 'remotes/Oleg/ticket/11162' into developNathan Guse2012-12-151-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev # Via Oleg Pudeyev * remotes/Oleg/ticket/11162: [ticket/11162] Chase dbal autoloading changes in develop.
| * | | [ticket/11162] Chase dbal autoloading changes in develop.Oleg Pudeyev2012-12-131-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11162
* | | | Merge remote-tracking branch 'p/ticket/11268' into developAndreas Fischer2012-12-151-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/11268: [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.
| * | | | [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.Oleg Pudeyev2012-12-141-1/+0
|/ / / / | | | | | | | | | | | | PHPBB3-11268
* | | | Merge PR #1142 branch 'nickvergessen/ticket/11250' into developOleg Pudeyev2012-12-142-23/+248
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11250: [ticket/11250] Use user defined message as incomplete message [ticket/11250] Add tests for simple nesting and code [ticket/11250] Run tests by default and add an option for incomplete ones [ticket/11250] Fix parsing result with special chars [ticket/11250] Add tests for size and attachment [ticket/11250] Fix method names [ticket/11250] Add some comments and fix a description [ticket/11250] Add some more tests for quotes [ticket/11250] Move quote special cases from class to unit tests [ticket/11250] Add parsing tests for our basic bbcodes in simple cases
| * | | [ticket/11250] Use user defined message as incomplete messageJoas Schilling2012-12-141-3/+2
| | | | | | | | | | | | | | | | PHPBB3-11250
| * | | [ticket/11250] Add tests for simple nesting and codeJoas Schilling2012-12-141-7/+44
| | | | | | | | | | | | | | | | PHPBB3-11250
| * | | [ticket/11250] Run tests by default and add an option for incomplete onesJoas Schilling2012-12-141-1/+4
| | | | | | | | | | | | | | | | PHPBB3-11250
| * | | [ticket/11250] Fix parsing result with special charsJoas Schilling2012-12-141-35/+40
| | | | | | | | | | | | | | | | | | | | | | | | : . and [ are replaced by their html representation if they are text only PHPBB3-11250
| * | | [ticket/11250] Add tests for size and attachmentJoas Schilling2012-12-141-0/+10
| | | | | | | | | | | | | | | | PHPBB3-11250
| * | | [ticket/11250] Fix method namesJoas Schilling2012-12-141-3/+3
| | | | | | | | | | | | | | | | PHPBB3-11250
| * | | [ticket/11250] Add some comments and fix a descriptionJoas Schilling2012-12-141-6/+4
| | | | | | | | | | | | | | | | PHPBB3-11250
| * | | [ticket/11250] Add some more tests for quotesJoas Schilling2012-12-141-0/+26
| | | | | | | | | | | | | | | | PHPBB3-11250
| * | | [ticket/11250] Move quote special cases from class to unit testsJoas Schilling2012-12-142-11/+26
| | | | | | | | | | | | | | | | PHPBB3-11250
| * | | [ticket/11250] Add parsing tests for our basic bbcodes in simple casesJoas Schilling2012-12-141-8/+140
|/ / / | | | | | | | | | PHPBB3-11250
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-147-13/+516
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| * | Merge remote-tracking branch 'p/ticket/11162' into develop-olympusAndreas Fischer2012-12-147-13/+516
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11162: (22 commits) [ticket/11162] Reformat. [ticket/11162] Rename tricky updates to database helper. [ticket/11162] Use empty($queries). [ticket/11162] Review comments fixed. [ticket/11162] Reformat. [ticket/11162] Newlines to LF. [ticket/11162] Use correct functions. [ticket/11162] Account for notify_status. [ticket/11162] This test really only works for bookmarks. [ticket/11162] The test is not at all trivial. [ticket/11162] Add includes. [ticket/11162] Move to a separate file to avoid blowing out functions.php. [ticket/11162] No whitespace changes in olympus. [ticket/11162] Fix inaccurately copy pasted comment. [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp. [ticket/11162] Clarify that only the two tables actually work. [ticket/11162] Uncomment transactions. [ticket/11162] An implementation that actually works. [ticket/11162] Make count function upper case. [ticket/11162] Rename count variable name to remaining_rows. ...
| | * | [ticket/11162] Reformat.Oleg Pudeyev2012-12-131-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Rename tricky updates to database helper.Oleg Pudeyev2012-12-127-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-052-7/+8
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Reformat.Oleg Pudeyev2012-12-051-3/+5
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Newlines to LF.Oleg Pudeyev2012-12-051-208/+208
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Use correct functions.Oleg Pudeyev2012-12-052-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Account for notify_status.Oleg Pudeyev2012-12-053-10/+239
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] This test really only works for bookmarks.Oleg Pudeyev2012-12-043-3/+50
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] The test is not at all trivial.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11162
| | * | [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11162