1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-19 22:10:14 +02:00

10008 Commits

Author SHA1 Message Date
Oliver Schramm
fbb9f8859a Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_captcha.php
2015-11-06 13:28:24 +01:00
Oliver Schramm
854ee0b04d Merge pull request #3975 from prototech/ticket/11971
[ticket/11971] Validate "Spambot countermeasures" settings before saving
2015-11-06 12:06:47 +01:00
Tristan Darricau
c783c37c73 Merge pull request #3995 from CHItA/ticket/14044
[ticket/14044] Deduplicate the installers

* CHItA/ticket/14044:
  [ticket/14044] Add config as global in notify user
  [ticket/14044] Fix language selection data loss
  [ticket/14044] Patch language::set_fallback_array()
  [ticket/14044] Fix tests
  [ticket/14044] Fix wrong descriptions in install
  [ticket/14044] Solve missing email template error
  [ticket/14044] global $table_prefix in constants.php
  [ticket/14044] Try to fix missing table prefix
  [ticket/14044] Use the correct language file version
  [ticket/14044] Automatically trigger rollback on insert in transaction
  [ticket/14044] Use empty instead of !count
  [ticket/14044] Fix Sqlite error in tests
  [ticket/14044] Deduplicate the installers
2015-11-03 20:35:24 +01:00
Andreas Fischer
996886de17 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
2015-11-02 21:48:32 +01:00
Andreas Fischer
afbeda7cfd Merge pull request #3983 from prototech/ticket/13831
[ticket/13831] Store provided reason when deleting from Mod. Queue module.

* prototech/ticket/13831:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
2015-11-02 21:48:32 +01:00
Mate Bartus
33db26d0cf [ticket/14044] global $table_prefix in constants.php
PHPBB3-14044
2015-10-28 01:12:52 +01:00
Mate Bartus
597297b169 [ticket/14044] Deduplicate the installers
PHPBB3-14044
2015-10-22 21:29:52 +02:00
Cesar G
a246cb6414 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14249] Fix online list order
2015-10-22 10:05:25 -07:00
Oliver Schramm
93208d597a [ticket/14249] Fix online list order
PHPBB3-14249
2015-10-21 21:51:43 +02:00
Tristan Darricau
326ba5325b Merge branch '3.1.x'
* 3.1.x:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:37:06 +02:00
Tristan Darricau
dfd5ec6835 Merge pull request #3666 from marc1706/ticket/9252
[ticket/9252] Do not try to disapprove a post that was just approved

* marc1706/ticket/9252:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:36:51 +02:00
Marc Alexander
3f4abbd5ce Merge branch '3.1.x' 2015-10-17 12:02:14 +02:00
Cesar G
c7d7967a91 [ticket/13945] Send reactivation requests to admins using notifications system.
PHPBB3-13945
2015-10-15 22:26:14 -07:00
Marc Alexander
2974353101 Merge branch '3.1.x' 2015-10-15 11:02:02 +02:00
Cesar G
e634d2902d [ticket/12616] Remove report notifications when post is deleted/disapproved.
PHPBB3-12616
2015-10-14 22:50:50 -07:00
Cesar G
f657680311 [ticket/13831] Store provided reason when deleting from Mod. Queue module.
PHPBB3-13831
2015-10-14 19:41:44 -07:00
Tristan Darricau
886fb7c3f4 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14159] Hide version info on ACP if we don't have the permission
2015-10-14 16:56:44 +02:00
Tristan Darricau
240d07d0cf Merge pull request #3900 from Zoddo/ticket/14159
[ticket/14159] Hide version info on ACP if we don't have the permission

* Zoddo/ticket/14159:
  [ticket/14159] Hide version info on ACP if we don't have the permission
2015-10-14 16:40:06 +02:00
Tristan Darricau
e94f9d7830 Merge branch '3.1.x'
* 3.1.x:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
2015-10-14 16:25:15 +02:00
Marc Alexander
bf72a27c5f [ticket/10572] Remove excessive new line
PHPBB3-10572
2015-10-14 15:50:15 +02:00
Cesar G
5d8e900483 [ticket/11971] Validate "Spambot countermeasures" settings before saving.
PHPBB3-11971
2015-10-14 03:31:34 -07:00
Cesar G
fb3073029f [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the
error message within the UCP template. Otherwise it could be removed as
compose_pm() will check the appropriate permission pertaining to the attempted
action.

PHPBB3-9153
2015-10-14 03:09:06 -07:00
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
102d737d81 [ticket/14234] Fix event doc blocks
PHPBB3-14234
2015-10-12 22:20:52 +02:00
Marc Alexander
75e5e2471e [ticket/14234] Get rid of undefined variables
PHPBB3-14234
2015-10-12 21:56:09 +02: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
f3e2bd9273 [ticket/14234] Replace more references with variables
PHPBB3-14234
2015-10-12 18:50:14 +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
bb2634b5e5 [ticket/14168] Correctly state return type of upload and upload_attachment
PHPBB3-14168
2015-10-12 12:11:26 +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
Tristan Darricau
1baa8adfe3 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14212] Fix version number
  [ticket/14212] Adding event after users have been removed to a group
2015-10-12 10:27:13 +02:00
Tristan Darricau
e603fa56db Merge pull request #3944 from Wardormeur/ticket/14212
[ticket/14212] Adding event after users have been removed to a group

* Wardormeur/ticket/14212:
  [ticket/14212] Fix version number
  [ticket/14212] Adding event after users have been removed to a group
2015-10-12 10:27:13 +02:00
Tristan Darricau
ce45813e2c Merge branch '3.1.x'
* 3.1.x:
  [ticket/13591] Change SQL query into array to allow
2015-10-12 10:20:32 +02:00
Tristan Darricau
2668fa42ad Merge pull request #3946 from RMcGirr83/ticket_13591
[ticket/13591] Change SQL query into array to allow

* RMcGirr83/ticket_13591:
  [ticket/13591] Change SQL query into array to allow
2015-10-12 10:20:16 +02:00
Tristan Darricau
fcf797c3f2 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14200] Allow hidden users to see himself on viewonline
2015-10-12 09:20:13 +02:00
Tristan Darricau
5f8fb38b52 Merge pull request #3957 from Zoddo/ticket/14200
[ticket/14200] Allow hidden users to see himself on viewonline

* Zoddo/ticket/14200:
  [ticket/14200] Allow hidden users to see himself on viewonline
2015-10-12 09:19:24 +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
8c3fdfe4e1 Merge branch '3.1.x' 2015-10-11 10:48:53 +02:00
Marc Alexander
f6c8338358 Merge pull request #3864 from Zoddo/ticket/8920
[ticket/8920] Add a MCP PM reports view permission
2015-10-11 10:47:44 +02: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
8eb9ce50b0 [ticket/14200] Allow hidden users to see himself on viewonline
PHPBB3-14200
2015-10-10 16:33:40 +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
b2e7de0379 Merge branch '3.1.x' 2015-10-09 16:45:07 +02:00
Marc Alexander
8683824ed3 Merge pull request #3934 from Zoddo/ticket/14181
[ticket/14181] Fix empty denial reason if the reason isn't translated
2015-10-09 16:43:53 +02:00
Marc Alexander
b7238bca0e [ticket/14168] Fix CS issue
PHPBB3-14168
2015-10-09 10:18:40 +02:00