aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
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-163-2/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [ticket/8610] Update commentNathan Guse2012-12-151-1/+1
| | | | | | | | PHPBB3-8610
| * Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610Nathan Guse2012-12-133-16/+218
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
* | | | [ticket/11250] Move quote special cases from class to unit testsJoas Schilling2012-12-141-11/+0
|/ / / | | | | | | | | | PHPBB3-11250
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-143-13/+217
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-143-13/+217
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Rename tricky updates to database helper.Oleg Pudeyev2012-12-123-2/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Use empty($queries).Oleg Pudeyev2012-12-051-6/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Review comments fixed.Oleg Pudeyev2012-12-051-6/+6
| | | | | | | | | | | | 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-051-3/+108
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Add includes.Oleg Pudeyev2012-12-042-0/+8
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Move to a separate file to avoid blowing out functions.php.Oleg Pudeyev2012-12-042-87/+103
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] No whitespace changes in olympus.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Fix inaccurately copy pasted comment.Oleg Pudeyev2012-12-011-1/+1
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.Oleg Pudeyev2012-12-012-12/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Clarify that only the two tables actually work.Oleg Pudeyev2012-12-011-0/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Uncomment transactions.Oleg Pudeyev2012-12-011-2/+2
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] An implementation that actually works.Oleg Pudeyev2012-12-011-5/+68
| | | | | | | | | | | | PHPBB3-11162
| | * [ticket/11162] Extract existing behavior into a function and add a test.Oleg Pudeyev2012-11-021-1/+23
| | | | | | | | | | | | PHPBB3-11162
* | | [ticket/11015] Move comment in the right place.Oleg Pudeyev2012-12-131-7/+7
| | | | | | | | | | | | PHPBB3-11015
* | | [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31Andreas Fischer2012-12-131-0/+9
| | | | | | | | | | | | PHPBB3-11015
* | | [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.Oleg Pudeyev2012-12-131-5/+21
| | | | | | | | | | | | PHPBB3-11015
* | | [ticket/11015] Change permission adding in database updater to new style.Oleg Pudeyev2012-12-131-2/+2
| | | | | | | | | | | | PHPBB3-11015
* | | [ticket/11015] Change more docblocks to phpbb_db_driver.Oleg Pudeyev2012-12-134-5/+5
| | | | | | | | | | | | PHPBB3-11015
* | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11265] Add assertions for board installation success. [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager [ticket/10975] Add a test for viewing a profile. [ticket/10975] Test restricting by first character. [ticket/10975] Avoid rewriting global config twice. [ticket/10975] Test memberlist, not user creation. [ticket/10975] Some quick tests to check the memberlist behaviour
| * | | [ticket/11263] Fix PHP Notice: Undefined variable: extension_managerNathan Guse2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | $extension_manager should be $phpbb_extension_manager PHPBB3-11263
* | | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-1337-130/+760
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (101 commits) [ticket/10491] Make recreate_database static. [ticket/11088] Pass required objects in as arguments [ticket/11088] Globalize objects in new permission function [ticket/11088] Move permission creation to a function [ticket/11088] Copy a_styles permission for a_extensions [ticket/11088] Remove extraneous word from sentence in comment [ticket/11088] Changed "file extensions" to "attachment extensions" [ticket/11088] Fix the database updater to correctly manipulate the modules [ticket/11088] Put language pack module move below extension module creation [ticket/11088] Untested, progress on update script [ticket/11088] Fix typo (period instead of comma) [ticket/11088] Untested progress for update script [ticket/11088] Added missing comma [ticket/11088] Removed added space [ticket/11088] Move style, extension and language pack management to customise [ticket/11243] Show download all link on all pages of topic with attachments [feature/template-events] Pass arguments in correct order. [feature/template-events] Pass arguments in correct order. [ticket/10491] Install board once per test run. [ticket/11257] Do not require set_name() method to exist ...
| * | | [ticket/11088] Pass required objects in as argumentsDavid King2012-12-121-4/+4
| | | | | | | | | | | | | | | | PHPBB3-11088
| * | | [ticket/11088] Globalize objects in new permission functionDavid King2012-12-121-3/+4
| | | | | | | | | | | | | | | | PHPBB3-11088
| * | | [ticket/11088] Move permission creation to a functionDavid King2012-12-121-72/+66
| | | | | | | | | | | | | | | | PHPBB3-11088