3469 Commits

Author	SHA1	Message	Date
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	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
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
JoshyPHP	d3eb85dd5d	[ticket/15126] Disable HTML entities in quote helper ... PHPBB3-15126	2017-03-15 02:36:20 +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
Marc Alexander	877e15a6e6	[ticket/15122] Add cache driver for memcached ... PHPBB3-15122	2017-03-12 15:52:41 +01:00
Marc Alexander	967817143d	Merge branch '3.2.x'	2017-02-23 22:21:25 +01:00
Marc Alexander	7a1f4d5008	Merge branch '3.1.x' into 3.2.x	2017-02-23 22:21:20 +01:00
Marc Alexander	9267235f30	Merge pull request #4605 from javiexin/ticket/14943 ... [ticket/14943] Fix template loop access by index	2017-02-23 22:21:16 +01:00
Marc Alexander	e24d3a6ade	Merge branch '3.2.x'	2017-02-19 21:47:10 +01:00
Marc Alexander	bdaa6e4909	Merge branch '3.1.x' into 3.2.x	2017-02-19 21:47:06 +01:00
Marc Alexander	481a592b8d	Merge pull request #4598 from javiexin/ticket/14944 ... [ticket/14944] Add search for template loop indexes by key	2017-02-19 21:47:00 +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
Marc Alexander	30c8e40b9b	Merge branch '3.2.x'	2017-02-11 21:48:42 +01:00