Marc Alexander
6e6a2c5df8
Merge pull request #4488 from senky/ticket/14825
...
Add core.auth_oauth_login_after and core.auth_oauth_link_after
2016-11-13 21:27:51 +01:00
Jakub Senko
df0388ccc5
[ticket/14825] Add core.auth_oauth_(login/link)_after
...
PHPBB3-14825
2016-11-13 18:19:21 +01:00
Jakub Senko
260dc5ed7c
[ticket/14863] Properly treat plural rules in confirmation box title
...
PHPBB3-14863
2016-11-13 17:21:41 +01:00
Jakub Senko
f8fb3e0f9f
[ticket/14864] Set maxlength=64 to dateformat in ACP
...
PHPBB3-14864
2016-11-13 15:12:23 +01:00
Marc Alexander
fa9182c133
Merge branch '3.2.x'
2016-11-12 19:41:20 +01:00
Marc Alexander
9c7e8c2dc5
Merge branch '3.1.x' into 3.2.x
2016-11-12 19:41:10 +01:00
Marc Alexander
372324cead
Merge pull request #4504 from VSEphpbb/ticket/14855
...
[ticket/14855] Update notification and PM alert bubbles
2016-11-12 19:30:34 +01:00
Marc Alexander
ccf06c25a5
Merge branch '3.2.x'
2016-11-12 19:27:12 +01:00
Marc Alexander
2319748c08
Merge branch '3.1.x' into 3.2.x
2016-11-12 19:27:09 +01:00
Marc Alexander
39f5b82bc3
Merge pull request #4505 from JimMH/patch-1
...
[ticket/14859] Send notifications for PM reports to all users with correct permissions
2016-11-12 19:27:06 +01:00
Matt Friedman
55f7438187
[ticket/14855] Bump font size to 10px
...
PHPBB3-14855
2016-11-12 09:32:57 -08:00
Marc Alexander
221a8beb07
Merge branch '3.2.x'
2016-11-12 17:14:42 +01:00
Marc Alexander
4a1e5df654
Merge branch '3.1.x' into 3.2.x
2016-11-12 17:14:39 +01:00
Marc Alexander
c77798b1a3
Merge pull request #4496 from senky/ticket/14848
...
[ticket/14848] Add acp_ext_list_disabled/enabled_title_after
2016-11-12 17:14:35 +01:00
Marc Alexander
5451c7fea9
Merge branch '3.2.x'
2016-11-12 17:10:39 +01:00
Marc Alexander
ef77852aff
Merge branch '3.1.x' into 3.2.x
2016-11-12 17:10:14 +01:00
Marc Alexander
221cd3eb68
Merge pull request #4495 from senky/ticket/14847
...
[ticket/14847] Add core.acp_attachments_config_edit_add
2016-11-12 17:08:28 +01:00
Marc Alexander
90cd9fc18f
Merge branch '3.2.x'
2016-11-12 16:17:34 +01:00
Marc Alexander
728335820c
Merge branch '3.1.x' into 3.2.x
2016-11-12 16:17:31 +01:00
Marc Alexander
bc4c82bae5
Merge pull request #4481 from senky/ticket/14819
...
[ticket/14819] Hide soft-deleted posts in topic review
2016-11-12 16:17:27 +01:00
Marc Alexander
577fb0c39c
Merge branch '3.2.x'
2016-11-12 13:55:53 +01:00
Marc Alexander
78db28286e
Merge branch '3.1.x' into 3.2.x
2016-11-12 13:54:59 +01:00
Marc Alexander
577d669ba7
Merge pull request #4472 from dsinn/ticket/14804
...
[ticket/14804] Add core event to MCP after merging topics
2016-11-12 13:53:24 +01:00
Marc Alexander
0759b591fb
Merge branch '3.2.x'
2016-11-12 13:47:46 +01:00
Marc Alexander
dd561ec275
Merge branch '3.1.x' into 3.2.x
2016-11-12 13:47:42 +01:00
Marc Alexander
a298ed1a66
Merge pull request #4507 from nickvergessen/ticket-14788
...
[ticket/14788] Farewell my friendz
2016-11-12 13:47:39 +01:00
Marc Alexander
6b6b740dcb
Merge branch '3.2.x'
2016-11-12 13:44:36 +01:00
Marc Alexander
8d3d396f1b
Merge branch '3.1.x' into 3.2.x
2016-11-12 13:44:32 +01:00
Marc Alexander
43ea7168d1
Merge pull request #4506 from lavigor/ticket/14860
...
[ticket/14860] Broken link on subscriptions page on mobile devices
2016-11-12 13:44:29 +01:00
Joas Schilling
c9ea560c63
[ticket/14788] Farewell
...
PHPBB3-14788
2016-11-12 12:12:01 +01:00
Matt Friedman
0fd04f2e6f
[ticket/14855] CSS updates
...
PHPBB3-14855
2016-11-11 16:38:46 -08:00
Matt Friedman
74285b4308
[ticket/14855] Update CSS
...
PHPBB3-14855
2016-11-11 09:32:25 -08:00
lavigor
cdf6464382
[ticket/14860] Broken link on subscriptions page on mobile devices
...
PHPBB3-14860
2016-11-08 16:50:53 +03:00
Jim Mossing Holsteyn
4533dd9fa0
[ticket/14859] Notifications for PM reports send to users with correct permissions
...
Tracker ticket (set the ticket ID to your ticket ID):
https://tracker.phpbb.com/browse/PHPBB3-14859
This addresses the problem that notifications of new PM reports were not sent out to moderators that weren't global moderators but did have the permission "Can close/delete PM reports".
PHPBB3-14859
2016-11-07 16:06:50 +01:00
Matt Friedman
9b1e2e523c
[ticket/14855] Update the comments
...
PHPBB3-14855
2016-11-06 16:12:39 -08:00
Matt Friedman
0e114f91f4
[ticket/14855] Remove notification bubble on mark all read
...
PHPBB3-14855
2016-11-06 10:00:50 -08:00
Tristan Darricau
3364a54f39
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14795] Use maximum topic views instead of adding up views in merge
2016-11-06 15:47:56 +01:00
Tristan Darricau
50f5efba9c
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14795] Use maximum topic views instead of adding up views in merge
2016-11-06 15:47:49 +01:00
Tristan Darricau
9be9062df3
Merge pull request #4485 from marc1706/ticket/14795
...
[ticket/14795] Use maximum topic views instead of adding up views in merge
* github.com:phpbb/phpbb:
[ticket/14795] Use maximum topic views instead of adding up views in merge
2016-11-06 15:47:20 +01:00
Tristan Darricau
79dd364b9c
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/11483] Add tests for generating user act key on force reactivate
[ticket/11483] Generate user act key if database entry is empty
2016-11-06 15:42:05 +01:00
Tristan Darricau
cd348b200a
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/11483] Add tests for generating user act key on force reactivate
[ticket/11483] Generate user act key if database entry is empty
2016-11-06 15:41:59 +01:00
Tristan Darricau
dc32b900c5
Merge pull request #4486 from marc1706/ticket/11483
...
[ticket/11483] Generate user act key if database entry is empty
* github.com:phpbb/phpbb:
[ticket/11483] Add tests for generating user act key on force reactivate
[ticket/11483] Generate user act key if database entry is empty
2016-11-06 15:41:46 +01:00
Marc Alexander
ac36cc25eb
[ticket/11483] Add tests for generating user act key on force reactivate
...
PHPBB3-11483
2016-11-06 11:58:31 +01:00
Matt Friedman
af2bf4ef36
[ticket/14855] Update notification functional test
...
PHPBB3-14855
2016-11-05 19:41:08 -07:00
Matt Friedman
87209fdd06
[ticket/14855] Fix responsive alert bubble CSS
...
PHPBB3-14855
2016-11-05 16:29:13 -07:00
Matt Friedman
c259a9b387
[ticket/14855] Update notification and PM alert bubbles
...
PHPBB3-14855
2016-11-05 16:15:50 -07:00
Marc Alexander
0cb72ed6c5
Merge branch '3.2.x'
2016-11-05 21:36:27 +01:00
Marc Alexander
ecb81894cc
Merge remote-tracking branch 'nicofuma/ticket/14814' into 3.2.x
2016-11-05 21:35:06 +01:00
rxu
ad4fe1799f
[ticket/14853] Add core event to allow modifying PM attachments download auth
...
PHPBB3-14853
2016-11-04 18:42:49 +07:00
rxu
6984f17f62
[ticket/14852] Add core event to modify email headers
...
PHPBB3-14852
2016-11-04 18:23:09 +07:00
