Commit graph

30768 commits

Author SHA1 Message Date
Erwan Nader
5b501e594c [ticket/14592] Fixed syntax errors from unit tests
PHPBB3-14592
2016-07-24 18:10:45 +02:00
Erwan Nader
4eecc95a42 [ticket/14592] [PHP] core.search_backend_search_after
PHPBB3-14592
2016-07-24 17:46:23 +02:00
rxu
5eb493fa86 [ticket/14703] Fix existance checking if multiple parent module_langname found
PHPBB3-14703
2016-07-24 21:22:37 +07:00
Matt Friedman
43e0283fb1 [ticket/14720] Add "phpbb" as allowed global to jshintrc
PHPBB3-14720
2016-07-23 19:14:30 -07:00
rxu
8cf2790d55 [ticket/14703] Add test for the case multiple parent module_langname found
PHPBB3-14703
2016-07-24 02:31:44 +07:00
Marc Alexander
e1f9c946ef [ticket/14670] Modify service definition for RouterListener
PHPBB3-14670
2016-07-23 17:54:45 +02:00
Marc Alexander
d66e8cba23 [ticket/14670] Fix typo in .travis.yml
PHPBB3-14670
2016-07-23 17:13:54 +02:00
Marc Alexander
74abce31bc [ticket/14670] Remove usage of prototype scope in tests
In this specific case, the mock container builder is used which does not
even support setting the scope.

PHPBB3-14670
2016-07-23 17:13:54 +02:00
Marc Alexander
b93bdfb1c3 [ticket/14670] Add new travis builds and PHP 5.5 requirement
PHPBB3-14670
2016-07-23 17:13:54 +02:00
Marc Alexander
42b6dc38c5 [ticket/14670] Fix incompatibilities with container definitions
PHPBB3-14670
2016-07-23 17:13:54 +02:00
Marc Alexander
59a228f7cd [ticket/14670] Use symfony 3.1 in master branch
Removed sami as it doesn't have a version compatible
with symfony 3.x.

PHPBB3-14670
2016-07-23 17:13:54 +02:00
Máté Bartus
96617e8e46 Merge branch '3.2.x'
* 3.2.x:
  [ticket/14717] Quote strings beginning with @ or % in yaml definitions
2016-07-23 16:57:56 +02:00
Máté Bartus
4ad0c3e903 Merge pull request #4390 from marc1706/ticket/14717
[ticket/14717] Quote strings beginning with @ or % in yaml definitions
2016-07-23 16:56:45 +02:00
rxu
eaafb758ce [ticket/14703] Select the parent module id from the several found
PHPBB3-14703
2016-07-23 21:34:05 +07:00
Marc Alexander
89461d982c [ticket/14717] Quote strings beginning with @ or % in yaml definitions
This type of use was deprecated in symfony 2.8 and will be dropped in 3.x.
Also see: https://github.com/symfony/symfony/pull/16285

PHPBB3-14717
2016-07-23 16:23:42 +02:00
kasimi
33cd613406 [ticket/14715] Converted tabs to spaces
PHPBB3-14715
2016-07-22 12:17:15 +02:00
Marc Alexander
0628735f57 Merge branch '3.2.x' 2016-07-21 22:05:23 +02:00
Marc Alexander
4554c030c0 Merge pull request #4388 from JoshyPHP/ticket/14700
[ticket/14700] Prevent an exception on duplicate smilies in text_formatter
2016-07-21 22:05:19 +02:00
kasimi
20e08aa2a0 [ticket/14715] Fixed typos in events.md
PHPBB3-14715
2016-07-21 17:49:35 +02:00
kasimi
da7c41f167 [ticket/14715] Add template events in posting_topic_review & mcp_topic
The events will allow adding content before and after the post details
in topic review and topic moderation.

PHPBB3-14715
2016-07-21 17:48:42 +02:00
JoshyPHP
13a756bfb7 [ticket/14700] Prevent an exception on duplicate smilies in text_formatter
PHPBB3-14700
2016-07-21 03:40:01 +02:00
Marc Alexander
83fadbe697 Merge branch '3.2.x' 2016-07-20 20:25:08 +02:00
Marc Alexander
486ffa85a2 Merge pull request #4344 from Senky/ticket2/14586
[ticket/14586] Add OAuth1 support
2016-07-20 20:25:01 +02:00
Máté Bartus
0336bef2d9 Merge branch '3.2.x' 2016-07-19 19:24:52 +02:00
Máté Bartus
d2ff12256c Merge branch '3.1.x' into 3.2.x 2016-07-19 19:23:35 +02:00
Máté Bartus
ef91c6abed Merge pull request #4387 from marc1706/ticket/14538
[ticket/14538] Update symfony dependencies to latest versions
2016-07-19 19:00:47 +02:00
Marc Alexander
f3fe610a5e [ticket/14538] Update symfony dependencies to latest versions
PHPBB3-14538
2016-07-19 17:58:41 +02:00
Máté Bartus
5760099618 Merge branch '3.2.x' 2016-07-19 10:20:21 +02:00
Máté Bartus
5cba468c35 Merge pull request #4386 from marc1706/ticket/14714
[ticket/14714] Update dependencies to latest versions
2016-07-19 10:09:26 +02:00
3Di
0026ed02ae [ticket/14596] Deny installation of Ascraeus under PHP 7
PHPBB3-14596
2016-07-18 23:45:58 +02:00
Marc Alexander
7195f51806 [ticket/14714] Update dependencies to latest versions
This does include updating guzzle with the latest security update and also
updating symfony to 2.8.8.

PHPBB3-14714
2016-07-18 22:41:42 +02:00
Marc Alexander
c5bfcb4c48 Merge branch '3.2.x' 2016-07-18 20:40:41 +02:00
Marc Alexander
11532bd8c1 Merge pull request #4385 from JoshyPHP/ticket/14663
[ticket/14663] Added regression test for Unicode in custom BBCodes
2016-07-18 20:40:38 +02:00
JoshyPHP
e9e6847803 [ticket/14663] Added regression test for Unicode in custom BBCodes
PHPBB3-14663
2016-07-18 19:06:29 +02:00
Marc Alexander
c14d7d719e Merge branch '3.2.x' 2016-07-17 22:10:12 +02:00
Marc Alexander
e7ce7ecbe7 Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/config/feed.yml
	phpBB/feed.php
	phpBB/phpbb/feed/base.php
2016-07-17 22:09:53 +02:00
Marc Alexander
befacabf7e Merge pull request #4365 from rxu/ticket/14688
[ticket/14688] Add core events to the feeds
2016-07-17 21:32:20 +02:00
Jakub Senko
775df0eb8a [ticket/14516] Add memberlist_email_before event
PHPBB3-14516
2016-07-17 20:43:40 +02:00
Marc Alexander
cff33d6c39 Merge branch '3.2.x' 2016-07-17 17:52:09 +02:00
Marc Alexander
4e480d46f5 Merge pull request #4311 from Crizz0/ticket/14620
[ticket/14620] Change docs/ and files to 3.2.x
2016-07-17 17:52:05 +02:00
rxu
3df9b2c8f8 [ticket/14688] Add core events to the feeds
PHPBB3-14688
2016-07-17 21:14:13 +07:00
Marc Alexander
7eb8d8fcae Merge branch '3.2.x' 2016-07-17 15:57:33 +02:00
Marc Alexander
f2a1fbadbc Merge branch '3.1.x' into 3.2.x 2016-07-17 15:57:28 +02:00
Marc Alexander
e8454e018d Merge pull request #4378 from Crizz0/ticket/14704
[ticket/14704] Removes unused function and language files in base.php
2016-07-17 15:57:21 +02:00
Marc Alexander
8760a1fd51 Merge branch '3.2.x' 2016-07-17 15:54:19 +02:00
Marc Alexander
d3f017c149 Merge branch '3.1.x' into 3.2.x 2016-07-17 15:54:15 +02:00
Marc Alexander
78a0d10a5a Merge pull request #4384 from rxu/ticket/14713
[ticket/14713] Add core event to the admin function get_forum_list()
2016-07-17 15:54:09 +02:00
Marc Alexander
ae6e5a6c20 Merge branch '3.2.x' 2016-07-17 15:52:46 +02:00
Marc Alexander
e4aa8806b9 Merge branch '3.1.x' into 3.2.x 2016-07-17 15:52:41 +02:00
Marc Alexander
960dc08946 Merge pull request #4383 from rxu/ticket/14712
[ticket/14712] Add search core event to allow modifying the forum select list
2016-07-17 15:52:33 +02:00