mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
28,600 Commits 17 Branches 190 Tags
Commit Graph

28600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
5330ea0f09 Merge pull request #4324 from Senky/ticket/14516 
[ticket/14516] Add memberlist_email_before event
 2016-08-03 22:20:48 +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
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
Erwan Nader
0cc41be3c0 [ticket/14727] Event core.search_modify_submit_parameters 
PHPBB3-14727
 2016-07-31 16:46:20 +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
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
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
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
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
rxu
8e8e25cc1f [ticket/14703] Fix the docblock 
PHPBB3-14703
 2016-07-24 23:35:20 +07: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
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
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
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
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
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
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
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
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
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
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
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
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
4e7705fcaf Merge branch '3.1.x' into 3.2.x 2016-07-17 10:58:04 +02:00