Commit graph

2062 commits

Author SHA1 Message Date
Tristan Darricau
e0fb680dbb Merge branch '3.1.x'
* 3.1.x:
  [ticket/10572] Unguarded includes in acp files
2015-10-14 10:17:04 +02:00
Tristan Darricau
1d6e173259 Merge pull request #3965 from marc1706/ticket/14234
[ticket/14234] Use replacement variables instead of references in events

* marc1706/ticket/14234:
  [ticket/14234] Fix event doc blocks
  [ticket/14234] Get rid of undefined variables
  [ticket/14234] Fix change version and remove more references
  [ticket/14234] Replace more references with variables
  [ticket/14234] Use replacement variables instead of references in events
2015-10-14 08:59:17 +02:00
Tristan Darricau
cac090b659 Merge pull request #3913 from marc1706/ticket/14168
[ticket/14168] Refactor attachment management functions into classes

* marc1706/ticket/14168: (36 commits)
  [ticket/14168] Correctly state return type of upload and upload_attachment
  [ticket/14168] Use attachment manager instead of separate classes
  [ticket/14168] Fix docblock in manager
  [ticket/14168] Add more test cases for attachment manager
  [ticket/14168] Add new test method and more tests
  [ticket/14168] Fix tabs in manager and add test file
  [ticket/14168] Fix tests after rebase
  [ticket/14168] Add attachment manager service
  [ticket/14168] Use correct docblock
  [ticket/14168] Add services_attachment.yml to services.yml
  [ticket/14168] Minor coding style fixes
  [ticket/14168] Move attachment service definitions to services_attachment
  [ticket/14168] Improve code coverage in upload class
  [ticket/14168] Move image check and don't use trigger_error()
  [ticket/14168] Add tests for init_error() during upload
  [ticket/14168] Add basic test file for attachments upload
  [ticket/14168] Fix CS issue
  [ticket/14168] No longer use deprecated functions in core files
  [ticket/14168] Move phpbb_unlink() into attachment delete class
  [ticket/14168] Reset sequence before tests in delete tests
  ...
2015-10-14 08:40:01 +02:00
Richard McGirr
d003b53922 [ticket/10572] Unguarded includes in acp files
PHPBB3-10572
2015-10-13 11:52:52 -04:00
Marc Alexander
578ee077c1 [ticket/14234] Fix change version and remove more references
PHPBB3-14234
2015-10-12 19:41:17 +02:00
Marc Alexander
f90b16df0d [ticket/14234] Use replacement variables instead of references in events
PHPBB3-14234
2015-10-12 18:39:29 +02:00
Marc Alexander
49312f05f8 [ticket/14168] Use attachment manager instead of separate classes
PHPBB3-14168
2015-10-12 11:34:11 +02:00
Tristan Darricau
16e731d735 Merge remote-tracking branch 'upstream/3.1.x'
* upstream/3.1.x:
  [ticket/14188] Add core.acp_styles_action_before event
2015-10-12 11:18:14 +02:00
Tristan Darricau
d9a4146113 Merge pull request #3922 from Senky/ticket/14188
[ticket/14188] Add core.acp_styles_action_before event

* Senky/ticket/14188:
  [ticket/14188] Add core.acp_styles_action_before event
2015-10-12 11:06:46 +02:00
Cesar G
0a93db705b [ticket/13993] Do not parse signatures as posts when editing them.
The implementation of PHPBB3-12516 changed the manual use of the message parser
to using generate_text_for_storage(). The function does not support
parse_message::parse()'s mode parameter, thus all the error checks on the sig
are invalid.

PHPBB3-13993
2015-10-11 15:46:43 -07:00
Marc Alexander
d1b7101fed Merge pull request #3896 from Zoddo/ticket/14157
[ticket/14157] Allow to set the alt/title attribute on post icons
2015-10-10 16:43:15 +02:00
Zoddo
3937f1f4ae [ticket/14157] Allow to set the alt/title attribute on post icons
PHPBB3-14157
2015-10-10 15:29:31 +02:00
Marc Alexander
98ebbbdca2 [ticket/14168] No longer use deprecated functions in core files
PHPBB3-14168
2015-10-09 10:18:40 +02:00
Tristan Darricau
0c0e43e110 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14219] Add email to inactive user listing
2015-10-08 15:49:45 +02:00
Tristan Darricau
7a60cdd1d3 Merge pull request #3951 from RMcGirr83/ticket_14219
[ticket/14219] Add email to inactive user listing

* RMcGirr83/ticket_14219:
  [ticket/14219] Add email to inactive user listing
2015-10-08 15:49:39 +02:00
Tristan Darricau
6e90311550 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13960] Profile field validation breaks ACP
2015-10-08 15:42:55 +02:00
Tristan Darricau
542498e457 Merge pull request #3724 from javiexin/ticket/13960
[ticket/13960] Profile field validation breaks ACP

* javiexin/ticket/13960:
  [ticket/13960] Profile field validation breaks ACP
2015-10-08 15:42:33 +02:00
Richard McGirr
4830b3eacd [ticket/14219] Add email to inactive user listing
in ACP.  May help in spotting spam accounts quickly

PHPBB3-14219
2015-10-08 06:10:49 -04:00
Marc Alexander
a679380f09 [ticket/14222] Use request class instead of request_var in acp_users
PHPBB3-14222
2015-10-08 10:52:00 +02:00
Marc Alexander
b13393078c Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_users.php
2015-10-07 16:55:57 +02:00
Marc Alexander
cf62b303a6 Merge pull request #3440 from CHItA/ticket/13636
[ticket/13636] Deleting inactive user in acp_users gives unexpected link
2015-10-07 16:54:50 +02:00
Marc Alexander
3c448f889f Merge pull request #3871 from Zoddo/ticket/10165
[ticket/10165] Add a "Send test email" feature
2015-10-07 15:08:08 +02:00
Tristan Darricau
f3dc2a801d [ticket/14205] Bump PHP requirement to PHP 5.4
PHPBB3-14205
2015-10-04 16:19:48 +02:00
Jakub Senko
20c0b57421 [ticket/14188] Add core.acp_styles_action_before event
PHPBB3-14188
2015-09-23 11:26:35 +02:00
Tristan Darricau
087e219a09 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14154] Add extension composer name as tooltip
2015-09-16 11:58:53 +02:00
Zoddo
a4a99f5ea3 [ticket/14154] Add extension composer name as tooltip
PHPBB3-14154
2015-09-12 14:52:31 +02:00
Zoddo
57cb7e4111 [ticket/10165] Add a "Send test email" feature
PHPBB3-10165
2015-09-09 17:51:14 +02:00
Tristan Darricau
5b8164a1bb Merge branch '3.1.x'
* 3.1.x:
  [ticket/13950] Hide undefined categories
  [ticket/13950] Hide undefined permissions
2015-09-01 21:47:19 +02:00
Zoddo
af246483e2 [ticket/13950] Hide undefined categories
This hides the categories added by disabled extensions

PHPBB3-13950
2015-08-28 18:56:10 +02:00
Zoddo
11b2bffa8e [ticket/13950] Hide undefined permissions
This hides the permissions of the disabled extensions

PHPBB3-13950
2015-08-28 18:43:59 +02: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
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
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
Nicofuma
be0d4e20d4 [ticket/11444] Moving the in-board notifications to a method class
Currently the in-board method for the notifications is hardcoded and
cannot be disabled. This method should be in his own class extending
`phpbb\notification\method\method_interface`.

It also add the possibility, for each method, to be enabled by default (ie:
no entry in the DB => notification enabled).

https://tracker.phpbb.com/browse/PHPBB3-11444
https://tracker.phpbb.com/browse/PHPBB3-11967

PHPBB3-11444
2015-07-13 22:41:13 +02:00
javiexin
d0cf674f33 [ticket/13911] Add events to configure options for profile fields
Adds core events to includes/acp/acp_profile.php and template events
to adm/style/acp_profile.html to support adding configuration options
to profile fields. Fixed version number again.

PHPBB3-13911
2015-06-27 12:45:56 +02:00
Tristan Darricau
6bcf12a558 Merge pull request #3618 from marc1706/ticket/13832
[ticket/13832] Use preg_replace_callback instead of /e modifier
2015-06-24 16:36:15 +02:00
javiexin
bd40f2f619 [ticket/13960] Profile field validation breaks ACP
Make sure new step is calculated only if no error has been identified
during validation.  Also, cleanup redundant code in acp_profile.php.

PHPBB3-13960
2015-06-23 11:02:08 +02:00
Tristan Darricau
ceed27fe27 Merge pull request #3661 from marc1706/ticket/6466
[ticket/6466] Use jQuery and custom dropdown for permission roles tooltips
2015-06-17 10:07:12 +02:00
Joas Schilling
7bb617eeb6 Merge branch 'prep-release-3.1.5' into 3.1.x 2015-06-11 23:24:02 +02:00
Joas Schilling
a3883a6f23 Merge branch '3.1.x'
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-06-11 21:00:04 +02:00
Joas Schilling
3d18d6dc77 [ticket/13823] Move the part of the query, so the update will get it correctly
PHPBB3-13823
2015-06-09 23:11:26 +02:00
Andreas Fischer
1f4976f590 Merge pull request #3696 from marc1706/ticket/13930-master
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930-master:
  [ticket/13930] Add missing space to mssql_extractor
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
2015-06-09 21:27:23 +02:00
Andreas Fischer
c952622fa0 Merge pull request #3694 from marc1706/ticket/13930
[ticket/13930] Check for correct spacing between keyword & parenthesis

* marc1706/ticket/13930:
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset
  [ticket/13930] Remove not needed return statements
  [ticket/13930] Add missing spaces to code
  [ticket/13930] Check for correct spacing between keyword & parenthesis
2015-06-09 21:27:07 +02:00
Marc Alexander
b2ada8ba09 Merge branch '3.1.x'
Conflicts:
	phpBB/includes/mcp/mcp_main.php
2015-06-09 15:24:08 +02:00