2080 Commits

Author	SHA1	Message	Date
Tristan Darricau	1c2e0aa1d3	Merge branch '3.2.x' ... * 3.2.x: [ticket/15680] Point to 3.2 documentation	2018-07-08 18:48:19 +02:00
Anssi Johansson	5f243ad665	[ticket/15680] Point to 3.2 documentation ... The old link pointed to 3.1 documentation PHPBB3-15680	2018-06-05 21:29:47 +03:00
Rubén Calvo	e749e06042	[ticket/15286] Use storage in attachments ... PHPBB3-15286	2018-05-01 10:47:11 +02:00
Marc Alexander	f3338b2874	Merge branch '3.2.x'	2018-03-26 21:20:21 +02:00
Marc Alexander	929bd2ac3c	[prep-release-3.2.3] Update changelog after merging PR	2018-03-26 20:29:17 +02:00
Marc Alexander	1c30a9778d	[prep-release-3.2.3] Update changelog for 3.2.3-RC1	2018-02-28 21:35:00 +01:00
Marc Alexander	c706883e44	Merge branch '3.2.x'	2018-02-28 21:21:27 +01:00
Marc Alexander	9474d6d50e	[ticket/15569] Suggest using file replacing instead of automatic updater ... PHPBB3-15569	2018-02-25 17:26:38 +01:00
Marc Alexander	a03fa03dd5	Merge branch '3.2.x'	2018-02-24 18:55:09 +01:00
Marc Alexander	a9ef821253	[ticket/15466] Update CREDITS.txt to reflect Nils leaving [ci skip] ... PHPBB3-15466	2018-02-22 21:41:20 +01:00
Marc Alexander	e0f9794126	Merge branch '3.2.x'	2018-01-20 19:52:18 +01:00
Christian Schnegelberger	bb442c498b	[ticket/15500] Adds 7.1 and 7.2 to tested versions ... PHPBB3-15500	2018-01-19 18:16:17 +01:00
Christian Schnegelberger	1f80b668f1	[ticket/15500] Remove number from upper PHP limit ... PHPBB3-15500	2018-01-16 21:42:38 +01:00
Christian Schnegelberger	81a8a76c59	[ticket/15500] Updates PHP requirements to 5.4.7+ in docs/ ... PHPBB3-15500	2018-01-07 22:22:41 +01:00
Marc Alexander	6b221ae4cb	Merge branch '3.2.x'	2018-01-07 19:30:41 +01:00
Marc Alexander	e4fc82bee5	Merge branch 'prep-release-3.1.12' into prep-release-3.2.2	2018-01-07 11:52:38 +01:00
Marc Alexander	f38fce5ce5	[prep-release-3.1.12] Update changelog	2018-01-07 11:47:59 +01:00
Marc Alexander	e7c5fc32d2	[prep-release-3.2.2] Update changelog for 3.2.2 release	2018-01-07 11:43:54 +01:00
Marc Alexander	1b4bad6583	Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2	2018-01-07 11:02:31 +01:00
Marc Alexander	3ae0169542	Merge remote-tracking branch 'phpbb-security/prep-release-3.1.12' into prep-release-3.2.2	2018-01-07 10:48:43 +01:00
rxu	f8fbe37936	[ticket/14972] replace all occurrences of sizeof() with the count() ... PHPBB3-14972	2018-01-01 13:56:04 +01:00
Marc Alexander	0c3f7c6c8e	[prep-release-3.1.12] Update changelog for 3.1.12	2017-12-31 16:41:47 +01:00
Marc Alexander	9e3432cd7b	Merge branch '3.2.x'	2017-12-28 22:06:33 +01:00
Marc Alexander	39b1420774	[prep-release-3.2.2] Update changelog for 3.2.2-RC1	2017-12-28 15:10:03 +01:00
Marc Alexander	15033667da	Merge branch '3.2.x'	2017-12-28 08:22:40 +01:00
Marc Alexander	53ce1330d6	Merge pull request #5063 from vinny/ticket/15485 ... [ticket/15485] Add template event for forum images	2017-12-28 08:22:36 +01:00
Marc Alexander	475b85200b	Merge branch '3.2.x'	2017-12-27 21:14:02 +01:00
Marc Alexander	20a6182a86	Merge pull request #5042 from kinerity/ticket/15451 ... [ticket/15451] Add template event mcp_topic_postrow_attachments_before/after	2017-12-27 21:13:38 +01:00
Marc Alexander	f0284ddbdf	Merge branch '3.2.x'	2017-12-27 20:56:51 +01:00
Marc Alexander	dddcf28a2d	Merge pull request #5043 from kinerity/ticket/15452 ... [ticket/15452] Add template event mcp_topic_postrow_post_before	2017-12-27 20:56:47 +01:00
Marc Alexander	a89fdabb35	Merge branch '3.2.x'	2017-12-27 20:44:44 +01:00
Marc Alexander	69416b65f3	[ticket/15485] Add missing separation below event title ... PHPBB3-15485	2017-12-27 20:40:55 +01:00
vinny	5bfd609cc8	[ticket/15485] Add template event for forum images ... PHPBB3-15485	2017-12-18 02:52:35 -03:00
Daniel Sinn	5b22ccfa76	[ticket/15471] Add core events to ACP when pruning a forum ... PHPBB3-15471	2017-11-30 15:40:18 -05:00
MichaelC	ddc9b720ad	Merge branch '3.2.x' ... * 3.2.x: [ticket/15463] Add MichaelC and Hanakin to the dev credits	2017-11-26 21:57:07 +00:00
Máté Bartus	d6d77a199b	[ticket/15463] Add MichaelC and Hanakin to the dev credits ... PHPBB3-15463	2017-11-23 09:16:54 +01:00
Derky	1dd447c4aa	Merge branch '3.2.x'	2017-11-21 14:10:06 +01:00
Máté Bartus	57323d1650	[ticket/15461] Add Derky to the list of contributors. ... PHPBB3-15461	2017-11-21 14:02:43 +01:00
Kailey Truscott	a24839d21d	[ticket/15452] Add template event mcp_topic_postrow_post_before ... PHPBB3-15452	2017-11-13 07:39:59 -05:00
Kailey Truscott	da3a1a5d20	[ticket/15451] Add template event mcp_topic_postrow_attachments_before/after ... PHPBB3-15451	2017-11-13 07:37:08 -05:00
Marc Alexander	e157d8890b	Merge pull request #5020 from marc1706/ticket/15424 ... [ticket/15424] Multiple typo fixes in docs & comments	2017-11-01 12:27:13 +01:00
Marc Alexander	a51741df41	Merge branch '3.2.x'	2017-10-31 15:47:14 +01:00
luzpaz	e13ba99c81	[ticket/15424] Multiple typo fixes in docs & comments ... Fixed typos in some docs, guidelines, some non-user-facing files. PHPBB3-15424	2017-10-29 12:44:01 +01:00
ftc2	8f97887683	[ticket/15385] nginx.sample.conf: www redirection, security regex ... according to the latest wiki info: http://wiki.nginx.org/Pitfalls#Taxing_Rewrites `return 301` is preferred over a rewrite. also, the 'security' regex breaks some official extensions because it will match and deny access to `/ext/phpbb`. looking through the names of dirs and files containing `phpbb`, it looks like the intent of the regex was to only disallow the folder `phpbb` in the root dir and not other `/phpbb` matches. a negative lookbehind was added to specifically not match `/ext/phpbb` but still match other occurrences of `/phpbb`. Tracker ticket: https://tracker.phpbb.com/browse/PHPBB3-15385	2017-10-01 22:57:21 -06:00
Oliver Schramm	99306435bd	Merge branch '3.2.x'	2017-09-10 15:32:28 +02:00
Oliver Schramm	b1e3787197	Merge pull request #4889 from javiexin/ticket/15307 ... [ticket/15307] Extensions may add modes to acp_users	2017-09-10 15:32:23 +02:00
Oliver Schramm	aa15e61e4c	Merge branch '3.2.x'	2017-09-08 13:53:38 +02:00
Tristan Darricau	9b2c45d892	Merge pull request #4894 from rubencm/ticket/15276 ... [ticket/15276] Use storage in avatars * github.com:phpbb/phpbb: (34 commits) [ticket/15276] Changed annotation [ticket/15276] Remove unused code [ticket/15276] Revert some changes [ticket/15276] Use IniGetWrapper [ticket/15276] Add missing dependency [ticket/15276] Remove unused dependency [ticket/15276] Add missing properties [ticket/15276] Use InitGetWrapper [ticket/15276] Fix comments [ticket/15276] Fix code and add phpdoc [ticket/15276] Use stream_copy_to_stream [ticket/15276] Fix typo [ticket/15276] Use mimetype guesser [ticket/15276] Update file_info to get size of images [ticket/15276] Update [ticket/15276] Remove avatar_path [ticket/15276] Remove avatar_path from acp [ticket/15276] Use finfo to get mimetype [ticket/15276] Update file_info [ticket/15276] Fix code style ...	2017-09-08 13:32:38 +02:00
Crizzo	4dfd12d5b2	[ticket/15350] Changes outdated wiki-link to new docs/ ... PHPBB3-15350	2017-09-07 15:05:53 +02:00
Máté Bartus	0755ae423b	Merge pull request #4905 from rxu/ticket/15324 ... [ticket/15324] Add more core and template events	2017-09-07 14:39:39 +02:00