Tristan Darricau
d81afd4af1
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/13558] Change options prefix and add settings precautions.
[ticket/13558] Make SSL context specific options more SMTP general
[ticket/13558] Add smtp SSL context configuration options
2017-03-19 18:10:46 +01:00
Tristan Darricau
552da2e805
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/13558] Change options prefix and add settings precautions.
[ticket/13558] Make SSL context specific options more SMTP general
[ticket/13558] Add smtp SSL context configuration options
2017-03-19 18:07:14 +01:00
Tristan Darricau
0b2369901a
Merge pull request #4745 from rxu/ticket/13558
...
[ticket/13558] Add smtp SSL context configuration options
* rxu/ticket/13558:
[ticket/13558] Change options prefix and add settings precautions.
[ticket/13558] Make SSL context specific options more SMTP general
[ticket/13558] Add smtp SSL context configuration options
2017-03-19 18:04:53 +01:00
Tristan Darricau
b8e9b0e934
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14844] Add CSS classes for strong and italics text to BBCodes
2017-03-19 18:02:02 +01:00
Tristan Darricau
67509edd40
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14844] Add CSS classes for strong and italics text to BBCodes
2017-03-19 18:00:35 +01:00
Tristan Darricau
d114a3d415
Merge pull request #4749 from marc1706/ticket/14844
...
[ticket/14844] Add CSS classes for strong and italics text to BBCodes
* marc1706/ticket/14844:
[ticket/14844] Add CSS classes for strong and italics text to BBCodes
2017-03-19 18:00:31 +01:00
Marc Alexander
644182398f
Merge pull request #4704 from hanakin/ticket/14095
...
[ticket/14095] Pure CSS loader...No Image
2017-03-19 17:27:47 +01:00
Marc Alexander
0dc61deb77
Merge branch '3.2.x'
2017-03-19 16:01:42 +01:00
Marc Alexander
e497937dd4
Merge branch '3.1.x' into 3.2.x
2017-03-19 16:01:37 +01:00
Marc Alexander
948ce2d84f
Merge pull request #4578 from javiexin/ticket/14849
...
[ticket/14849] Add core.acp_extensions_run_action
2017-03-19 16:01:33 +01:00
Marc Alexander
adc2ea3f0c
Merge branch '3.2.x'
2017-03-19 15:53:27 +01:00
Marc Alexander
9958a68c57
Merge branch '3.1.x' into 3.2.x
2017-03-19 15:53:08 +01:00
Marc Alexander
59396771e6
Merge pull request #4703 from javiexin/ticket/15011
...
[ticket/15011] All errors on metadata throw exceptions
2017-03-19 15:49:33 +01:00
Marc Alexander
051644d663
[ticket/14844] Add CSS classes for strong and italics text to BBCodes
...
PHPBB3-14844
2017-03-19 15:35:51 +01:00
Marc Alexander
218466b40e
Merge branch '3.2.x'
2017-03-19 15:28:26 +01:00
Marc Alexander
45ae23628e
Merge pull request #4742 from JoshyPHP/ticket/15126
...
[ticket/15126] Disable HTML entities in quote helper
2017-03-19 15:28:22 +01:00
rxu
22b8632426
[ticket/13558] Change options prefix and add settings precautions.
...
PHPBB3-13558
2017-03-19 14:32:53 +07:00
Marc Alexander
811a58377e
Merge branch '3.2.x'
2017-03-19 00:11:41 +01:00
Marc Alexander
d35262089d
Merge pull request #4738 from rxu/ticket/15124
...
[ticket/15124] Hide navbar icon titles in repsonsive view
2017-03-19 00:11:37 +01:00
Marc Alexander
02c584636f
Merge branch '3.2.x'
2017-03-19 00:07:30 +01:00
Marc Alexander
25d5f94d19
Merge pull request #4695 from marc1706/ticket/15083
...
[ticket/15083] Fix invalid emoji sizing in ACP & print view
2017-03-19 00:04:48 +01:00
Marc Alexander
6676aefa36
Merge branch '3.2.x'
2017-03-19 00:01:38 +01:00
Marc Alexander
e4d253ce76
Merge branch '3.1.x' into 3.2.x
2017-03-19 00:01:34 +01:00
Marc Alexander
0f95e607ff
Merge pull request #4743 from rubencm/ticket/14820
...
[ticket/14820] Add style version in ACP
2017-03-19 00:01:30 +01:00
Marc Alexander
7c59f084a6
Merge pull request #3937 from hanakin/ticket/14204
...
[ticket/14204]Fix form buttons to use consistent button codebase
2017-03-18 14:35:38 +01:00
rxu
2cc9b6a857
[ticket/13558] Make SSL context specific options more SMTP general
...
PHPBB3-13558
2017-03-18 01:11:32 +07:00
rxu
ac87784a11
[ticket/13558] Add smtp SSL context configuration options
...
PHPBB3-13558
2017-03-17 01:21:57 +07:00
Rubén Calvo
d10a5b67a1
[ticket/14820] Add style version in ACP
...
PHPBB3-14820
2017-03-16 00:00:50 +01:00
JoshyPHP
d3eb85dd5d
[ticket/15126] Disable HTML entities in quote helper
...
PHPBB3-15126
2017-03-15 02:36:20 +01:00
rxu
20a3801cf2
[ticket/15124] Hide navbar icon titles in repsonsive view
...
PHPBB3-15124
2017-03-13 00:29:00 +07:00
Oliver Schramm
b4478676b5
Merge pull request #4731 from Rishabh04-02/ticket/15120
...
[ticket/15120] Semicolon missing
2017-03-11 01:03:56 +01:00
Rishabh04-02
e077bd70a4
[ticket/15120] Semicolon missing
...
PHPBB3-15120
2017-03-10 11:00:46 +05:30
Marc Alexander
1eb364b8d3
Merge pull request #4627 from hanakin/ticket/14981
...
[ticket/14981] Update nomalize.css to v5.0
2017-03-09 22:22:03 +01:00
Marc Alexander
f7a58e0a6a
Merge branch '3.2.x'
2017-03-09 22:11:59 +01:00
Marc Alexander
5d597787eb
Merge pull request #4729 from vinny/ticket/15118
...
[ticket/15118] Fix html error in jumpbox.html
2017-03-09 22:11:55 +01:00
Vinny
6071a5b8aa
[ticket/15118] Fix html error in jumpbox.html
...
PHPBB3-15118
2017-03-09 14:34:42 -03:00
Marc Alexander
a96f55ec15
Merge branch 'ticket/14970'
2017-03-08 21:45:52 +01:00
Marc Alexander
f36eb932a4
[ticket/15083] Add stylelint exceptions for admin.css
...
PHPBB3-15083
2017-03-08 21:36:27 +01:00
Marc Alexander
18641e822e
Merge branch '3.2.x'
2017-03-08 21:29:20 +01:00
Marc Alexander
3e9f12d12d
Merge pull request #4696 from marc1706/ticket/14979
...
[ticket/14979] Do not display underline for unread icon
2017-03-08 21:29:16 +01:00
Marc Alexander
173ca21ca1
Merge branch '3.2.x'
2017-03-08 21:27:15 +01:00
Marc Alexander
1edb0bd173
Merge pull request #4700 from DavidIQ/ticket/15089
...
[ticket/15089] Reverse the order of cookie secure radio buttons
2017-03-08 21:27:11 +01:00
Marc Alexander
6ce33c2e69
Merge branch '3.2.x'
2017-03-08 21:24:51 +01:00
Marc Alexander
013c9ad9ef
Merge pull request #4702 from JimMH/patch-3
...
[ticket/15092] Correct database update instructions
2017-03-08 21:24:47 +01:00
Marc Alexander
8921c3a3b8
Merge branch '3.2.x'
2017-03-08 21:21:21 +01:00
Marc Alexander
f319b93dc3
Merge pull request #4713 from DavidIQ/ticket/15106
...
[ticket/15106] Remove space before comma in sub-forum list
2017-03-08 21:21:16 +01:00
Marc Alexander
37ee22a0e6
Merge branch '3.2.x'
2017-03-08 21:09:40 +01:00
Marc Alexander
e0d31d8897
Merge pull request #4714 from vinny/ticket/14732
...
[ticket/14732] Remove PHP Code syntax highlighting references
2017-03-08 21:07:47 +01:00
Marc Alexander
0097a575ec
[ticket/14970] Also run stylelint against admin css
...
PHPBB3-14970
2017-03-08 20:59:16 +01:00
Vinny
51a55cee5d
[ticket/14732] Remove references from tests
...
PHPBB3-14732
2017-02-28 05:59:22 -03:00