1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-22 17:41:24 +02:00
Commit Graph

10599 Commits

Author SHA1 Message Date
Marc Alexander
465ceab1e6 Merge branch '3.2.x' 2017-04-16 19:41:19 +02:00
rxu
fcc8e155ec [ticket/14990] Move dispatcher object to the front of the options array
PHPBB3-14990
2017-04-16 23:40:16 +07:00
rxu
1ea114ca20 [ticket/14990] Fix event name, email parsing, installer and dispatcher calls
PHPBB3-14990
2017-04-16 22:43:50 +07:00
Marc Alexander
c92c2aa2f4 Merge branch '3.2.x' 2017-04-16 11:42:53 +02:00
Marc Alexander
d44d1f115f Merge pull request #4698 from javiexin/ticket/15087
[ticket/15087] Optimize creation of metadata objects by caching
2017-04-16 11:15:45 +02:00
Marc Alexander
fba8595421 Merge branch '3.2.x' 2017-04-11 21:28:08 +02:00
Matt Friedman
6ce5ef53cb [ticket/15142] Merge branch 'ticket/15142' into 32x
PHPBB3-15142
2017-04-10 15:51:22 -07:00
Marc Alexander
f23ff335c7 Merge branch '3.2.x' 2017-03-25 16:37:37 +01:00
Marc Alexander
936426178b Merge pull request #4762 from Nicofuma/ticket/15137
[ticket/15137] Global Announcements shouldn't always be never ending
2017-03-25 16:37:33 +01:00
Tristan Darricau
38cf5c10f9 [ticket/15137] Global Announcements shouldn't always be never ending
PHPBB3-15137
2017-03-25 14:11:20 +01:00
Tristan Darricau
e4c13af894 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15143] Fix display of version update in ACP
2017-03-24 23:20:08 +01:00
Tristan Darricau
e86f199d16 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15143] Fix display of version update in ACP
2017-03-24 23:19:54 +01:00
Tristan Darricau
1f1baf3e30 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15135] Correctly pass exception arguments and add back link again
  [ticket/15135] Parse language files in acp_extensions instead of md manager
2017-03-24 23:08:02 +01:00
Matt Friedman
91ab27ecc9 [ticket/15142] Check extension updates on current branch
PHPBB3-15142
2017-03-24 09:37:14 -07:00
Marc Alexander
a975a35734 [ticket/15135] Correctly pass exception arguments and add back link again
PHPBB3-15135
2017-03-23 21:52:35 +01:00
Matt Friedman
45c3cb52e4 [ticket/15143] Fix display of version update in ACP
PHPBB3-15143
2017-03-22 12:14:05 -07:00
Marc Alexander
6f1de69bbe [ticket/15135] Parse language files in acp_extensions instead of md manager
PHPBB3-15135
2017-03-19 22:37:19 +01:00
Tristan Darricau
d64726815c Merge branch '3.2.x'
* 3.2.x:
  [ticket/15102] Missing parameter calling version_check
2017-03-19 18:53:22 +01:00
Tristan Darricau
bd34b2301e Merge pull request #4711 from javiexin/ticket/15102
[ticket/15102] Missing parameter calling version_check

* github.com:phpbb/phpbb:
  [ticket/15102] Missing parameter calling version_check
2017-03-19 18:53:19 +01:00
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
javiexin
34e867c590 [ticket/15102] Missing parameter calling version_check
PHPBB3-15102
2017-02-24 00:25:04 +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