Marc Alexander
76748183bb
Merge pull request #4420 from Elsensee/ticket/14742-32x
...
[ticket/14742-32x] Further improvements to migrator
2016-08-21 09:44:37 +02:00
Oliver Schramm
a37f10ae09
[ticket/14742] Increase user feedback by improving progress bar
...
We now count and display each step that was done
by increasing the task count.
PHPBB3-14742
2016-08-20 22:40:37 +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
Marc Alexander
723d9d8e4c
Merge branch '3.1.x' into 3.2.x
2016-08-16 21:02:52 +02:00
Marc Alexander
488fd8f54c
Merge pull request #4413 from wesleyfok/ticket/14745
...
[ticket/14745] Removed unneeded HTML ampersand
2016-08-16 21:02:06 +02:00
Marc Alexander
c044a41d07
Merge pull request #4404 from JoshyPHP/ticket/14740
...
[ticket/14740] Added support for quoted attributes in BBCode definitions
2016-08-16 20:49:31 +02:00
Wesley Fok
f68e98c064
[ticket/14745] Removed unneeded HTML ampersand
...
Changed the HTML ampersand entity in U_NOTIFICATION_SETTINGS into a bare
ampersand character.
PHPBB3-14745
2016-08-15 15:20:23 -04:00
Marc Alexander
bc823a18be
Merge branch '3.1.x' into 3.2.x
2016-08-13 23:13:41 +02:00
Marc Alexander
4466ef1bc4
Merge pull request #4410 from Elsensee/ticket/14742-32x
...
[ticket/14742-32x] Improvements to migrator
2016-08-13 23:13:07 +02:00
Marc Alexander
48696b5148
Merge pull request #4409 from Elsensee/ticket/14742
...
[ticket/14742] Improvements to migrator
2016-08-13 22:57:40 +02:00
Oliver Schramm
758fe20f4b
[ticket/14742] Further improve progress bar in db updater
...
PHPBB3-14742
2016-08-12 15:23:27 +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
c12d67cd90
[ticket/14742] Add test for (not) reverting if
...
PHPBB3-14742
2016-08-11 18:11:39 +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
2ee8bd0c4a
[ticket/14742] Add test for reverse_update_data()
...
PHPBB3-14742
2016-08-11 01:12:43 +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
JoshyPHP
260a0a29ad
[ticket/14740] Added support for quoted attributes in BBCode definitions
...
PHPBB3-14740
2016-08-10 03:19:38 +02:00
Máté Bartus
55f98d0941
Merge pull request #4402 from marc1706/ticket/14735
...
[ticket/14735] Update composer dependencies to latest versions
2016-08-05 21:20:17 +02:00
Marc Alexander
f04685200b
[ticket/14735] Add php nightly to travis build config
...
PHPBB3-14735
2016-08-05 20:35:15 +02:00
Marc Alexander
dd01de03bf
[ticket/14735] Update composer dependencies to latest versions
...
This will update Symfony to 2.8.9, fast-image-size to 1.1.1, and
text-formatter to 0.6.1.
PHPBB3-14735
2016-08-05 20:26:58 +02:00
Marc Alexander
801183a99b
Merge pull request #4401 from JoshyPHP/ticket/14734
...
[ticket/14734] Use SVG emoji
2016-08-05 20:18:50 +02:00
JoshyPHP
9225a0fdff
[ticket/14734] Use SVG emoji
...
PHPBB3-14734
2016-08-05 16:27:13 +02:00
Marc Alexander
c9ada4d201
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
build/build.xml
2016-08-04 20:45:42 +02:00
Marc Alexander
2dae36e3fb
Merge pull request #4400 from Elsensee/ticket/14731
...
[ticket/14731] Skip composer when exporting old versions
2016-08-04 20:44:33 +02:00
Oliver Schramm
6fd507f60d
[ticket/14731] Skip composer when exporting old versions
...
PHPBB3-14731
2016-08-04 04:29:01 +02:00
Marc Alexander
6cc4d78ebf
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/styles/subsilver2/template/memberlist_email.html
2016-08-03 22:21:25 +02:00
Marc Alexander
5330ea0f09
Merge pull request #4324 from Senky/ticket/14516
...
[ticket/14516] Add memberlist_email_before event
2016-08-03 22:20:48 +02:00
Marc Alexander
55123bc94c
Merge pull request #4399 from wesleyfok/ticket/14729
...
[ticket/14729] Make reports take config base class
2016-08-03 21:53:35 +02:00
Wesley Fok
8a9cf32b1d
[ticket/14729] Make reports take config base class
...
Make the report controller and helper classes accept the more generic
phpbb/config/config base class in their constructors, instead of the
specific database implementation phpbb/config/db.
PHPBB3-14729
2016-08-03 13:42:36 -04:00
Marc Alexander
3d4660a703
Merge branch '3.1.x' into 3.2.x
2016-08-01 20:42:13 +02:00
Marc Alexander
f68820762b
Merge pull request #4397 from Elsensee/ticket/14721
...
[ticket/14721] Avoid renaming deleted users
2016-08-01 20:42:09 +02:00
Oliver Schramm
f222f8a84a
[ticket/14721] Avoid renaming deleted users
...
PHPBB3-14721
2016-08-01 00:26:47 +02:00
Marc Alexander
bd1d734dcc
Merge branch '3.1.x' into 3.2.x
...
Conflicts:
phpBB/install/install_install.php
phpBB/language/en/install.php
2016-07-31 15:38:50 +02:00
Marc Alexander
4ac2547d62
Merge pull request #4301 from 3D-I/PHPBB3-14596
...
[ticket/14596] Deny installation of Ascraeus under PHP 7
2016-07-31 15:18:35 +02:00
Oliver Schramm
69d2bad929
Merge pull request #4395 from CHItA/ticket/14633
...
[ticket/14633] Check for XML extension support on install
2016-07-30 23:04:44 +02:00