Commit graph

10537 commits

Author SHA1 Message Date
Tristan Darricau
c3ceafb37d Merge branch '3.1.x'
* 3.1.x:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
2015-08-28 16:40:41 +02:00
Tristan Darricau
624f5ae921 Merge pull request #3835 from rxu/ticket/14106
[ticket/14106] Fix topics sorting in MCP for topics merging.

* rxu/ticket/14106:
  [ticket/14106] Fix topics sorting in MCP for topics merging.
2015-08-28 16:40:33 +02:00
Tristan Darricau
9e0a075be1 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14070] Properly pass whether config should be ignored for avatars
2015-08-28 16:28:59 +02:00
Tristan Darricau
90d18356a0 Merge pull request #3809 from marc1706/ticket/14070
[ticket/14070] Properly pass whether config should be ignored for avatars

* marc1706/ticket/14070:
  [ticket/14070] Properly pass whether config should be ignored for avatars
2015-08-28 16:27:05 +02:00
Máté Bartus
e8219e8610 Merge pull request #3470 from Nicofuma/ticket/13645
[ticket/13645] Move the feeds to controllers
2015-08-28 10:39:07 +02:00
Máté Bartus
6dc195e5a7 Merge pull request #3859 from Nicofuma/ticket/13897
[ticket/13897] Make dependency to the filesystem optional in error handler
2015-08-28 09:58:44 +02:00
Tristan Darricau
6af8c579e0 [ticket/13897] Make dependency to the filesystem optional in error handler
PHPBB3-13897
2015-08-25 21:44:40 +02:00
n-aleha
5cc6370cea [ticket/12505] Set deprecations for constants to 3.2
PHPBB3-12505
2015-08-24 00:40:38 +03:00
n-aleha
83f45bdac0 [ticket/12505] Remove outdated media extensions
Update constants and data schema for new installations.
Mark outdated media constants as deprecated.

PHPBB3-12505
2015-08-24 00:40:38 +03:00
n-aleha
c60b92bf61 [ticket/12505] Remove outdated media handling from acp
Remove outdated media handling from acp

PHPBB3-12505
2015-08-24 00:40:38 +03:00
n-aleha
626dfbdd86 [ticket/12505] Remove outdated media handing in attachments
Remove code for handling media in RealPlayer, QuickTime, and Windows Media
Player.

PHPBB3-12505
2015-08-24 00:27:42 +03:00
Tristan Darricau
f6a4843c6d Merge pull request #3652 from Elsensee/ticket/12143
[ticket/12143] Make it possible to use translated group names for non-special groups

* Elsensee/ticket/12143:
  [ticket/12143] Fix tests after rebase
  [ticket/12143] Avoid no output from get_group_name()
  [ticket/12143] Fix those tests
  [ticket/12143] Add some tests
  [ticket/12143] Oops, fixed array index
  [ticket/12143] Replace group name output
  [ticket/12143] Add group helper class to translate groupnames
  [ticket/12143] Add is_set method to language service
2015-08-23 22:42:18 +02:00
Nicofuma
8e5e954438 [ticket/13645] Move the feeds to controllers
PHPBB3-13645
2015-08-23 22:36:10 +02:00
Joas Schilling
335452b1c1 [3.1.x] Update version to 3.1.7-dev 2015-08-23 18:24:12 +02:00
Joas Schilling
819eca99a8 [prep-release-3.1.6] Update version to 3.1.6-RC1 2015-08-23 16:50:43 +02:00
Marc Alexander
c96c6877bf Merge branch '3.1.x'
Conflicts:
	phpBB/includes/ucp/ucp_activate.php
2015-08-22 10:41:46 +02:00
Marc Alexander
f585f48aca Merge pull request #3823 from lavigor/ticket/14087
[ticket/14087] Add an event to ucp_activate.php.
2015-08-22 10:40:33 +02:00
Marc Alexander
1a9bc8a7ad Merge branch '3.1.x'
Conflicts:
	phpBB/includes/message_parser.php
2015-08-22 08:51:09 +02:00
Marc Alexander
2d24b9b61f Merge pull request #3813 from rxu/ticket/14072
[ticket/14072] Add core event to the function format_display()
2015-08-22 08:49:21 +02:00
rxu
ec032733de [ticket/14106] Fix topics sorting in MCP for topics merging.
The "bug" in the deleted code comment is non-existent now.
The PR is for 3.1 only.

PHPBB3-14106
2015-08-16 19:55:00 +07:00
rxu
6b0f235cc9 [ticket/14102] Add core event to the mcp_topic.php
PHPBB3-14102
2015-08-15 18:38:25 +07:00
lavigor
1b1fc6ed24 [ticket/14087] Add an event to ucp_activate.php.
PHPBB3-14087
2015-08-09 23:35:06 +03:00
Marc Alexander
1956bd4bba Merge branch '3.1.x' 2015-08-09 10:31:43 +02:00
Marc Alexander
668defcf57 Merge pull request #3784 from Senky/ticket/14043
[ticket/14043] Add core.get_avatar_after php event
2015-08-09 10:31:37 +02:00
Marc Alexander
03c64d3384 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_forum.php
2015-08-09 10:15:02 +02:00
Marc Alexander
5f4943c183 Merge pull request #3760 from Zoddo/ticket/14014
[ticket/14014] Add core.mcp_forum_view_before event
2015-08-09 10:13:24 +02:00
Marc Alexander
46ffafd0c6 Merge branch '3.1.x' 2015-08-08 22:17:29 +02:00
Marc Alexander
3dcba7000b Merge pull request #3757 from Zoddo/ticket/14006
[ticket/14006] Add core.ucp_register_agreement event
2015-08-08 22:17:21 +02:00
Tristan Darricau
2260533d47 [ticket/14074] Fix mark notifications as read in the ucp
PHPBB3-14074
2015-08-07 16:14:40 +02:00
rxu
9e467a4e4a [ticket/14072] Add core event to the function format_display()
PHPBB3-14072
2015-08-06 03:51:48 +07:00
Oliver Schramm
c3e5185135 [ticket/12143] Avoid no output from get_group_name()
PHPBB3-12143
2015-08-05 17:50:26 +02:00
Oliver Schramm
d4095bb11d [ticket/12143] Oops, fixed array index
PHPBB3-12143
2015-08-05 17:50:25 +02:00
Oliver Schramm
185fbe41c9 [ticket/12143] Replace group name output
So now we can use translated group names for non-special groups

PHPBB3-12143
2015-08-05 17:50:24 +02:00
Marc Alexander
f4c1796d5e [ticket/14070] Properly pass whether config should be ignored for avatars
PHPBB3-14070
2015-08-05 17:46:17 +02:00
Jakub Senko
7cb7ca57c2 [ticket/14043] Add more parameters to the event
PHPBB3-14043
2015-08-02 20:27:05 +02:00
rxu
0d6c323611 [ticket/13846] Fix MCP to disallow softdeleted posts deletion if not permitted.
PHPBB3-13846
2015-07-30 19:35:01 +07:00
Tristan Darricau
a0258ae25c Merge pull request #3514 from CHItA/ticket/13740
[ticket/13740] Refactoring installer

* CHItA/ticket/13740: (75 commits)
  [ticket/13740] Reduce number of references in nav provider
  [ticket/13740] Move handle_language_select calls to the controllers
  [ticket/13740] Fix infinite config.php check loop
  [ticket/13740] Move default data settings out of constructors
  [ticket/13740] Deduplicate container builder's checks
  [ticket/13740] Use JSON for installer config
  [ticket/13740] Fix comment
  [ticket/13740] Use language service in console application
  [ticket/13740] Fix CS in compatibilty_globals.php
  [ticket/13740] Fix message element creation in JS
  [ticket/13740] Replace more spaces with tabs
  [ticket/13740] Fix CS
  [ticket/13740] Filter basic directory change attempts in lang change
  [ticket/13740] Use tabs instead of spaces in JS file
  [ticket/13740] Add success message when install finished
  [ticket/13740] Fix $script_path in obtain_data
  [ticket/13740] Fix is_phpbb_installed() method
  [ticket/13740] Login admin when install finished
  [ticket/13740] Enhance server output buffer bypass
  [ticket/13740] Secure installer config against corrupted config data
  ...
2015-07-27 11:24:43 +02:00
Mate Bartus
fc46dec813 [ticket/13740] Fix CS in compatibilty_globals.php
PHPBB3-13740
2015-07-24 17:36:04 +02:00
Jakub Senko
c6a654e859 [ticket/14043] Add dispatcher to globals, change @since value
PHPBB3-14043
2015-07-22 13:55:26 +02:00
Tristan Darricau
e1cbe73538 Merge pull request #3781 from Elsensee/ticket/8708-2
[ticket/8708] Add extra permission for posting global announcements

* Elsensee/ticket/8708-2:
  [ticket/8708] Apply permission 'f_announce_global'
  [ticket/8708] Add f_announce_global permission
2015-07-22 11:30:50 +02:00
Marc Alexander
8bfbd77828 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_profile.php
2015-07-22 10:38:35 +02:00
Marc Alexander
5da50fcf6e Merge pull request #3719 from javiexin/ticket/13911
[ticket/13911] Add events to configure options for profile fields
2015-07-22 10:37:16 +02:00
Marc Alexander
b635853479 Merge branch '3.1.x' 2015-07-22 10:30:58 +02:00
Marc Alexander
23aed66473 [ticket/13311] Remove whitespace at end of line
PHPBB3-13311
2015-07-22 09:54:28 +02:00
Marc Alexander
ce937346f3 [ticket/13311] Update @since to 3.1.6-RC1
PHPBB3-13311
2015-07-22 09:29:22 +02:00
alf007
e30c6caac8 [ticket/13311] Add core event on acp_forums for forum content deletes
Event added for the function delete_forum_content() in
includes/acp/acp_forums.php, so that you can insert any extension's table(s)
to be updated when forum content is deleted
Incude parameters forum_id, topic_ids and post_counts

PHPBB3-13311
2015-07-22 09:25:19 +02:00
Jakub Senko
5e3ebda0da [ticket/14043] Add core.get_avatar_after php event
PHPBB3-14043
2015-07-21 21:20:24 +02:00
Oliver Schramm
7d31232846 [ticket/8708] Apply permission 'f_announce_global'
PHPBB3-8708
2015-07-19 21:26:47 +02:00
Marc Alexander
39f3313534 Merge branch '3.1.x' 2015-07-17 16:15:25 +02:00
Marc Alexander
56251adc24 Merge pull request #3732 from kinerity/ticket/13974
[ticket/13974] Add core.mcp_change_poster_after event
2015-07-17 16:15:22 +02:00