1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 18:41:52 +02:00
Commit Graph

3069 Commits

Author SHA1 Message Date
Marc Alexander
0df1d39c1f Merge branch '3.2.x' 2016-08-13 23:14:11 +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
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
Marc Alexander
c8bdd0a67c Merge pull request #4232 from CHItA/ticket/14542
[ticket/14542] Move cron to controller
2016-08-08 09:44:52 +02:00
Máté Bartus
8c137a5658 [ticket/14542] Add missing dockblocks
PHPBB3-14542
2016-08-07 22:03:21 +02:00
Marc Alexander
5acb831f19 Merge pull request #4282 from CHItA/ticket/14584
[ticket/14548] Move deprecated globals and functions
2016-08-07 21:02:17 +02:00
Máté Bartus
6eecc26e31 [ticket/14542] Move cron to controller
PHPBB3-14542
2016-08-05 22:50:54 +02:00
JoshyPHP
9225a0fdff [ticket/14734] Use SVG emoji
PHPBB3-14734
2016-08-05 16:27:13 +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
Máté Bartus
61a147546d [ticket/14633] Check for XML extension support on install
PHPBB3-14633
2016-07-30 13:04:39 +02:00
Máté Bartus
e9f28ea22c [ticket/14584] Change all to be removed tags to 4.0
PHPBB3-14584
2016-07-29 17:48:26 +02:00
JoshyPHP
13a756bfb7 [ticket/14700] Prevent an exception on duplicate smilies in text_formatter
PHPBB3-14700
2016-07-21 03:40:01 +02:00
Marc Alexander
486ffa85a2 Merge pull request #4344 from Senky/ticket2/14586
[ticket/14586] Add OAuth1 support
2016-07-20 20:25:01 +02:00
Marc Alexander
e7ce7ecbe7 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/config/feed.yml
	phpBB/feed.php
	phpBB/phpbb/feed/base.php
2016-07-17 22:09:53 +02:00
Marc Alexander
befacabf7e Merge pull request #4365 from rxu/ticket/14688
[ticket/14688] Add core events to the feeds
2016-07-17 21:32:20 +02:00
rxu
3df9b2c8f8 [ticket/14688] Add core events to the feeds
PHPBB3-14688
2016-07-17 21:14:13 +07:00
Marc Alexander
f2a1fbadbc Merge branch '3.1.x' into 3.2.x 2016-07-17 15:57:28 +02:00
Marc Alexander
e8454e018d Merge pull request #4378 from Crizz0/ticket/14704
[ticket/14704] Removes unused function and language files in base.php
2016-07-17 15:57:21 +02:00
Marc Alexander
44303aa425 Merge branch '3.1.x' into 3.2.x 2016-07-17 10:46:51 +02:00
Marc Alexander
63db42522b Merge pull request #4321 from Senky/ticket/14615
[ticket/14615] Fix HTML5 validation errors on avatar deletion
2016-07-17 10:46:44 +02:00
Marc Alexander
ebdef04f5d Merge pull request #4380 from JoshyPHP/ticket/14706
[ticket/14706] Updated [list] BBCode to automatically create a list item
2016-07-14 20:18:24 +02:00
Marc Alexander
61bca182f6 Merge branch '3.1.x' into 3.2.x 2016-07-14 20:11:51 +02:00
Marc Alexander
38082c41e3 Merge pull request #4347 from Senky/ticket/14631
[ticket/14631] Load truncate_string() if needed
2016-07-14 20:11:48 +02: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
JoshyPHP
24da2db987 [ticket/14706] Updated [list] BBCode to automatically create a list item
Fixes issues with missing list items. Produces valid HTML.

PHPBB3-14706
2016-07-08 07:49:10 +02:00
Marc Alexander
45ba2e9770 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
2016-07-07 19:19:40 +02:00
Crizzo
53b9216c78 [ticket/14704] Removes unused function and language files in base.php
PHPBB3-14704
2016-07-03 14:22:08 +02:00
Tristan Darricau
7cbb049572 [prep-release-3.2.0-RC1] Add migration 2016-06-19 17:51:51 +02:00
Marc Alexander
cf2b96def7 Merge pull request #4346 from lavigor/ticket/14661
[ticket/14661] Fix a typo in twig.php
2016-06-08 20:47:14 +02:00
Marc Alexander
a9beed3ad0 Merge branch '3.1.x' into 3.2.x 2016-06-08 20:32:28 +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
lavigor
b2141fd1a8 [ticket/14664] Fix PHPDoc comment in cron manager
PHPBB3-14664
2016-06-07 23:40:31 +03:00
Jakub Senko
4cf666f0bc [ticket/14631] Load truncate_string() if needed
PHPBB3-14631
2016-06-07 19:39:15 +02:00
lavigor
ff8b5058e0 [ticket/14661] Fix a typo in twig.php
PHPBB3-14661
2016-06-05 13:40:40 +03:00
Jakub Senko
33d1d19f97 [ticket/14586] Add OAuth1 support
PHPBB3-14586
2016-05-30 13:02:49 +02:00
Marc Alexander
80db259ab9 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/phpbb/notification/manager.php
2016-05-27 22:13:35 +02:00
Jakub Senko
c103c42857 [ticket/11446] Make get_notification_type_ids work with string too
PHPBB3-11446
2016-05-27 12:59:30 +02:00
Mark Shaw
548357e14c [ticket/14648] Remove whitespace at the end of a line
PHPBB3-14648
2016-05-25 18:28:07 -04:00