1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 02:55:41 +02:00
Commit Graph

565 Commits

Author SHA1 Message Date
cae1f8bc86 Merge remote-tracking branch 'EXreaction/ticket/11387' into develop
* EXreaction/ticket/11387:
  [ticket/11387] Log module added only after it has been added
2013-05-31 17:21:00 +02:00
fedd9d18d2 Merge remote-tracking branch 'EXreaction/ticket/11413' into develop
* 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
  ...
2013-05-20 11:54:39 -04:00
c9ff315132 [ticket/11413] Rename file to something more helpful
PHPBB3-11413
2013-05-10 13:40:49 -05:00
6821a27ccf Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop
# 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
2013-05-08 19:35:59 -04:00
284011ebf2 [ticket/10325] move migration into a new file
PHPBB3-10325
2013-05-08 17:04:03 +05:30
153be855ca [ticket/10155] Update copyright in new migration file to 2013
PHPBB3-10155
2013-05-06 09:49:37 -07:00
5edae8af1f [ticket/11413] Remove conversion of user_notifications
PHPBB3-11413
2013-05-02 15:52:20 -05:00
bc9b6c3b6c [ticket/11413] Correct copyright year
PHPBB3-11413
2013-05-02 15:49:17 -05:00
07c972f5d7 [ticket/11413] Remove changes for ticket 11420 from this branch
PHPBB3-11413
2013-05-02 15:39:26 -05:00
2f2feaa4e8 [ticket/11413] Don't use the database for the convert test
Different databases seem to work slightly differently here and are causing
errors

PHPBB3-11413
2013-04-30 21:38:40 -05:00
81b2ad158c [ticket/11413] Use sql_insert_buffer
PHPBB3-11413
2013-04-30 21:01:46 -05:00
33287a7360 [ticket/11413] Undo editing the user_notifications table
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
2013-04-29 21:22:07 -05:00
198b992dce [ticket/11413] Schema changes and migration file
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
2013-04-28 22:53:05 -05:00
1a51abcca2 [ticket/10325] change language var
PHPBB3-10325
2013-04-25 21:01:14 +05:30
2dbe3b3c97 [ticket/10325] add new config value to database
PHPBB3-10325
2013-04-25 21:00:07 +05:30
aaf109e07d Merge pull request #1326 from dhruvgoel92/ticket/11485
[ticket/11485] add columns to update_schema before adding data
2013-04-24 09:59:41 -07:00
db5df5b6ac [ticket/10966] Introduce MSSQL base class for native and ODBC
PHPBB3-10966
2013-04-19 19:11:22 +02:00
e2875a7e17 [ticket/10966] Introduce MySQL base class
PHPBB3-10966
2013-04-17 21:25:35 +02:00
5a4438d486 [ticket/11485] add revert_schema for the updated columns
PHPBB3-11485
2013-04-09 15:39:26 +05:30
7c261f64dc [ticket/11485] add columns to styles table during updating schema before
updating the data

PHPBB3-10485
2013-04-09 15:39:17 +05:30
a7cf2bdace Merge pull request #1323 from t-backoff/ticket/11477
Ticket/11477
2013-03-31 15:57:26 -07:00
5d669ed1c5 Changing effectively_installed function to check if the config var is set. 2013-03-31 18:46:25 -04:00
a8f5695666 Migration file and change board_home_text to board_index_text 2013-03-28 17:53:14 -04:00
9e5cde7f66 Ticket# 11477 - Allow customisation of "Board index" 2013-03-28 02:34:36 -04:00
4bd5f279dc [ticket/11469] Add comment about using bitwise operator.
PHPBB3-11469
2013-03-28 00:28:51 +01:00
1bd13acb75 [ticket/11469] Use multi insert property from DB. Do not copy value to buffer.
PHPBB3-11469
2013-03-28 00:28:50 +01:00
4132573088 [ticket/11469] Use buffer with a single element instead of extra code path.
PHPBB3-11469
2013-03-28 00:28:50 +01:00
c9f059c4f2 [ticket/11469] Cast $result to boolean in insert_all()
|= returns integer values

PHPBB3-11469
2013-03-27 20:55:48 +01:00
53f9e2131c [ticket/11469] Add note about calling flush() after batch insert is done.
PHPBB3-11469
2013-03-27 19:27:27 +01:00
dc766f29b4 [ticket/11469] Have all methods of phpbb_db_sql_insert_buffer provide feedback.
PHPBB3-11469
2013-03-27 19:19:26 +01:00
8c5fcac232 [ticket/11469] Add benefits over collecting huge insert arrays to class doc.
PHPBB3-11469
2013-03-27 18:22:59 +01:00
55fb87ff18 Merge remote-tracking branch 'nickvergessen/ticket/bantu/11469' into ticket/11469
* nickvergessen/ticket/bantu/11469:
  [ticket/11469] Use method to check config count, instead of repeating it
  [ticket/11469] Return after sql_multi_insert when multi_insert is false
  [ticket/11469] Add some basic unit tests for phpbb_db_sql_insert_buffer
2013-03-27 18:11:49 +01:00
43b6ae3fee Merge remote-tracking branch 'phpbb/develop' into ticket/11469
* phpbb/develop:
  [ticket/11476] Remove pass-by-reference from sql_mutli_insert
  [ticket/11466] Remove old database driver files from PHPUnit exclude
  [ticket/11448] Use of $user_id parameter to mark a user's notifications read
  [ticket/11460] Add default behaviour tests for notification and email types.
  [ticket/11460] Configure functional test board email using dummy SMTP data.
  [ticket/11460] Add test for whether post_email and topic_email are checked.
  [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
  [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
2013-03-27 18:11:38 +01:00
94a15f85a6 [ticket/11469] Add example code to class documentation.
PHPBB3-11469
2013-03-27 18:11:31 +01:00
c629b2c7b3 [ticket/11476] Remove pass-by-reference from sql_mutli_insert
The method never writes to the array passed by reference. So it can be
passed by value instead to avoid certain problems.

PHPBB3-11476
2013-03-27 15:01:36 +01:00
bf6f2c5875 [ticket/11469] Return after sql_multi_insert when multi_insert is false
PHPBB3-11469
2013-03-27 14:00:47 +01:00
fc8bf3f3c7 [ticket/11469] Add comment about using sql_multi_insert when not buffering.
PHPBB3-11469
2013-03-25 17:01:44 +01:00
73d6855edf [ticket/10155] Make effectively installed test more specific
PHPBB3-10155
2013-03-22 11:22:25 -07:00
16a6025372 [ticket/11469] Add SQL insert buffer allowing easier handling of multi inserts.
1. Tries to prevent going over max packet size by flushing to the database
   after a certain number of rows have been added.
2. Because of 1., it is less likely to reach a connection timeout when
   inserting a huge number of rows.
3. By flushing the buffer when a certain size is reached, memory usage should
   be lower compared to building the whole insert row set first.

PHPBB3-11469
2013-03-21 23:12:31 +01:00
ac26be98c6 [ticket/10155] Use more descriptive title for migration file
PHPBB3-10155
2013-03-17 17:01:38 -07:00
56914e72b7 [ticket/10155] Use new migration file for jQuery config update 2013-03-15 09:51:34 -07:00
a38a92424d [ticket/10155] Update jQuery to 1.8.3
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
2013-03-14 10:45:17 -07:00
48bad80f4a Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop
# By OpenShift guest
# Via OpenShift guest
* remotes/Blitze/ticket/11383:
  [ticket/11383] Correctly revert modules added/removed by migrator
2013-03-09 18:33:19 -06:00
3a4b34ca32 [ticket/10202] Add migration file for config_db_text.
PHPBB3-10202
2013-03-05 22:59:58 +01:00
e7d9cfa009 [ticket/11398] Correctly call permission_set method in permission tool
The permission_set method calls itself inside the permission tool.
Probably due to an oversight, it is called as $this->set(), which causes a
fatal error. This patch will get rid of this issue.

PHPBB3-11398
2013-03-05 01:06:22 +01:00
1148f3fca5 Merge remote-tracking branch 'EXreaction/ticket/11386-3' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11386-3:
  [ticket/11386] Fix missing ;
  [ticket/11386] Send list of migrations instead of using load_migrations
2013-03-04 15:22:29 -05:00
1a8f72fd65 Merge remote-tracking branch 'EXreaction/ticket/11394' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11394:
  [ticket/11394] Relax Migration Tools
2013-03-04 15:10:48 -05:00
2aadc5a22c [ticket/11394] Relax Migration Tools
Do not throw as many exceptions in the migration tools (when something
unexpected occurs but can be safely ignored).

PHPBB3-11394
2013-03-04 14:06:52 -06:00
e652c078e6 Merge remote-tracking branch 'EXreaction/ticket/11393' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11393:
  [ticket/11393] Give more information on database updater
2013-03-04 14:51:00 -05:00
c1840c78c5 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3
Conflicts:
	phpBB/includes/db/migrator.php
2013-03-04 13:48:29 -06:00