1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00

27223 Commits

Author SHA1 Message Date
Marc Alexander
7d4bbeef3f Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/notification/type/bookmark.php
	phpBB/phpbb/notification/type/post.php
	phpBB/phpbb/notification/type/quote.php
2015-10-17 12:13:32 +02:00
Marc Alexander
3a5336452c Merge pull request #3985 from prototech/ticket/13892
[ticket/13892] Respect "Someone reports a post" notification setting.
2015-10-17 12:06:27 +02:00
Marc Alexander
3f4abbd5ce Merge branch '3.1.x' 2015-10-17 12:02:14 +02:00
Marc Alexander
6fba5613f8 Merge pull request #3987 from prototech/ticket/13945
[ticket/13945] Send reactivation requests to admins using notifications system.
2015-10-17 12:02:10 +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
Cesar G
aaca64e13e [ticket/13892] Replace other uses of self with static.
PHPBB3-13892
2015-10-15 02:39:55 -07:00
Cesar G
9de5668b80 [ticket/13892] Respect "Someone reports a post" notification setting.
report_post inherits from post_in_queue, therefore using self:: instead of
static:: results in the incorrect notification type being used to determine
which users to exclude from the notification.

PHPBB3-13892
2015-10-15 02:28:55 -07:00
Marc Alexander
2974353101 Merge branch '3.1.x' 2015-10-15 11:02:02 +02:00
Marc Alexander
bc6a4c4583 Merge pull request #3984 from prototech/ticket/12616
[ticket/12616] Remove report notifications when post is deleted/disapproved.
2015-10-15 11:01:59 +02:00
Marc Alexander
16ff320340 Merge pull request #3970 from prototech/ticket/13789
[ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
2015-10-15 08:59:34 +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
86d1b35a00 [ticket/13789] Update composer.lock.
PHPBB3-13789
2015-10-14 19:05:27 -07:00
Cesar G
90038e32cd [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
PHPBB3-13789
2015-10-14 19:05:27 -07:00
Cesar G
2781623185 Merge pull request #3982 from Nicofuma/ticket/13652
[ticket/13652] Fix coding style
2015-10-14 09:10:08 -07:00
Tristan Darricau
84150d0d44 [ticket/13652] Fix coding style
PHPBB3-13652
2015-10-14 17:15:09 +02:00
Tristan Darricau
d26fcdda8d Merge pull request #3981 from ErnadoO/ticket/14235
[ticket/14235] Font Awesome in simple_header.html

* ErnadoO/ticket/14235:
  [ticket/14235] Font Awesome in simple_header.html
2015-10-14 17:12:38 +02:00
Erwan Nader
7dec0a6707 [ticket/14235] Font Awesome in simple_header.html
PHPBB3-14235
2015-10-14 16:58:35 +02: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
9ac79453e1 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14192] Add core.memberlist_memberrow_before event
2015-10-14 16:36:52 +02:00
Tristan Darricau
f6776c1017 Merge pull request #3926 from Senky/ticket/14192
[ticket/14192] Add core.memberlist_memberrow_before event

* Senky/ticket/14192:
  [ticket/14192] Add core.memberlist_memberrow_before event
2015-10-14 16:35:24 +02:00
Tristan Darricau
df723c388a Merge branch '3.1.x'
* 3.1.x:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
2015-10-14 16:32:37 +02:00
Tristan Darricau
bab85da820 Merge pull request #3935 from Zoddo/ticket/10343
[ticket/10343] Allows a_user to show inactive accounts in memberlist

* Zoddo/ticket/10343:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
2015-10-14 16:32:33 +02:00
Tristan Darricau
1e36c6d16c Merge branch '3.1.x'
* 3.1.x:
  [ticket/13851] Fix ignore flood limit check
2015-10-14 16:27:02 +02:00
Tristan Darricau
bc11e648af Merge pull request #3978 from RMcGirr83/ticket_13851
[ticket/13851] Fix ignore flood limit check

* RMcGirr83/ticket_13851:
  [ticket/13851] Fix ignore flood limit check
2015-10-14 16:26:54 +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
Tristan Darricau
669618b5a0 Merge pull request #3979 from prototech/ticket/9153
[ticket/9153] Allow users without u_sendpm permission to delete existing PM's

* prototech/ticket/9153:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
2015-10-14 16:25:08 +02:00
Tristan Darricau
cd114a68e9 Merge pull request #3441 from brunoais/feature/sql-bool-builder
[feature/sql-bool-builder] Extending DBAL query builder for boolean generation

* brunoais/feature/sql-bool-builder:
  [feature/sql-bool-builder] Improved tests output to show the SQL error.
  [feature/sql-bool-builder] Adding the IS operator to predicted operators
  [feature/sql-bool-builder] test_single_not_like
  [feature/sql-bool-builder] test_single_like
  [feature/sql-bool-builder] test_single_not_in
  [feature/sql-bool-builder] test_single_in
  [feature/sql-bool-builder] test_and_of_or_of_and
  [feature/sql-bool-builder] test_triple_and_with_in
  [feature/sql-bool-builder] test_double_and_with_not_of_and
  [feature/sql-bool-builder] test_triple_and_with_is_null
  [feature/sql-bool-builder] Prepare testing class
  [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations
  [feature/sql-bool-builder] Explain better the code in the first
  [feature/sql-bool-builder] Also use parenthesis for the NOT operator
  [feature/sql-bool-builder] AS keyword must be lowercase;
  [feature/sql-bool-builder] Added code to use this feature for the WHERE clause
  [feature/sql-bool-builder] Removed non-necessary spaces
  [feature/sql-bool-builder] First working version
2015-10-14 16:18:46 +02:00
Máté Bartus
4682b5abdd Merge pull request #3980 from marc1706/ticket/10572
[ticket/10572] Remove excessive new line
2015-10-14 15:53:55 +02:00
Marc Alexander
bf72a27c5f [ticket/10572] Remove excessive new line
PHPBB3-10572
2015-10-14 15:50:15 +02:00
Cesar G
9ec8faff32 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13684] Prevent horizontal resize of attach comment textarea
2015-10-14 04:29:50 -07:00
Cesar G
50bf3411d4 Merge pull request #3959 from marc1706/ticket/13684
[ticket/13684] Prevent horizontal resize of attach comment textarea
2015-10-14 04:28:34 -07:00
Richard McGirr
a49a3091f9 [ticket/13851] Fix ignore flood limit check
PHPBB3-13851
2015-10-14 07:25:35 -04: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
Marc Alexander
57a2e63300 Merge branch '3.1.x'
Conflicts:
	.travis.yml
2015-10-14 12:04:58 +02:00
Marc Alexander
3367f0036a Merge pull request #3977 from Nicofuma/ticket/14236
[ticket/14236] Don't dump Opcache config in Travis
2015-10-14 12:04:12 +02:00
Tristan Darricau
69b57eab5e [ticket/14236] Don't dump Opcache config in Travis
PHPBB3-14236
2015-10-14 11:46:47 +02:00
Marc Alexander
6bcec956ba [ticket/13684] Prevent horizontal resize of attach comment textarea
PHPBB3-13684
2015-10-14 11:13:15 +02:00
Marc Alexander
fd0ddd6b76 Merge pull request #3974 from Nicofuma/ticket/14238
[ticket/14238] Updates Symfony
2015-10-14 10:57:00 +02:00
Marc Alexander
9ebbf2099b Merge branch '3.1.x'
Conflicts:
	.travis.yml
2015-10-14 10:42:57 +02:00
Marc Alexander
ccb3d0ac78 Merge pull request #3973 from Nicofuma/ticket/14236
[ticket/14236] Disable Opcache on Travis when running the tests
2015-10-14 10:41:06 +02:00
Tristan Darricau
83969053c0 [ticket/14238] Updates Symfony
PHPBB3-14238
2015-10-14 10:25:52 +02: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
6572164754 Merge pull request #3542 from RMcGirr83/ticket/10572
[ticket/10572] Unguarded includes in acp files

* RMcGirr83/ticket/10572:
  [ticket/10572] Unguarded includes in acp files
2015-10-14 10:09:36 +02:00
Tristan Darricau
345e8ad822 [ticket/14236] Disable Opcache on Travis when running the tests
PHPBB3-14236
2015-10-14 09:45:11 +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
Tristan Darricau
359ef56e35 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13835] Normalize filename for attachments uploaded in chunks.
2015-10-14 08:38:32 +02:00
Tristan Darricau
bdf69817be Merge pull request #3968 from prototech/ticket/13835
[ticket/13835] Normalize filename for attachments uploaded in chunks.

* prototech/ticket/13835:
  [ticket/13835] Normalize filename for attachments uploaded in chunks.
2015-10-14 08:38:15 +02:00
Andreas Fischer
a0f1365953 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14114] Update 3.0.x version references in INSTALL.html.
2015-10-14 08:33:36 +02:00