Marc Alexander
ece91e92c3
Merge branch '3.2.x'
2016-12-01 11:41:25 +01:00
Marc Alexander
1c567daf39
Merge branch '3.1.x' into 3.2.x
2016-12-01 11:41:21 +01:00
Victor A. Safronov
10753454bf
[ticket/13757] Prevents the count of unread PMs from being negative
...
Sometimes the user_unread_privmsg flag in users table can become negative.
It happens when the unread message is requested by simultaneous concurrent
requests. Both requests will decrement the value of the flag.
This commit prevents updating the flag if the message already marked as read.
PHPBB3-13757
2016-11-30 23:59:36 +04:00
Marc Alexander
08209af201
Merge branch '3.2.x'
2016-11-27 20:49:25 +01:00
Marc Alexander
d894472866
Merge branch '3.1.x' into 3.2.x
2016-11-27 20:49:22 +01:00
Marc Alexander
a3faf1fefc
Merge pull request #4503 from rxu/ticket/14853
...
[ticket/14853] Add core event to allow modifying PM attachments download auth
2016-11-27 20:49:19 +01:00
Marc Alexander
7fb6d3e414
Merge branch '3.2.x'
2016-11-27 20:45:14 +01:00
Marc Alexander
0e8a573a71
Merge branch '3.1.x' into 3.2.x
2016-11-27 20:45:12 +01:00
Marc Alexander
642bfe9a39
Merge pull request #4512 from senky/ticket/14863
...
[ticket/14863] Properly treat plural rules in confirmation box title
2016-11-27 20:45:08 +01:00
Tristan Darricau
28ef544521
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/9211] Use different icon for link subforum in forum legend
2016-11-24 14:16:40 +01:00
Tristan Darricau
3e1f9c4201
Merge pull request #4508 from marc1706/ticket/9211
...
[ticket/9211] Use different icon for link subforum in forum legend
* marc1706/ticket/9211:
[ticket/9211] Use different icon for link subforum in forum legend
2016-11-24 14:16:37 +01:00
Marc Alexander
8b5806c002
Merge branch '3.2.x'
2016-11-20 15:23:23 +01:00
Marc Alexander
453d9113f1
Merge branch '3.1.x' into 3.2.x
2016-11-20 15:23:20 +01:00
Marc Alexander
dbd9c1f242
Merge pull request #4502 from rxu/ticket/14852
...
[ticket/14852] Add core event to modify email headers
2016-11-20 15:23:16 +01:00
Marc Alexander
dcd8540f3c
Merge branch '3.2.x'
2016-11-20 13:18:34 +01:00
Marc Alexander
c3108d44ce
Merge branch '3.1.x' into 3.2.x
2016-11-20 13:18:31 +01:00
Marc Alexander
d98fd7868b
Merge pull request #4511 from senky/ticket/14842
...
[ticket/14842] Don't display filesize limit if there is none
2016-11-20 13:18:27 +01:00
Marc Alexander
5474aec55f
Merge branch '3.2.x'
2016-11-20 12:58:04 +01:00
Marc Alexander
20771271ca
Merge branch '3.1.x' into 3.2.x
2016-11-20 12:57:31 +01:00
Jmz
0d15a95f97
[ticket/14850] Add core.generate_smilies_before
...
Allows changing root_path of smilies to use CDN for example
PHPBB3-14850
2016-11-20 12:56:12 +01:00
Jmz
6bbc18fa40
[ticket/14850] Add core.smiley_text_root_path
...
Allows changing root_path of smilies to use CDN for example
PHPBB3-14850
2016-11-20 12:56:11 +01:00
Marc Alexander
82960414f7
Merge branch '3.2.x'
2016-11-17 09:56:59 +01:00
Marc Alexander
9343317121
Merge remote-tracking branch 'senky/ticket/14739' into 3.2.x
2016-11-17 09:56:51 +01:00
Marc Alexander
32667f6290
Merge branch '3.2.x'
2016-11-16 21:57:49 +01:00
Marc Alexander
c6bed98cf5
Merge branch '3.1.x' into 3.2.x
2016-11-16 21:57:10 +01:00
Marc Alexander
34ebbbc7c3
Merge pull request #4497 from senky/ticket/14849
...
[ticket/14849] Add core.acp_extensions_run_action
2016-11-16 21:56:15 +01:00
Marc Alexander
d5a6ae7290
Merge branch '3.2.x'
2016-11-16 21:53:33 +01:00
Marc Alexander
4844370c26
Merge branch '3.1.x' into 3.2.x
2016-11-16 21:53:30 +01:00
Marc Alexander
1ff01d722a
Merge pull request #4510 from senky/ticket/14864
...
[ticket/14864] Set maxlength=64 to dateformat in ACP
2016-11-16 21:53:27 +01:00
Marc Alexander
5a82061c3a
[ticket/9211] Use different icon for link subforum in forum legend
...
PHPBB3-9211
2016-11-16 21:51:58 +01:00
Jakub Senko
e974f338af
[ticket/14739] Remove SQLite 2.8.x database driver
...
PHPBB3-14739
2016-11-16 17:59:28 +01:00
Jakub Senko
ba5243ba76
[ticket/14842] Don't display filesize limit if there is none
...
PHPBB3-14842
2016-11-15 14:22:42 +01:00
Jakub Senko
b80b624551
[ticket/14849] Add core.acp_extensions_run_action
...
PHPBB3-14849
2016-11-13 22:34:28 +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
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
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
