1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-22 23:40:12 +02:00

3493 Commits

Author SHA1 Message Date
Marc Alexander
31e258c8c3
Merge branch '3.2.x' 2017-04-18 21:46:48 +02:00
Tristan Darricau
e0d13da5f4
[ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITION
PHPBB3-15180
2017-04-17 23:06:25 +02:00
Marc Alexander
4206e25b2a
Merge branch '3.2.x' 2017-04-17 11:51:16 +02:00
Marc Alexander
4946c05937
Merge branch '3.1.x' into 3.2.x 2017-04-17 11:50:55 +02:00
Marc Alexander
8303058ac6
Merge pull request #4689 from javiexin/ticket/15080
[ticket/15080] Save unneeded file loads for extension metadata
2017-04-17 10:19:19 +02:00
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
rxu
633bbc9c6d [ticket/14990] Add core events to the Twig environment
PHPBB3-14990
2017-04-16 22:43:49 +07:00
Marc Alexander
1cbc6dedab
Merge pull request #4592 from javiexin/ticket/14938
[ticket/14938] Inconsistency in ext_mgr all_available vs is_available
2017-04-16 15:07:24 +02: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
Tristan Darricau
905e189c77
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15090] Ensure send stats module exists before removing
2017-04-16 10:22:01 +02:00
Tristan Darricau
3bddf02799
Merge pull request #4793 from marc1706/ticket/15090
[ticket/15090] Ensure send stats module exists before removing

* github.com:phpbb/phpbb:
  [ticket/15090] Ensure send stats module exists before removing
2017-04-16 10:21:14 +02:00
Marc Alexander
58929bdccd
Merge branch '3.2.x' 2017-04-15 18:19:16 +02:00
Marc Alexander
269150ed40
Merge pull request #4612 from javiexin/ticket/14950
[ticket/14950] Add possibility to delete a template block
2017-04-15 18:18:32 +02:00
Marc Alexander
e7dfdbffb5
[ticket/15090] Ensure send stats module exists before removing
PHPBB3-15090
2017-04-15 12:06:03 +02:00
Marc Alexander
fba8595421
Merge branch '3.2.x' 2017-04-11 21:28:08 +02:00
Marc Alexander
f9a596c544
Merge pull request #4761 from VSEphpbb/ticket/15142
[ticket/15142] Check extension updates on current branch
2017-04-11 21:26:52 +02:00
Matt Friedman
6ce5ef53cb [ticket/15142] Merge branch 'ticket/15142' into 32x
PHPBB3-15142
2017-04-10 15:51:22 -07:00
Matt Friedman
450402ea42 [ticket/15142] Remove duplicate code
PHPBB3-15142
2017-04-03 11:34:40 -07:00
Marc Alexander
e2a746c644
Merge branch '3.2.x' 2017-03-26 17:12:43 +02:00
Marc Alexander
ecef296bee
Merge pull request #4530 from senky/ticket/14557
[ticket/14557] Simplify updating overloaded events for extensions
2017-03-26 17:12:39 +02:00
Marc Alexander
097f77dc66
Merge branch '3.2.x' 2017-03-25 11:30:35 +01:00
Marc Alexander
bf6822ed1b
Merge pull request #4750 from rubencm/ticket/15134
[ticket/15134] Replace php native functions for filesystem service methods
2017-03-25 11:30:13 +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
afddb81acf [ticket/15142] Handle versions for unmatched branches
PHPBB3-15142
2017-03-24 11:47:03 -07: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
Rubén Calvo
27ab639fbe [ticket/15134] Return false if error
PHPBB3-15134
2017-03-20 11:49:34 +01: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
Rubén Calvo
29ce6e6352 [ticket/15134] Follow coding guideliness
PHPBB3-15134
2017-03-19 19:26:08 +01:00
Tristan Darricau
e2701bd28b
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15123] modified return error codes
  [ticket/15123] modified language strings
  [ticket/15123] modified language string
  [ticket/15123] removed blank spaces
  [ticket/15123] add check before enable or disable extension
2017-03-19 18:17:45 +01:00
Tristan Darricau
4b6b73ea9d
Merge pull request #4736 from rubencm/ticket/15123
[ticket/15123] Check if extension was enabled/disabled before enable or disable

* rubencm/ticket/15123:
  [ticket/15123] modified return error codes
  [ticket/15123] modified language strings
  [ticket/15123] modified language string
  [ticket/15123] removed blank spaces
  [ticket/15123] add check before enable or disable extension
2017-03-19 18:17:41 +01:00
Tristan Darricau
c3f20c34bd
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15122] Add cache driver for memcached
2017-03-19 18:15:00 +01:00
Tristan Darricau
0730d14247
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15122] Add cache driver for memcached
2017-03-19 18:14:56 +01:00
Tristan Darricau
c8670d5324
Merge pull request #4737 from marc1706/ticket/15122
[ticket/15122] Add cache driver for memcached

* marc1706/ticket/15122:
  [ticket/15122] Add cache driver for memcached
2017-03-19 18:14:52 +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
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
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
218466b40e
Merge branch '3.2.x' 2017-03-19 15:28:26 +01:00
rxu
22b8632426 [ticket/13558] Change options prefix and add settings precautions.
PHPBB3-13558
2017-03-19 14:32:53 +07:00
rxu
ac87784a11 [ticket/13558] Add smtp SSL context configuration options
PHPBB3-13558
2017-03-17 01:21:57 +07:00