aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
| | | | PHPBB3-11188
* Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-297-24/+28
|\ | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11259: [ticket/11259] htmlspecialchars($phpbb_admin_path) [ticket/11259] adm_relative_path -> phpbb_adm_relative_path [ticket/11259] Also make adm_relative_path available in the container [ticket/11259] Make phpbb_admin_path available everywhere Conflicts: phpBB/install/index.php phpBB/install/install_update.php
| * [ticket/11259] htmlspecialchars($phpbb_admin_path)Nathan Guse2012-12-103-18/+18
| | | | | | | | PHPBB3-11259
| * [ticket/11259] adm_relative_path -> phpbb_adm_relative_pathNathan Guse2012-12-091-1/+1
| | | | | | | | | | | | We can assume they properly format their config settings, right? PHPBB3-11259
| * [ticket/11259] Also make adm_relative_path available in the containerNathan Guse2012-12-091-0/+1
| | | | | | | | PHPBB3-11259
| * [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-094-7/+10
| | | | | | | | PHPBB3-11259
* | Merge remote-tracking branch 'p/ticket/10758' into developAndreas Fischer2012-12-257-47/+100
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10758: [ticket/10758] Add return to the other compat function. [ticket/10758] Add periods. [ticket/10758] Yes, only one empty line. [ticket/10758] Add deprecated tags. [ticket/10758] Add compat functions. [ticket/10758] Admin is not working yet. [ticket/10758] Test moderator and admin permissions. [ticket/10758] Check that acl was changed in the test. [ticket/10758] Extract obtain_user_data for the benefit of tests. [ticket/10758] Functional test for changing a user's permission. [ticket/10758] Spelling fix. [ticket/10758] Add a test for acp login. [ticket/10758] Dependency inject parameters into update_foes. [ticket/10758] Dependency inject parameters into cache_moderators.
| * | [ticket/10758] Add return to the other compat function.Oleg Pudeyev2012-12-241-1/+1
| | | | | | | | | | | | PHPBB3-10758
| * | [ticket/10758] Add periods.Oleg Pudeyev2012-12-221-2/+2
| | | | | | | | | | | | PHPBB3-10758
| * | [ticket/10758] Yes, only one empty line.Oleg Pudeyev2012-12-221-1/+0
| | | | | | | | | | | | PHPBB3-10758
| * | [ticket/10758] Add deprecated tags.Oleg Pudeyev2012-12-201-0/+2
| | | | | | | | | | | | PHPBB3-10758
| * | [ticket/10758] Add compat functions.Oleg Pudeyev2012-12-201-0/+27
| | | | | | | | | | | | PHPBB3-10758
| * | [ticket/10758] Extract obtain_user_data for the benefit of tests.Oleg Pudeyev2012-12-192-6/+21
| | | | | | | | | | | | PHPBB3-10758
| * | [ticket/10758] Spelling fix.Oleg Pudeyev2012-12-151-1/+1
| | | | | | | | | | | | PHPBB3-10758
| * | [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-153-8/+12
| | | | | | | | | | | | | | | | | | Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
| * | [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-156-32/+38
| | | | | | | | | | | | | | | | | | Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
* | | Merge remote-tracking branch 'p/ticket/11248' into developAndreas Fischer2012-12-221-1712/+1712
|\ \ \ | | | | | | | | | | | | | | | | * p/ticket/11248: [ticket/11248] Convert line endings to LF - develop edition.
| * | | [ticket/11248] Convert line endings to LF - develop edition.Oleg Pudeyev2012-12-071-1712/+1712
| | | | | | | | | | | | | | | | PHPBB3-11248
* | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-2213-20/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/11037: [ticket/11037] Eliminate global $db usage in cache drivers.
| * | | | [ticket/11037] Eliminate global $db usage in cache drivers.Oleg Pudeyev2012-12-2013-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only time $db is needed in cache drivers is to navigate the result set in sql_save. Pass it as a parameter in that function. PHPBB3-11037
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-201-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10880] The m_approve permisson no longer implies f_noapprove. Conflicts: phpBB/posting.php
| * | | | [ticket/10880] The m_approve permisson no longer implies f_noapprove.Andreas Fischer2012-12-191-2/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10880
* | | | | Merge PR #1133 branch 'marc1706/ticket/10954' into developOleg Pudeyev2012-12-191-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/10954: [ticket/10954] Add missing semi-colon [ticket/10954] Make sure to mark subforums unread and add small fixes [ticket/10954] Miscellaneous coding fixes [ticket/10954] Use quotes in attribute selectors and reduce use of each [ticket/10954] Change currentObject to $this for consistency [ticket/10954] Use function for closing alert popup [ticket/10954] Simplify marking forums read and fix topic marking [ticket/10954] Join array of class names instead of creating a string [ticket/10954] Fix coding guidelines infractions [ticket/10954] Change behavior of marking topics/forums [ticket/10954] Fix scope of current_object [ticket/10954] Only call $(this) once and reduce number of DOM traversals [ticket/10954] Modify is_ajax check for consistency [ticket/10954] Mark topics read without popup [ticket/10954] Mark forums read without popup or page refresh
| * | | | | [ticket/10954] Change behavior of marking topics/forumsMarc Alexander2012-12-141-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will now display a popup message for 3 seconds which will confirm the taken action. The amount of DOM traversals have been significantly reduced and jQuery.each is now used instead of for loops. Additionally, it is now possible to click on the mark topics/forums read links without triggering an AJAX error. PHPBB3-10954
| * | | | | [ticket/10954] Modify is_ajax check for consistencyMarc Alexander2012-12-121-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10954
| * | | | | [ticket/10954] Mark forums read without popup or page refreshMarc Alexander2012-12-121-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10954
* | | | | | Merge PR #1147 branch 'marc1706/ticket/10763' into developOleg Pudeyev2012-12-181-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/10763: [ticket/10763] Use self when calling get_extension() in filespec class [ticket/10763] Make functions for remote avatars static
| * | | | | | [ticket/10763] Use self when calling get_extension() in filespec classMarc Alexander2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10763
| * | | | | | [ticket/10763] Make functions for remote avatars staticMarc Alexander2012-12-171-5/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fileupload::image_types() and filespec::get_extension() are called statically while submitting the form for the remote avatar. Make them static as described in the ticket in order to prevent a PHP notice. Also change the tests to use the static functions. PHPBB3-10763
* | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-19 23:56:09 +0000