mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-21 23:13:43 +02:00
Code Issues Releases Wiki Activity
28,785 Commits 18 Branches 192 Tags
Commit Graph

693 Commits

Author SHA1 Message Date
Marc Alexander
dff950162c Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/phpbb/db/migration/tool/module.php
 2016-08-31 21:41:17 +02:00
Marc Alexander
f008708d5c Merge pull request #4377 from rxu/ticket/14703 
[ticket/14703] Fix parent module selection for custom extension modules
 2016-08-31 21:39:09 +02:00
Oliver Schramm
88384a1e63 Merge branch 'ticket/14742' into ticket/14742-32x 
Conflicts:
	phpBB/phpbb/db/migrator.php
 2016-08-20 22:38:45 +02:00
Oliver Schramm
773f6d08a5 [ticket/14742] Reset migration_data_state before reverting 
PHPBB3-14742
 2016-08-20 22:31:08 +02:00
Oliver Schramm
463e8e4b13 [ticket/14742] Change constants to use Symfony values 
This is to avoid errors when comparing verbosity levels
in a CLI output handler that is using Symfony's OutputInterface
for example.

PHPBB3-14742
 2016-08-20 22:28:29 +02:00
Oliver Schramm
7c99fcf782 [ticket/14742] Pause after each update_data step too 
Rewriting process_data_step() to remove the now
useless foreach() loop.

PHPBB3-14742
 2016-08-20 22:20:21 +02:00
Oliver Schramm
775d1c855a [ticket/14742] Improve readability of the code 
PHPBB3-14742
 2016-08-20 22:20:20 +02:00
Oliver Schramm
e050cf5c11 [ticket/14742] Fix comments in migrator 
PHPBB3-14742
 2016-08-20 03:35:38 +02:00
Oliver Schramm
0d1b7b3935 Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-12 02:38:55 +02:00
Oliver Schramm
263fbe54fc [ticket/14742] Enhance measured time for migrations 
PHPBB3-14742
 2016-08-12 02:03:52 +02:00
Oliver Schramm
4a92a8efb5 [ticket/14742] Improve verbosity of migrator output 
PHPBB3-14742
 2016-08-12 02:01:01 +02:00
Oliver Schramm
03be89ebd7 [ticket/14742] Fix progress bar in database updater 
Because of the new way, schema update steps are handled, the already
misleading progress bar was even more misleading. This should fix it.

PHPBB3-14742
 2016-08-11 23:28:54 +02:00
Oliver Schramm
210310b584 Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-11 18:30:35 +02:00
Oliver Schramm
52afa74f4e [ticket/14742] Avoid loop while reverting schema 
PHPBB3-14742
 2016-08-11 18:00:10 +02:00
Oliver Schramm
b00a39b9ad [ticket/14742] Make $last_run_migration protected 
PHPBB3-14742
 2016-08-11 17:59:51 +02:00
Oliver Schramm
6078bae7f8 [ticket/14742] Fix schema update 
First make it work, then avoid a loop

PHPBB3-14742
 2016-08-11 13:31:23 +02:00
Oliver Schramm
3346609126 [ticket/14742] Display message if reverting schema is in progress 
PHPBB3-14742
 2016-08-11 01:25:45 +02:00
Oliver Schramm
4938887e5d Merge branch 'ticket/14742' into ticket/14742-32x 2016-08-11 01:20:59 +02:00
Oliver Schramm
a277f9cf07 [ticket/14742] Small fixes to migrator 
PHPBB3-14742
 2016-08-11 01:09:11 +02:00
Oliver Schramm
8e1461ca61 [ticket/14742] Avoid loop while reverting data 
This combines reverted updata_data and revert_data into a single array.

PHPBB3-14742
 2016-08-11 01:09:11 +02:00
Oliver Schramm
9fb649793d [ticket/14742] Pause after each schema change 
It is certainly better than running them all at once

PHPBB3-14742
 2016-08-11 01:03:23 +02:00
rxu
8e8e25cc1f [ticket/14703] Fix the docblock 
PHPBB3-14703
 2016-07-24 23:35:20 +07:00
rxu
5eb493fa86 [ticket/14703] Fix existance checking if multiple parent module_langname found 
PHPBB3-14703
 2016-07-24 21:22:37 +07:00
rxu
8cf2790d55 [ticket/14703] Add test for the case multiple parent module_langname found 
PHPBB3-14703
 2016-07-24 02:31:44 +07:00
rxu
eaafb758ce [ticket/14703] Select the parent module id from the several found 
PHPBB3-14703
 2016-07-23 21:34:05 +07:00
Andreas Fischer
c1cb59c237 Merge pull request #4349 from marc1706/ticket/14665 
[ticket/14665] Remove invalid syntax in report_id_auto_increment migration

* marc1706/ticket/14665:
  [ticket/14665] Remove invalid syntax in report_id_auto_increment migration
 2016-07-10 20:06:43 +02:00
rxu
652e3da28d [ticket/14703] Refine the parent module selection for custom extension modules 
PHPBB3-14703
 2016-07-10 21:47:04 +07:00
rxu
a3c10f575b [ticket/14703] Fix parent module selection for custom modules removal 
PHPBB3-14703
 2016-07-03 02:23:34 +07:00
rxu
2f53761eaf [ticket/14703] Fix parent module selection for custom extension modules 
PHPBB3-14703
 2016-07-03 01:31:42 +07:00
Tristan Darricau
7cbb049572
[prep-release-3.2.0-RC1] Add migration 2016-06-19 17:51:51 +02:00
Marc Alexander
a90d8fa8d4 [ticket/14665] Remove invalid syntax in report_id_auto_increment migration 
PHPBB3-14665
 2016-06-08 08:38:55 +02:00
Marc Alexander
6eda942a7f [ticket/14607] Add missing auto_increment to report_id 
PHPBB3-14607
 2016-05-01 17:29:10 +02:00
Tristan Darricau
829a8ac15a
Merge branch 'prep-release-3.2.0-b2' into 3.2.x 
* prep-release-3.2.0-b2:
  [prep-release-3.2.0-b2] Add schema.json
  [prep-release-3.2.0-b2] Add changelog for 3.2.0-b2
  [prep-release-3.2.0-b2] Add migration for 3.2.0-b2
  [prep-release-3.2.0-b2] Update version to 3.2.0-b2
 2016-04-28 21:58:16 +02:00
Joas Schilling
29bb1ab72d Merge branch '3.1.x' into 3.2.x 2016-04-16 12:50:31 +02:00
Joas Schilling
1b01667c7b [prep-release-3.1.9] Add migration for 3.1.9 2016-04-16 12:16:23 +02:00
Joas Schilling
d89b75bd36 Merge branch '3.1.x' into 3.2.x 2016-04-09 19:53:39 +02:00
Joas Schilling
5ee6c216e5 [prep-release-3.1.9] Add migration for 3.1.9-RC1 2016-04-09 08:13:31 +02:00
Tristan Darricau
8769e765a2 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14532] Do not escape column default in mssql
 2016-04-03 16:02:50 +02:00
Marc Alexander
48283d7c62 [ticket/14532] Do not escape column default in mssql 
The column default shouldn't be escaped for mssql. This is a regression
from 743d816631292a2081af4c5f7fc2fad2aff17c58. Prior to that commit, the
default value for the column was not escaped. Escaping it will cause SQL
errors while altering columns.

PHPBB3-14532
 2016-03-31 16:07:05 +02:00
Marc Alexander
c9ffef2c57 Merge branch '3.1.x' into 3.2.x 2016-03-31 12:30:14 +02:00
Matt Friedman
39de59e65f [ticket/14570] Use phpbb_version_compare 
PHPBB3-14570
 2016-03-29 10:01:03 -07:00
Matt Friedman
b8dd3ef43a [ticket/14570] Add effectively installed to 3.1.x versions 
PHPBB3-14570
 2016-03-29 09:54:22 -07:00
Tristan Darricau
a9b6a537c5 Merge pull request #4243 from marc1706/ticket/14136-3.2.x 
[ticket/14136] Add back X-UA-Compatible meta tag

* marc1706/ticket/14136-3.2.x:
  [ticket/14136] Add back X-UA-Compatible meta tag
 2016-03-24 18:00:42 +01:00
Marc Alexander
2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x 
Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
 2016-03-24 16:12:56 +01:00
Marc Alexander
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag 
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
 2016-03-24 16:07:07 +01:00
Jakub Senko
933938a1d8 [ticket/14318] Fix SQL error in Notifications Board migration 
PHPBB3-14318
 2016-03-18 11:04:01 +01:00
Marc Alexander
c00e45d30e Merge branch '3.1.x' into 3.2.x 2016-03-07 09:52:30 +01:00
Oliver Schramm
b77856a903 [ticket/14514] Don't skip users when converting passwords 
PHPBB3-14514
 2016-03-06 16:11:29 +01:00
Tristan Darricau
517c1f8825 [prep-release-3.2.0-b2] Add migration for 3.2.0-b2 2016-03-03 22:53:53 +01:00
Joas Schilling
ab6e0bbef9 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	build/build.xml
	phpBB/composer.lock
 2016-02-18 18:42:39 +01:00