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 |
|
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 |
|
rxu
|
a840d70bbf
|
[ticket/14713] Add core event to the admin function get_forum_list()
PHPBB3-14713
|
2016-07-17 12:40:21 +07:00 |
|
rxu
|
51952005eb
|
[ticket/14712] Add search core event to allow modifying the forum select list
PHPBB3-14712
|
2016-07-17 12:09:15 +07:00 |
|
Crizzo
|
95124db4c9
|
Merge branch '3.2.x'
|
2016-07-16 23:45:54 +02:00 |
|
Crizzo
|
d6303ed592
|
Merge branch 'marc1706-ticket/14506' into 3.2.x
|
2016-07-16 23:43:43 +02:00 |
|
Marc Alexander
|
6f1b635992
|
[ticket/14506] Remove subsilver2 from docs/events.md
PHPBB3-14506
|
2016-07-16 22:50:37 +02:00 |
|
Marc Alexander
|
1c20bc33a5
|
Merge branch '3.2.x'
|
2016-07-16 21:25:53 +02:00 |
|
Marc Alexander
|
019e85d064
|
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/styles/subsilver2/template/mcp_move.html
|
2016-07-16 21:25:17 +02:00 |
|
Marc Alexander
|
b54aa81cdd
|
Merge pull request #4337 from Senky/ticket/14506
Add mcp_move_before template event
|
2016-07-16 21:24:33 +02:00 |
|
Marc Alexander
|
305efd648b
|
Merge branch '3.2.x'
|
2016-07-16 19:49:31 +02:00 |
|
Marc Alexander
|
b14c088ce7
|
Merge branch '3.1.x' into 3.2.x
|
2016-07-16 19:49:28 +02:00 |
|
Marc Alexander
|
6f109dd1ef
|
Merge pull request #4374 from TheKigen/ticket/14616
[ticket/14616] Fixed auto-prune failing on large forums
|
2016-07-16 19:49:25 +02:00 |
|
Crizzo
|
c9cfde7837
|
[ticket/14620] Adds link to Translations forum
PHPBB3-14620
|
2016-07-14 20:23:46 +02:00 |
|
Marc Alexander
|
4e840fee16
|
Merge branch '3.2.x'
Conflicts:
phpBB/composer.lock
|
2016-07-14 20:23:27 +02:00 |
|
Marc Alexander
|
ebdef04f5d
|
Merge pull request #4380 from JoshyPHP/ticket/14706
[ticket/14706] Updated [list] BBCode to automatically create a list item
|
2016-07-14 20:18:24 +02:00 |
|
Marc Alexander
|
96406f9b2e
|
Merge branch '3.2.x'
|
2016-07-14 20:14:30 +02:00 |
|
Marc Alexander
|
d47a22dda0
|
Merge pull request #4381 from wesleyfok/ticket/14709
[ticket/14709] add post_id to mod log
|
2016-07-14 20:14:28 +02:00 |
|
Marc Alexander
|
c880d73fe8
|
Merge branch '3.2.x'
|
2016-07-14 20:11:54 +02:00 |
|
Marc Alexander
|
61bca182f6
|
Merge branch '3.1.x' into 3.2.x
|
2016-07-14 20:11:51 +02:00 |
|
Marc Alexander
|
38082c41e3
|
Merge pull request #4347 from Senky/ticket/14631
[ticket/14631] Load truncate_string() if needed
|
2016-07-14 20:11:48 +02:00 |
|
Wesley Fok
|
d53f75f668
|
[ticket/14709] add post_id to mod log
Add the missing post_id value to the moderator log entry created upon
deleting one or more posts in the MCP topic view.
PHPBB3-14709
|
2016-07-13 12:00:06 -04:00 |
|