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

28623 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
94e6479c93 Merge branch '3.2.x' 2016-08-03 21:54:38 +02:00
Marc Alexander
55123bc94c Merge pull request #4399 from wesleyfok/ticket/14729 
[ticket/14729] Make reports take config base class
 2016-08-03 21:53:35 +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
Marc Alexander
f68820762b Merge pull request #4397 from Elsensee/ticket/14721 
[ticket/14721] Avoid renaming deleted users
 2016-08-01 20:42:09 +02:00
Oliver Schramm
f222f8a84a [ticket/14721] Avoid renaming deleted users 
PHPBB3-14721
 2016-08-01 00:26:47 +02:00
Marc Alexander
4cd89dcda7 Merge branch '3.2.x' 2016-07-31 15:39:10 +02:00
Marc Alexander
bd1d734dcc Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/install/install_install.php
	phpBB/language/en/install.php
 2016-07-31 15:38:50 +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
Oliver Schramm
69d2bad929 Merge pull request #4395 from CHItA/ticket/14633 
[ticket/14633] Check for XML extension support on install
 2016-07-30 23:04:44 +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
224b0bb8d2 [ticket/14670] Set shared flag instead of defining prototype scope 
The prototype scope was deprecated in symfony 2.8 and removed in 3.0.

PHPBB3-14670
 2016-07-24 21:52:05 +02:00
Marc Alexander
402292cb07 [ticket/14670] Do not backup static attributes 
This seems to cause issues with the UI tests as the backed up
static web driver does not seem to be properly initialized.

PHPBB3-14670
 2016-07-24 19:30:02 +02:00
Marc Alexander
6d2a9805db Merge branch '3.2.x' 2016-07-24 19:15:53 +02:00
Marc Alexander
88db46946e Merge branch '3.1.x' into 3.2.x 2016-07-24 19:15:50 +02:00
Marc Alexander
941be83395 Merge pull request #4391 from VSEphpbb/ticket/14720 
[ticket/14720] Add "phpbb" as allowed global to jshintrc
 2016-07-24 19:15:48 +02:00
Matt Friedman
43e0283fb1 [ticket/14720] Add "phpbb" as allowed global to jshintrc 
PHPBB3-14720
 2016-07-23 19:14:30 -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
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
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
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