Tristan Darricau
7d0692eff3
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14806] Fix ACP test emails authentication failure
2017-03-19 18:45:39 +01:00
Tristan Darricau
c46efa461e
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14806] Fix ACP test emails authentication failure
2017-03-19 18:45:29 +01:00
Tristan Darricau
6abcfe41e0
Merge pull request #4734 from rxu/ticket/14806
...
[ticket/14806] Fix ACP test emails authentication failure
* github.com:phpbb/phpbb:
[ticket/14806] Fix ACP test emails authentication failure
2017-03-19 18:44:41 +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
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
rxu
22b8632426
[ticket/13558] Change options prefix and add settings precautions.
...
PHPBB3-13558
2017-03-19 14:32:53 +07: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
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
rxu
4826f7c1d3
[ticket/14806] Fix ACP test emails authentication failure
...
PHPBB3-14806
2017-03-11 17:06:26 +07: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
d956ac418d
Merge branch '3.2.x'
2017-02-22 11:09:30 +01:00
Marc Alexander
dbf7f2b7ee
Merge branch '3.1.x' into 3.2.x
2017-02-22 11:09:02 +01:00
Marc Alexander
4c3ddea09f
Merge remote-tracking branch 'origin/ticket/14927' into 3.1.x
2017-02-22 11:08:22 +01:00
Marc Alexander
bc86210db8
[ticket/14927] Put vars on one line
...
PHPBB3-14927
2017-02-21 22:15:12 +01:00
Marc Alexander
7794696317
Merge branch '3.2.x'
2017-02-21 21:14:34 +01:00
Marc Alexander
efe6bcf95a
Merge branch '3.1.x' into 3.2.x
2017-02-21 21:14:12 +01:00
Marc Alexander
896249f0e8
Merge pull request #4604 from rxu/ticket/13344
...
[ticket/13344] Add core event to acp/info/acp_logs.php
2017-02-21 21:10:35 +01:00
david63
bac6dbda5e
[ticket/14927] Corrected order in docblock of event & target version
...
PHPBB3-14927
2017-02-21 20:46:58 +01:00
david63
1b46435734
[ticket/14927] Add items to core.user_add_modify_data
...
PHPBB3-14927
2017-02-21 20:44:00 +01:00
javiexin
cdca848018
[ticket/14849] Add core.acp_extensions_run_action
...
Rename event to core.acp_extensions_run_action_before
PHPBB-14849
2017-02-19 22:01:02 +01:00
javiexin
7f69580df3
Merge branch '3.1.x' into ticket/15011
2017-02-15 23:56:52 +01:00
javiexin
7646280d51
[ticket/15011] All errors on metadata throw exceptions
...
There is inconsistency in the way error are treated in metadata_manager.
Some method return false on error, others throw exception. With this,
the usage is homogeneus, and the uses of these are also adapted.
Using same ticket as it is the same issue, solved in a different way.
PHPBB3-15011
2017-02-15 23:51:08 +01:00
David Colón
e1910b9a0f
[ticket/15089] Reverse the order of cookie secure radio buttons
2017-02-12 22:26:40 -05:00
Marc Alexander
30c8e40b9b
Merge branch '3.2.x'
2017-02-11 21:48:42 +01:00
Marc Alexander
f27cdad73e
Merge branch '3.1.x' into 3.2.x
2017-02-11 21:48:20 +01:00
Marc Alexander
45199adebd
Merge pull request #4523 from senky/ticket/13429
...
[ticket/13429] Replace @change with @changed in event docblocks
2017-02-11 15:19:47 +01:00
Marc Alexander
d81df55963
[ticket/14998] Point only to install dir from acp_update
...
PHPBB3-14998
2017-01-28 09:16:49 +01:00
Jakub Senko
779758f219
[ticket/13429] Replace @change with @changed
...
PHPBB3-13429
2017-01-23 13:33:15 +01:00
Tristan Darricau
7f82d28f6f
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14968] Use earlier version as written in comment
[ticket/14968] Update docblock and ensure method returns array
[ticket/14968] Display possible upgrade on acp index and update page
[ticket/14968] Add method for retrieving updates on current branch
2017-01-22 23:16:23 +01:00
Tristan Darricau
7c77e33313
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/14968] Use earlier version as written in comment
[ticket/14968] Update docblock and ensure method returns array
[ticket/14968] Display possible upgrade on acp index and update page
[ticket/14968] Add method for retrieving updates on current branch
2017-01-22 23:15:26 +01:00
Marc Alexander
a620ce0713
[ticket/14968] Display possible upgrade on acp index and update page
...
PHPBB3-14968
2017-01-22 16:37:20 +01:00
Tristan Darricau
3d61d2b370
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15011] Output meaningful errors when validating all metadata
[ticket/11076] State current and minimum required versions in old PHP notice
2017-01-15 18:16:45 +01:00
Tristan Darricau
c4ee378456
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
[ticket/11076] State current and minimum required versions in old PHP notice
2017-01-15 18:13:00 +01:00
Marc Alexander
cb44dbc8cb
[ticket/11076] State current and minimum required versions in old PHP notice
...
PHPBB3-11076
2017-01-15 15:32:55 +01:00
Tristan Darricau
51500977b2
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/14989] Allow more admin-configurable schemes in post links
2017-01-15 12:36:29 +01:00
Tristan Darricau
4fd6b0fd88
Merge pull request #4632 from VSEphpbb/ticket/14989
...
[ticket/14989] Allow more admin-configurable schemes in post links
* VSEphpbb/ticket/14989:
[ticket/14989] Allow more admin-configurable schemes in post links
2017-01-15 12:36:26 +01:00
Matt Friedman
a3accfaf46
[ticket/14989] Allow more admin-configurable schemes in post links
...
PHPBB3-14989
2017-01-11 01:55:39 -08:00
Marc Alexander
385feb0a5d
[3.2.x] Update development version to 3.2.1-dev
2017-01-07 17:19:35 +01:00
