makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
28623 commits 18 branches 192 tags 206 MiB
Commit graph

24231 commits

Author SHA1 Message Date
Marc Alexander
94e6479c93 Merge branch '3.2.x' 2016-08-03 21:54:38 +02:00
Wesley Fok
8a9cf32b1d [ticket/14729] Make reports take config base class 
Make the report controller and helper classes accept the more generic
phpbb/config/config base class in their constructors, instead of the
specific database implementation phpbb/config/db.

PHPBB3-14729
 2016-08-03 13:42:36 -04:00
Marc Alexander
da15d435bf Merge branch '3.2.x' 2016-08-01 20:42:16 +02:00
Marc Alexander
3d4660a703 Merge branch '3.1.x' into 3.2.x 2016-08-01 20:42:13 +02:00
Oliver Schramm
f222f8a84a [ticket/14721] Avoid renaming deleted users 
PHPBB3-14721
 2016-08-01 00:26:47 +02:00
Marc Alexander
4ac2547d62 Merge pull request #4301 from 3D-I/PHPBB3-14596 
[ticket/14596] Deny installation of Ascraeus under PHP 7
 2016-07-31 15:18:35 +02:00
Oliver Schramm
46045eb9b0 Merge branch '3.2.x' 2016-07-30 23:23:00 +02:00
Máté Bartus
61a147546d [ticket/14633] Check for XML extension support on install 
PHPBB3-14633
 2016-07-30 13:04:39 +02:00
Máté Bartus
832722417a Merge pull request #4350 from marc1706/ticket/14670 
[ticket/14670] Use symfony 3.x in master branch
 2016-07-29 17:51:50 +02:00
Andreas Fischer
ed2c8b5bf7 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:51 +02:00
Andreas Fischer
0dc13c720c Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:51 +02:00
Andreas Fischer
55223e6840 Merge pull request #4336 from Senky/ticket/14652 
Fix typos in core.index_modify_birthdays_list vars descriptions

* Senky/ticket/14652:
  [ticket/14652] Fix typos in core.index_modify_birthdays_list vars descriptions
 2016-07-29 09:41:50 +02:00
Marc Alexander
e1f9c946ef [ticket/14670] Modify service definition for RouterListener 
PHPBB3-14670
 2016-07-23 17:54:45 +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
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
Marc Alexander
0628735f57 Merge branch '3.2.x' 2016-07-21 22:05:23 +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
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
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
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
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
Marc Alexander
3816b5e54b Merge branch '3.2.x' 2016-07-17 11:06:54 +02:00
Marc Alexander
be8bf42fe3 Merge branch '3.1.x' into 3.2.x 2016-07-17 11:06:50 +02:00
Marc Alexander
d0a5f87a44 Merge pull request #4364 from kinerity/ticket/14687 
[ticket/14687] Modify viewforum_modify_topicrow event
 2016-07-17 11:06:43 +02:00
Marc Alexander
007aeb5dec Merge branch '3.2.x' 2016-07-17 11:05:34 +02:00
Marc Alexander
4e7705fcaf Merge branch '3.1.x' into 3.2.x 2016-07-17 10:58:04 +02:00
Marc Alexander
a1ecb6db69 Merge pull request #4361 from kinerity/ticket/14685 
[ticket/14685] Add viewforum_get_announcement_topic_ids_data event
 2016-07-17 10:57:57 +02:00
Marc Alexander
9227ade5e3 Merge branch '3.2.x' 2016-07-17 10:56:59 +02:00
Marc Alexander
44303aa425 Merge branch '3.1.x' into 3.2.x 2016-07-17 10:46:51 +02:00
Marc Alexander
63db42522b Merge pull request #4321 from Senky/ticket/14615 
[ticket/14615] Fix HTML5 validation errors on avatar deletion
 2016-07-17 10:46:44 +02:00