aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2013-07-131-1/+1
|\ | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com Conflicts: phpBB/language/en/install.php phpBB/language/en/ucp.php
| * [ticket/11112] Use https for user-visible links to phpbb.comMarc Alexander2013-07-121-1/+1
| | | | | | | | PHPBB3-11112
* | Merge pull request #1017 from nickvergessen/feature/softdelete-1-permissionNathan Guse2013-07-132-0/+239
|\ \ | | | | | | Soft delete
| * \ Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-133-3/+60
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * \ \ Merge remote-tracking branch 'phpbb/develop' into ↵Joas Schilling2013-07-1116-343/+634
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * phpbb/develop: (704 commits) [ticket/11630] Improvements to the PHP lint pre-commit hook [feature/auth-refactor] Move auth providers to separate directory [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling. [ticket/11619] Some tests for get_remote_file(). [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [ticket/10838] Fix URL for wiki and remove irrelevant line [ticket/10838] Remove php 5.4 and builtin server references [ticket/10838] Fix missing data [ticket/10838] separate database used mentioned in unit tests [ticket/11585] Make $auth_admin class property [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init ... Conflicts: phpBB/docs/sphinx.sample.conf phpBB/feed.php phpBB/styles/prosilver/template/search_results.html phpBB/styles/prosilver/template/viewforum_body.html
| * \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ↵Joas Schilling2013-03-071-0/+45
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/softdelete-1-permission * 'develop' of https://github.com/phpbb/phpbb3: [ticket/11408] user_jabber instead of jabber [ticket/10202] Rename method names _all() to _array(). [ticket/10202] Add migration file for config_db_text. [ticket/10202] Upgrade TEXT to the bigger MTEXT. [ticket/10202] Improve method documentation. [ticket/10202] SQL escape the table name. [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries. [ticket/10202] Define phpbb_config_db_text as a service. [ticket/10202] Add tests for phpbb_config_db_text. [ticket/10202] Adjust method names to guidelines. [ticket/10202] Add database schema for phpbb_config_db_text. [ticket/10202] Implementation of config options with arbitrary length values. [ticket/11166] Add ajaxify support to normal ACP confirm_box() [ticket/11166] Fix several custom confirm templates in prosilver [ticket/11166] Add caption to AJAX confirm box default template [ticket/11166] Fix typo in comment [ticket/11166] Use provided custom templates on AJAX confirm box
| * | | | | [ticket/9657] Fix colum name in migration fileJoas Schilling2013-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | [ticket/9657] Remove empty update_data() method from p2 migrationJoas Schilling2013-03-071-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
| * | | | | [ticket/9657] Add migration files for updating the databaseJoas Schilling2013-03-062-0/+245
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9657
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11420' into developJoas Schilling2013-07-132-64/+118
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11420: [ticket/11420] Fix tests [ticket/11420] Fix tests [ticket/11420] Fix tests [ticket/11420] Use !==, === when comparing strings [ticket/11420] Fix comments, license link [ticket/11420] Rename migrations file to something more helpful [ticket/11420] Forgot to include mock sql_insert_buffer [ticket/11420] Fix notification options conversion
| * | | | | [ticket/11420] Fix comments, license linkNathan Guse2013-07-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| * | | | | [ticket/11420] Rename migrations file to something more helpfulNathan Guse2013-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| * | | | | [ticket/11420] Fix notification options conversionNathaniel Guse2013-05-022-64/+106
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. Conflicts: build/build.xml phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| * | | | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
* | | | | | | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11662
* | | | | | | [ticket/8319] Add migration file for update changeJoas Schilling2013-07-101-0/+57
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | PHPBB3-8319
* | | | | | [ticket/11253] Put AND clause in correct SQL queryDavid King2013-06-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11253
* | | | | | [ticket/11253] Fix a few things brought up in the PRDavid King2013-06-231-7/+6
| | | | | |
* | | | | | [ticket/11253] Fix typo in constantDavid King2013-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11253
* | | | | | [ticket/11253] Add migration to add auth check to UCP signature moduleDavid King2013-06-221-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11253
* | | | | | [ticket/11503] similar implementation for mssql_native and odbcDhruv2013-06-202-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mssql_native and mssql_odbc db drivers varied at some places where they should have been similar. PHPBB3-11503
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11387' into developJoas Schilling2013-05-311-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11387: [ticket/11387] Log module added only after it has been added
| * | | | | | [ticket/11387] Log module added only after it has been addedNathaniel Guse2013-03-021-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11387
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11413' into developDavid King2013-05-201-0/+92
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11413: (23 commits) [ticket/11413] Revert some cache service related changes from earlier [ticket/11413] Use phpbb_user in test [ticket/11413] $user should have been $this->user [ticket/11413] Fix unit tests [ticket/11413] Translate the error [ticket/11413] Rename file to something more helpful [ticket/11413] Remove remaining irrelevant code to this PR [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR) [ticket/11413] Remove conversion of user_notifications [ticket/11413] Correct copyright year [ticket/11413] Remove changes for ticket 11420 from this branch [ticket/11413] Include mock class [ticket/11413] Don't use the database for the convert test [ticket/11413] Test get_notification_type_id and _ids functions [ticket/11413] Use sql_insert_buffer [ticket/11413] Create test for notification conversion [ticket/11413] Fix test fixtures and tests [ticket/11413] Fix some more tests [ticket/11413] Fix notification tests [ticket/11413] Prevent recursive function calls ...
| * | | | | | | [ticket/11413] Rename file to something more helpfulNathan Guse2013-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | | | [ticket/11413] Remove conversion of user_notificationsNathaniel Guse2013-05-021-90/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | | | [ticket/11413] Correct copyright yearNathaniel Guse2013-05-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | | | [ticket/11413] Remove changes for ticket 11420 from this branchNathaniel Guse2013-05-021-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | | | [ticket/11413] Don't use the database for the convert testNathaniel Guse2013-04-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different databases seem to work slightly differently here and are causing errors PHPBB3-11413
| * | | | | | | [ticket/11413] Use sql_insert_bufferNathaniel Guse2013-04-301-19/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11413
| * | | | | | | [ticket/11413] Undo editing the user_notifications tableNathaniel Guse2013-04-291-25/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item_type is not equivalent to notification_type_name, it can be a generic string (typically used to be able to subscribe to multiple notification types while only subscribing to one item PHPBB3-11413
| * | | | | | | [ticket/11413] Schema changes and migration fileNathaniel Guse2013-04-282-64/+206
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications tables are dropped because phpBB currently does not have any way to make the necessary changes to the DB schema (and no release has yet been made with these changes). This will fix the following bugs: PHPBB3-11411 PHPBB3-11413 PHPBB3-11414 PHPBB3-11416 PHPBB3-11420 PHPBB3-11413
* | | | | | | Merge PR #1294 branch 'VSEphpbb/ticket/10155' into developOleg Pudeyev2013-05-081-0/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Matt Friedman # Via Matt Friedman * VSEphpbb/ticket/10155: [ticket/10155] Update copyright in new migration file to 2013 [ticket/10155] Make effectively installed test more specific [ticket/10155] Use more descriptive title for migration file [ticket/10155] Use new migration file for jQuery config update [ticket/10155] Update jQuery to 1.8.3
| * | | | | | | [ticket/10155] Update copyright in new migration file to 2013Matt Friedman2013-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | | | [ticket/10155] Make effectively installed test more specificMatt Friedman2013-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | | | [ticket/10155] Use more descriptive title for migration fileMatt Friedman2013-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10155
| * | | | | | | [ticket/10155] Use new migration file for jQuery config updateMatt Friedman2013-03-152-1/+32
| | | | | | | |
| * | | | | | | [ticket/10155] Update jQuery to 1.8.3Matt Friedman2013-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently included jQuery is old by now, v1.6.2. We should update to 1.8.3. This allows us to take advantage of the latest form of jQuery event delegation ($.on). I don't think it wise to update to jQuery 1.9.x yet, as many 3rd party scripts still need to be updated to cope with its deprecated features ($.browser). Therefor, 1.8.3 is the latest and most widely compatible stable version right now. PHPBB3-10155
* | | | | | | | [ticket/10325] move migration into a new fileDhruv2013-05-082-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10325
* | | | | | | | [ticket/10325] change language varDhruv2013-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10325
* | | | | | | | [ticket/10325] add new config value to databaseDhruv2013-04-251-0/+2
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | PHPBB3-10325
* | | | | | | Merge pull request #1326 from dhruvgoel92/ticket/11485Nils Adermann2013-04-241-0/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/11485] add columns to update_schema before adding data
| * | | | | | | [ticket/11485] add revert_schema for the updated columnsDhruv2013-04-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11485
| * | | | | | | [ticket/11485] add columns to styles table during updating schema beforeDhruv2013-04-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating the data PHPBB3-10485
* | | | | | | | [ticket/10966] Introduce MSSQL base class for native and ODBCJoas Schilling2013-04-193-86/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10966
* | | | | | | | [ticket/10966] Introduce MySQL base classJoas Schilling2013-04-173-246/+148
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10966
* | | | | | | Merge pull request #1323 from t-backoff/ticket/11477Nils Adermann2013-03-311-0/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ticket/11477
| * | | | | | | Changing effectively_installed function to check if the config var is set.Tabitha Backoff2013-03-311-1/+1
| | | | | | | |
| * | | | | | | Migration file and change board_home_text to board_index_textTabitha Backoff2013-03-282-2/+23
| | | | | | | |