Marc Alexander
58a7ac9b5b
Merge branch '3.2.x'
2016-12-02 11:27:00 +01:00
Marc Alexander
3ad13ebd88
Merge pull request #4547 from VSEphpbb/ticket/14883
...
[ticket/14883] Do not display empty forum rules (after they've been re-parsed)
2016-12-02 11:26:57 +01:00
Matt Friedman
bad9943208
[ticket/14883] Remove extra tabbage
...
PHPBB3-14883
2016-12-01 08:10:08 -08:00
Matt Friedman
2fcc1b4d18
[ticket/14883] Refactor forum rules logic
...
PHPBB3-14883
2016-12-01 08:09:21 -08:00
Marc Alexander
2019d750c4
Merge branch '3.2.x'
2016-12-01 13:23:11 +01:00
Marc Alexander
7671c971e4
Merge pull request #4542 from JoshyPHP/ticket/14873
...
[ticket/14873] Added width/height attributes to smilies
2016-12-01 13:23:07 +01:00
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
Marc Alexander
365489a317
Merge pull request #4548 from nicebb/ticket/13757
...
[ticket/13757] Prevents the count of unread PMs from being negative
2016-12-01 11:41:17 +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
Matt Friedman
0881bbbb64
[ticket/14883] Do not display empty forum rules (after reparsing)
...
PHPBB3-14883
2016-11-30 11:26:15 -08: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
JoshyPHP
88c921be23
[ticket/14873] Added width/height attributes to smilies
...
PHPBB3-14873
2016-11-27 13:30:15 +01:00
Marc Alexander
79bc8752ea
Merge branch '3.2.x'
2016-11-26 16:41:34 +01:00
Marc Alexander
9432662c37
Merge branch '3.1.x' into 3.2.x
2016-11-26 16:41:31 +01:00
Marc Alexander
997bdc7778
Merge pull request #4540 from nicebb/ticket/14876
...
[ticket/14876] Allows multibyte strings for exception messages
2016-11-26 16:41:27 +01:00
Victor A. Safronov
390a37492d
[ticket/14876] Allows multibyte strings for exception messages
...
All exception messages are sanitized via type_caster::set_var()
which is called with $multibyte = false.
This commit allows to pass multibyte messages as well.
PHPBB3-14876
2016-11-25 19:56:41 +04:00
Tristan Darricau
fd6de052ef
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14867] Revert back to twig 1.26.* and update dependencies
2016-11-24 14:23:24 +01:00
Tristan Darricau
145ba85d98
Merge pull request #4516 from marc1706/ticket/14867
...
[ticket/14867] Revert back to twig 1.26.* and update dependencies
* marc1706/ticket/14867:
[ticket/14867] Revert back to twig 1.26.* and update dependencies
2016-11-24 14:18:41 +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
Tristan Darricau
ce1f5eeffd
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14750] Remove html5 invalid attributes from attachment file input
2016-11-24 14:15:32 +01:00
Tristan Darricau
592ef2eff4
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14750] Remove html5 invalid attributes from attachment file input
2016-11-24 14:15:12 +01:00
Tristan Darricau
16620ea3d2
Merge pull request #4483 from marc1706/ticket/14750
...
[ticket/14750] Remove html5 invalid attributes from attachment file input
* marc1706/ticket/14750:
[ticket/14750] Remove html5 invalid attributes from attachment file input
2016-11-24 14:12:13 +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
Marc Alexander
6d58c4a4b5
Merge branch 'ticket/14850' into 3.1.x
2016-11-20 12:57:17 +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
7aba483d61
Merge branch '3.2.x'
2016-11-20 09:46:37 +01:00
Marc Alexander
8f19d16b2a
Merge branch '3.1.x' into 3.2.x
2016-11-20 09:46:32 +01:00
Marc Alexander
16c3b40b4e
Merge pull request #4519 from michaelcullum/ticket/14872
...
[ticket/14872] Remove sizeof/count restriction
2016-11-20 09:46:27 +01:00
Michael Cullum
ad4889be4b
[ticket/14872] Remove sizeof/count restriction
...
PHPBB3-14872
2016-11-19 22:11:09 -05: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
