Commit graph

25179 commits

Author SHA1 Message Date
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
Richard McGirr
b74e811496 [ticket/14581] Add core events to content_visibility
Events added for both changing the content visibility for both posts and topics,
executing right before and after the SQL UPDATE query for setting the
visibillity.

https://tracker.phpbb.com/browse/PHPBB3-14581

PHPBB3-14581
2016-08-10 06:49:49 -04:00
JoshyPHP
260a0a29ad [ticket/14740] Added support for quoted attributes in BBCode definitions
PHPBB3-14740
2016-08-10 03:19:38 +02:00
David King
7e1e3e1a5e [ticket/14695] Add posting_editor_subject_append/prepend subsilver2 to events.md
As per request in PR.

PHPBB3-14695
2016-08-09 21:18:59 -04:00
David King
0771eaa732 [ticket/14695] Added posting_editor_subject_append/prepend events to subsilver
As per request in PR.

PHPBB3-14695
2016-08-09 21:16:33 -04:00
David King
1455be2260 [ticket/14695] Put posting_editor_subject_append/prepend events on newlines
As per request in the PR.

PHPBB3-14695
2016-08-09 21:14:03 -04: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
rxu
3bf64de247 [ticket/14738] Add core events to improve modifying forum lists
PHPBB3-14738
2016-08-07 16:10:49 +07:00
Máté Bartus
6eecc26e31 [ticket/14542] Move cron to controller
PHPBB3-14542
2016-08-05 22:50:54 +02:00
Máté Bartus
6ca10fc85a Merge branch '3.2.x' 2016-08-05 21:29:27 +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
e2207c65e7 Merge branch '3.2.x' 2016-08-05 20:18:54 +02:00
JoshyPHP
9225a0fdff [ticket/14734] Use SVG emoji
PHPBB3-14734
2016-08-05 16:27:13 +02:00
Marc Alexander
81f0d912b0 Merge branch '3.2.x' 2016-08-03 22:21:47 +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
94e6479c93 Merge branch '3.2.x' 2016-08-03 21:54:38 +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
Wesley Fok
3038bf5eaf [ticket/14638] Rollback changes from 3.2.x version
Mistakenly brought in the modified 3.2.x version verbatim instead of diffing
against the 3.1.x version of ucp_main.php. Removed any changes I didn't
explicitly make.

PHPBB3-14638
2016-08-03 13:27:06 -04:00
Wesley Fok
ba13832085 Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.x 2016-08-03 13:20:42 -04:00
Wesley Fok
2081a78095 [ticket/14638] New UCP hooks for subscriptions
Adds various event hooks to the Manage subscriptions page of the User
Control Panel. core.ucp_subscribed_post_data allows us to handle
additional post data from the form that unwatches subscriptions.
core.ucp_main_subscribed_forums_modify_query,
core.ucp_main_topiclist_count_modify_query and
core.ucp_main_topiclist_modify_query all modify the queries used to get
the list of subscribed forums and subscribed/bookmarked topics.
core.ucp_main_subscribed_forum_modify_template_vars and
core.ucp_main_topiclist_topic_modify_template_vars modify the template
variable array associated with each subscribed forum and topic row.

This is a backport to 3.1.x of the code in PR #4318.

PHPBB3-14638
2016-08-03 13:18:43 -04:00
Jakub Senko
37880af03c [ticket/10809] Reflect MSSQL removal in docs files
PHPBB3-10809
2016-08-02 12:07:10 +02:00
Jakub Senko
c64b8102b7 [ticket/10809] Remove MSSQL support
PHPBB3-10809
2016-08-02 12:06:06 +02:00
Marc Alexander
da15d435bf Merge branch '3.2.x' 2016-08-01 20:42:16 +02:00
Marc Alexander
3d4660a703 Merge branch '3.1.x' into 3.2.x 2016-08-01 20:42:13 +02:00
Oliver Schramm
f222f8a84a [ticket/14721] Avoid renaming deleted users
PHPBB3-14721
2016-08-01 00:26:47 +02:00
Erwan Nader
0cc41be3c0 [ticket/14727] Event core.search_modify_submit_parameters
PHPBB3-14727
2016-07-31 16:46:20 +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
46045eb9b0 Merge branch '3.2.x' 2016-07-30 23:23:00 +02: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
832722417a Merge pull request #4350 from marc1706/ticket/14670
[ticket/14670] Use symfony 3.x in master branch
2016-07-29 17:51:50 +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
Máté Bartus
54e5d41359 [ticket/14548] Move deprecated globals and functions
PHPBB3-14584
2016-07-29 17:48:00 +02:00
Andreas Fischer
ed2c8b5bf7 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
2016-07-29 09:41:51 +02:00
Andreas Fischer
0dc13c720c Merge branch '3.2.x'
* 3.2.x:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
2016-07-29 09:41:51 +02:00
Andreas Fischer
55223e6840 Merge pull request #4336 from Senky/ticket/14652
Fix typos in core.index_modify_birthdays_list vars descriptions

* Senky/ticket/14652:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
2016-07-29 09:41:50 +02:00
rxu
8e8e25cc1f [ticket/14703] Fix the docblock
PHPBB3-14703
2016-07-24 23:35:20 +07:00
Erwan Nader
e7289fa019 [ticket/14592] Fixed docblock from unit tests
PHPBB3-14592
2016-07-24 18:25:20 +02:00
Erwan Nader
5b501e594c [ticket/14592] Fixed syntax errors from unit tests
PHPBB3-14592
2016-07-24 18:10:45 +02:00
Erwan Nader
4eecc95a42 [ticket/14592] [PHP] core.search_backend_search_after
PHPBB3-14592
2016-07-24 17:46:23 +02: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
Marc Alexander
e1f9c946ef [ticket/14670] Modify service definition for RouterListener
PHPBB3-14670
2016-07-23 17:54:45 +02:00
Marc Alexander
59a228f7cd [ticket/14670] Use symfony 3.1 in master branch
Removed sami as it doesn't have a version compatible
with symfony 3.x.

PHPBB3-14670
2016-07-23 17:13:54 +02:00