1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

650 Commits

Author SHA1 Message Date
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
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
Joas Schilling
9745d8d80e Add migration for 3.1.8 2016-02-18 18:04:47 +01:00
Joas Schilling
8663edce76 Merge branch '3.1.x' into 3.2.x
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2016-02-13 18:08:01 +01:00
Joas Schilling
a1a84c9930 [prep-release-3.1.8] Add migration for 3.1.8-RC1 2016-02-13 14:55:24 +01:00
Tristan Darricau
c9e5d308f2 Merge pull request #4159 from marc1706/ticket/14448
[ticket/14448] Use guzzle for remote files uploading

* marc1706/ticket/14448:
  [ticket/14448] Correctly pass verify setting if available
  [ticket/14448] Let user decide if remote upload certs should be checked
  [ticket/14448] Add new vendor files and dirs to clean task
  [ticket/14448] Do not try to test remote upload timeout
  [ticket/14448] Remove no longer needed guzzle 3.9.3
  [ticket/14448] Use GuzzleHttp and try to verify certs
  [ticket/14448] Update composer.json and lock file for guzzlehttp
  [ticket/14431] Remote avatar uploading
  [ticket/14431] Remote avatar uploading
2016-02-11 22:16:10 +01:00
Oliver Schramm
da08a6e3cb [ticket/14461] Correctly count up $processed_records
PHPBB3-14461
2016-02-06 14:45:20 +01:00
Tristan Darricau
b40f9ce6e1 [ticket/14453] Add missing dependency in the text_reparser migration
PHPBB3-14453
2016-02-05 15:56:28 +01:00
Tristan Darricau
379634a102 [prep-release-3.2.0-b1] Add migration for 3.2.0-b1 2016-02-05 15:56:28 +01:00
Marc Alexander
fd9c05309d [ticket/14448] Let user decide if remote upload certs should be checked
Also fixed some minor issues like coding style.

PHPBB3-14448
2016-02-04 17:14:48 +01:00
Tristan Darricau
8e100f000e Merge pull request #4144 from VSEphpbb/ticket/14434
[ticket/14434] Allow non-migration files inside migrations folder (continued)

* VSEphpbb/ticket/14434:
  [ticket/14434] Refactored to check migrations when setting them
  [ticket/14434] Check migrations in the database updater task
  [ticket/14434] Do not include non-migrations in CLI list
  [ticket/14434] Remove redundant conditional
  [ticket/14434] Fix whitespace mistakes
  [ticket/14434] Remove recursion to simplify is_migration method
  [ticket/14434] Extract migration check to a reusable method
  [ticket/14434] Schema generator should ignore migration helpers
2016-02-02 13:12:25 +01:00
Matt Friedman
27027deb9c [ticket/14434] Refactored to check migrations when setting them
PHPBB3-14434
2016-01-28 12:17:35 -08:00
Matt Friedman
996441a1da [ticket/14434] Remove redundant conditional
PHPBB3-14434
2016-01-27 12:24:18 -08:00
Matt Friedman
3bd8a2ba19 [ticket/14434] Remove recursion to simplify is_migration method
PHPBB3-14434
2016-01-27 11:46:04 -08:00
Matt Friedman
47d8aeebde [ticket/14434] Extract migration check to a reusable method
PHPBB3-14434
2016-01-27 10:50:22 -08:00
Marc Alexander
daa92f7996 [ticket/14436] Add dependency on oauth_states migration
PHPBB3-14436
2016-01-27 16:51:34 +01:00
Matt Friedman
7d2a58e271 [ticket/14434] Schema generator should ignore migration helpers
PHPBB3-14434
2016-01-26 11:45:06 -08:00
Tristan Darricau
b7db2717b2 Merge pull request #4126 from marc1706/ticket/13733
[ticket/13733] Allow non-migration files inside migrations folder

* marc1706/ticket/13733:
  [ticket/13733] Remove validate_classes method argument
  [ticket/13733] Make sure migration classes always have same order in tests
  [ticket/13733] Properly test setting validate_classes to false/true
  [ticket/13733] Use interface for migratinos
  [ticket/13733] Update comment explaining migration class validation
  [ticket/13733] Add isInstantiable() check.
  [ticket/13733] Braces on their own lines
  [ticket/13733] Allow tests the skip class validation
  [ticket/13733] Properly handle nonexistent classes as well
  [ticket/13733] Handle nonexistent classes as well
  [ticket/13733] Only use migration classes that extension the base migration class.
2016-01-25 09:08:23 +01:00
Tristan Darricau
39c9baa574 Merge pull request #4121 from marc1706/ticket/11875
[ticket/11875] Use 4-byte integer instead of 3-byte integer for ID columns

* marc1706/ticket/11875:
  [ticket/11875] Add back new line
  [ticket/11875] Change more columns to use UINT and add missings ones
  [ticket/11875] Add migration file
  [ticket/11875] Recreate schemas for install
  [ticket/11875] Create new map for UNSIGNED 4-byte integer
  [ticket/11875] Upgrade default data type from MEDIUMINT to INT
2016-01-18 23:29:41 +01:00
Marc Alexander
e954b0b82b [ticket/13733] Use interface for migratinos
PHPBB3-13733
2016-01-18 14:54:54 +01:00
Marc Alexander
a30ecb81f8 Merge branch '3.1.x' 2016-01-17 23:28:33 +01:00
Marc Alexander
0c34641abd Merge pull request #3718 from javiexin/ticket/13908
[ticket/13908] "After" clause in migration not working
2016-01-17 23:28:29 +01:00
Marc Alexander
7cd7bb3c01 [ticket/11875] Change more columns to use UINT and add missings ones
PHPBB3-11875
2016-01-13 19:35:04 +01:00
Marc Alexander
31607771e1 [ticket/11875] Add migration file
PHPBB3-11875
2016-01-13 17:02:42 +01:00
Marc Alexander
192a5f19f4 Merge pull request #2064 from hjpotter92/ticket/11875
[ticket/11875] Set default data type from MEDIUMINT (3byte) to INT(10) (4byte)

Conflicts:
	phpBB/includes/db/schema_data.php
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/phpbb/db/tools/tools.php
2016-01-13 13:21:08 +01:00
Joas Schilling
7f7b09fdeb Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php
2016-01-09 18:45:32 +01:00
Joas Schilling
fd5e66cbf1 Merge branch 'prep-release-3.1.7' into 3.1.x
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
2016-01-09 18:42:07 +01:00
Tristan Darricau
b2324607ad Merge pull request #4058 from marc1706/ticket/13454
[ticket/13454] Remove unused variables, globals, and parameters

* marc1706/ticket/13454:
  [ticket/13454] Add excessively removed code back
  [ticket/13454] Remove more unused variables
  [ticket/13454] Remove double semi-colons
  [ticket/13454] Remove unused variables
  [ticket/13454] Fix code sniffer complaints
  [ticket/13454] Fix a few issues introduced by overdeleting stuff
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
2016-01-09 17:53:04 +01:00
Joas Schilling
29a239a4db [prep-release-3.1.7] Add migration for 3.1.7-pl1 2016-01-09 09:35:53 +01:00
Oliver Schramm
f6524f4902 Merge branch '3.1.x' 2016-01-08 18:22:40 +01:00
Marc Alexander
9fe8d05d5b [ticket/14396] Use VCHAR_UNI and correct depends_on() version
PHPBB3-14396
2016-01-08 16:55:40 +01:00
Marc Alexander
0028ed3e95 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2016-01-08 16:39:33 +01:00
Saeed Hubaishan
a339b9e84f [ticket/13180] Increase dateformat field size
remove empty line as marc1706 guided

PHPBB3-13180
2016-01-07 20:03:35 +01:00
Saeed Hubaishan
678ca5dcdc [ticket/13180] Increase dateformat field size
[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
2016-01-07 17:36:02 +01:00
Marc Alexander
73900d1857 [ticket/13454] Remove more unused variables
This should be the last part. Off to checking if the changes were correct.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
7a6a16e3a5 [ticket/13454] Remove unused variables
This is part 5 and there is more to come.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
266576c6a4 [ticket/13454] Remove unused variables
Part 4

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
f50ba9ab4f [ticket/13454] Remove unused variables
This is part 2 of the pr.

PHPBB3-13454
2016-01-06 13:52:11 +01:00
Marc Alexander
73e6e5b77f [ticket/13454] Remove unused variables
This is the first part of the changes. More to come.

PHPBB3-13454
2016-01-06 13:51:19 +01:00
Oliver Schramm
8ed59fb82a [ticket/14250] Change token_storage class to fit changed interface
PHPBB3-14250
2016-01-04 03:38:28 +01:00
Tristan Darricau
8daeb6962a [prep-release-3.2.0-a2] Add migration for 3.2.0-a2 2015-12-19 17:17:01 +01:00
Joas Schilling
9a814e21aa Merge branch '3.1.x'
Conflicts:
	build/build.xml
2015-12-19 14:23:12 +01:00
Joas Schilling
e3acdfed92 [prep-release-3.1.7] Add migration to update the version 2015-12-19 12:21:25 +01:00
Joas Schilling
b2a26ab5f4 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-12-12 15:24:29 +01:00
Joas Schilling
69cf32613d [prep-release-3.1.7] Add migration for 3.1.7-RC1 2015-12-12 01:35:05 +01:00