makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
29039 commits 18 branches 192 tags 207 MiB
Commit graph

29039 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jakub Senko
317f3e848f [ticket/14469] Add viewforum_body_topicrow_before template event 
PHPBB3-14469
 2016-08-11 10:25:51 +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
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
447f094871 [ticket/14542] Fix tests 
PHPBB3-14542
 2016-08-05 23:03:35 +02: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
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
e2207c65e7 Merge branch '3.2.x' 2016-08-05 20:18:54 +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
d74e85ffd9 Merge branch '3.2.x' 2016-08-04 20:47:33 +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
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
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
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
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
d51c67440e [ticket/14484] Properly enable extensions in UI tests 
PHPBB3-14484
 2016-07-31 20:08:58 +02:00