1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-26 21:21:32 +01:00
Commit Graph

25754 Commits

Author SHA1 Message Date
Oliver Schramm
0eb44fc934 [ticket/14746] Make msg_handler in installer independent from container
PHPBB3-14746
2016-08-19 19:23:52 +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
Jakub Senko
6260beb3f2 [ticket/14573] Add Whoisonline breadcrumbs
PHPBB3-14573
2016-08-15 18:12:20 +02:00
Jakub Senko
51a744fda5 [ticket/14573] Add Memberlist breadcrumbs
PHPBB3-14573
2016-08-15 18:09:23 +02:00
Jakub Senko
10e7c88877 [ticket/14573] Add MCP breadcrumbs
PHPBB3-14573
2016-08-15 17:35:32 +02:00
Jakub Senko
5292f9c091 [ticket/14573] Add UCP breadcrumbs
PHPBB3-14573
2016-08-15 17:34:33 +02:00
Jakub Senko
fc0714721e [ticket/14573] Add Search breadcrumbs
PHPBB3-14573
2016-08-15 17:25:22 +02:00
Jakub Senko
3870b221d6 [ticket/14573] Add FAQ breadcrumbs
PHPBB3-14573
2016-08-15 17:20:20 +02:00
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
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
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