aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11103] Fix merge conflictNathaniel Guse2012-12-261-6/+1
| | | | PHPBB3-11103
* [ticket/11103] updating commentsNathan Guse2012-12-151-3/+3
| | | | PHPBB3-11103
* [ticket/11103] data -> notification_dataNathan Guse2012-12-152-8/+8
| | | | PHPBB3-11103
* [ticket/11103] unread -> notification_readNathan Guse2012-12-156-16/+23
| | | | PHPBB3-11103
* [ticket/11103] time -> notification_timeNathan Guse2012-12-1512-22/+21
| | | | PHPBB3-11103
* Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-152-5/+5
|\ | | | | | | | | | | | | | | # By Andreas Fischer (1) and Oleg Pudeyev (1) # Via Nathan Guse (2) and Andreas Fischer (1) * 'develop' of github.com:phpbb/phpbb3: [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box. [ticket/11162] Chase dbal autoloading changes in develop.
| * 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/11103] Move is_enabled to a separate table for better performanceNathan Guse2012-12-156-61/+92
| | | | | | | | | | | | PHPBB3-11103
* | | [ticket/11103] Prune notifications functionNathan Guse2012-12-151-3/+15
| | | | | | | | | | | | | | | | | | To delete all notifications before a certain time PHPBB3-11103
* | | Merge branch 'ticket/11103' of github.com:EXreaction/phpbb3 into ticket/11103Nathan Guse2012-12-156-35/+230
|\ \ \
| * | | [ticket/11103] Mark topic/post subscription notification read when approvedNathan Guse2012-12-152-11/+13
| | | | | | | | | | | | | | | | PHPBB3-11103
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-154-24/+217
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (20) and others # Via Andreas Fischer (3) and Oleg Pudeyev (2) * 'develop' of github.com:phpbb/phpbb3: (33 commits) [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing. [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/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/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/11103] Purge notifications (to be used when an extension is purged)Nathan Guse2012-12-151-0/+15
|/ / / / | | | | | | | | | | | | PHPBB3-11103
* | | | [ticket/11103] Add constants for the tablesNathan Guse2012-12-131-0/+2
| | | | | | | | | | | | | | | | PHPBB3-11103
* | | | [ticket/11103] dbal -> phpbb_db_driverNathan Guse2012-12-134-9/+9
| | | | | | | | | | | | | | | | PHPBB3-11103
* | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103Nathan Guse2012-12-1330-115/+128
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Oleg Pudeyev (21) and others # Via Andreas Fischer (7) and others * 'develop' of github.com:phpbb/phpbb3: (56 commits) [ticket/11015] Move comment in the right place. [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31 [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli. [ticket/11015] Change permission adding in database updater to new style. [ticket/11015] Change more docblocks to phpbb_db_driver. [ticket/11015] Installer still needs 3.0-style dbms name. [ticket/11262] Add .lock in cache directory to .gitignore [ticket/11015] Include functions.php because it is not always included. [ticket/11265] Add assertions for board installation success. [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager [ticket/11015] Convert database drivers to new spelling in post setup sync. [ticket/11015] Convert connect test to the new syntax. [ticket/11015] Restore whitespace to avoid conflict when merging develop. [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/10491] Make recreate_database static. [ticket/11088] Pass required objects in as arguments ... Conflicts: phpBB/install/database_update.php
| * | | [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 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-1320-101/+571
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Move style, extension and language pack management to customiseDavid King2012-12-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of being separated, these related ACP modules are now grouped intuitively. PHPBB3-11088
| * | | | [ticket/11015] Restore whitespace to avoid conflict when merging develop.Oleg Pudeyev2012-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11015
| * | | | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-0651-224/+1357
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/develop: (196 commits) [ticket/11219] Coding guidelines and naming consistency changes [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP [ticket/11247] Fix wrong property reference in flock class. [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10103] New and improved wording. [ticket/10716] Only lint on php 5.3+. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. ... Conflicts: phpBB/includes/functions.php tests/cache/cache_test.php
| * | | | | [ticket/11015] Change more docblocks.Oleg Pudeyev2012-12-049-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11015
| * | | | | [ticket/11015] Include dbms name in exception message.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11015
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 03:45:56 +0000