Commit graph

30575 commits

Author SHA1 Message Date
Tristan Darricau
9c49aebfe9
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14974] make cookie notice configurable via language files
2017-03-19 18:11:43 +01:00
Tristan Darricau
224330f3a5
Merge pull request #4740 from rubencm/ticket/14974
[ticket/14974] Make cookie notice configurable via language files

* rubencm/ticket/14974:
  [ticket/14974] make cookie notice configurable via language files
2017-03-19 18:11:40 +01:00
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
Rubén Calvo
018528b062 [ticket/15134] Replace php native functions for filesystem service methods
PHPBB3-15134
2017-03-19 17:29:11 +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
Erwan Nader
4cf998e9df [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
PHPBB3-15132
2017-03-18 18:27:24 +01:00
Vishal Pandey
f18743eb50 [ticket/11515] Refactoring changes.
Refactoring the code as suggested.

PHPBB3-11515
2017-03-18 22:37:16 +05:30
Erwan Nader
716cff0c97 [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' event
PHPBB3-15131
2017-03-18 17:58:06 +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
Vishal Pandey
b98acb9409 [ticket/11515] Refactoring the patch.
Removing else conditions.

PHPBB3-11515
2017-03-14 17:19:41 +05:30
Rubén Calvo
568ce32ca8 [ticket/15084] fix wrong order of breadcrumbs on module management
PHPBB3-15084
2017-03-13 22:23:09 +01:00
Rubén Calvo
45f0adcd0a [ticket/15123] modified return error codes
PHPBB3-15123
2017-03-13 22:20:59 +01:00
Rubén Calvo
9b3609d6f6 [ticket/15123] modified language strings
PHPBB3-15123
2017-03-13 22:20:51 +01:00
Rubén Calvo
8994295f2b [ticket/15123] modified language string
PHPBB3-15123
2017-03-13 22:20:45 +01:00
Rubén Calvo
68c167fe7a [ticket/15123] removed blank spaces
PHPBB3-15123
2017-03-13 22:20:38 +01:00
Rubén Calvo
891aab0593 [ticket/15123] add check before enable or disable extension
PHPBB3-15123
2017-03-13 22:20:20 +01:00
Vishal Pandey
4f71a75df1 [ticket/11515] Space between if and braces
Exactly one space between if and opening brace.

PHPBB3-11515
2017-03-14 02:27:18 +05:30
Vishal Pandey
1ba32e1b7a [ticket/11515] Change If...else statement struct
Modifications in if-else structure.

PHPBB3-11515
2017-03-14 02:16:18 +05:30
Vishal Pandey
9063556a57 [ticket/11515] Extra check after acquiring locks.
Add additional check to flock.php and db.php to ensure lock aquiring.

PHPBB3-11515
2017-03-14 00:57:28 +05:30
nomind60s
6da3b5e93d [ticket/15086] Rework specification of properties to simplify
Once more rework the property specifications to maintain backwards compatability
and keep changes as small as possible. Thanks hanakin for the assistance.

PHPBB3-15086
2017-03-13 09:04:02 -06:00
Rubén Calvo
74f1b19dfe [ticket/14974] make cookie notice configurable via language files
PHPBB3-14974
2017-03-13 03:09:35 +01:00
rxu
20a3801cf2 [ticket/15124] Hide navbar icon titles in repsonsive view
PHPBB3-15124
2017-03-13 00:29:00 +07:00
Marc Alexander
877e15a6e6
[ticket/15122] Add cache driver for memcached
PHPBB3-15122
2017-03-12 15:52:41 +01:00
rxu
4826f7c1d3 [ticket/14806] Fix ACP test emails authentication failure
PHPBB3-14806
2017-03-11 17:06:26 +07:00