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

28698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
34b3e4b8e2 Merge branch '3.2.x' 2016-08-21 19:04:20 +02:00
Marc Alexander
f814840568 Merge pull request #4416 from Elsensee/ticket/14746 
[ticket/14746] Make msg_handler in installer independent from container
 2016-08-21 19:04:17 +02:00
Marc Alexander
229816ebe8 Merge branch '3.2.x' 2016-08-21 18:57:37 +02:00
Marc Alexander
43762950bc Merge pull request #4418 from Elsensee/ticket/14636 
[ticket/14636] Restore BC with compatibility functions
 2016-08-21 18:57:33 +02:00
Oliver Schramm
cd2649273b [ticket/14636] Inject into set_config methods 
PHPBB3-13573
PHPBB3-14636
 2016-08-21 13:14:54 +02:00
Marc Alexander
c3681a259c Merge branch '3.2.x' 2016-08-21 10:07:40 +02:00
Marc Alexander
cd0ffc5de6 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	.travis.yml
 2016-08-21 10:07:19 +02:00
Marc Alexander
a36f96aefa Merge pull request #4415 from Elsensee/ticket/14743 
[ticket/14743] Remove PHP7 from travis tests in 3.1.x
 2016-08-21 10:06:41 +02:00
Marc Alexander
8783ede6e0 Merge branch '3.2.x' 2016-08-21 09:51:28 +02:00
Marc Alexander
06bfae8edb Merge branch '3.1.x' into 3.2.x 2016-08-21 09:51:26 +02:00
Marc Alexander
b14043b276 Merge pull request #4411 from Senky/ticket/12925 
[ticket/12925] Pluralize permanent delete checkbox label
 2016-08-21 09:51:23 +02:00
Marc Alexander
f10d68c07e Merge branch '3.2.x' 2016-08-21 09:45:02 +02:00
Marc Alexander
f054ab972d Merge branch '3.1.x' into 3.2.x 2016-08-21 09:44:37 +02:00
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
Marc Alexander
6bcc372af5 Merge pull request #4419 from Elsensee/ticket/14742 
[ticket/14742] Further improvements to migrator
 2016-08-21 09:24:19 +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
Oliver Schramm
e4671c1521 [ticket/14636] Restore BC with request_var 
PHPBB3-14636
 2016-08-20 03:30:17 +02:00
Oliver Schramm
0eb44fc934 [ticket/14746] Make msg_handler in installer independent from container 
PHPBB3-14746
 2016-08-19 19:23:52 +02:00
Oliver Schramm
bb11294b96 [ticket/14743] Remove PHP7 from travis tests 
PHPBB3-14743
 2016-08-17 17:57:48 +02:00
Marc Alexander
dc2777e769 Merge branch '3.2.x' 2016-08-16 21:02:56 +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
9dbe47ba8e Merge branch '3.2.x' 2016-08-16 20:49:36 +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
Jakub Senko
c016e09ca4 [ticket/12925] Pluralize permanent delete checkbox label 
PHPBB3-12925
 2016-08-15 18:27:33 +02:00
Marc Alexander
0df1d39c1f Merge branch '3.2.x' 2016-08-13 23:14:11 +02: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