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 |
|
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 |
|
Andreas Fischer
|
c2860cbabb
|
Merge branch '3.2.x'
* 3.2.x:
[ticket/14665] Remove invalid syntax in report_id_auto_increment migration
|
2016-07-10 20:06:48 +02:00 |
|
Andreas Fischer
|
c1cb59c237
|
Merge pull request #4349 from marc1706/ticket/14665
[ticket/14665] Remove invalid syntax in report_id_auto_increment migration
* marc1706/ticket/14665:
[ticket/14665] Remove invalid syntax in report_id_auto_increment migration
|
2016-07-10 20:06:43 +02:00 |
|
Andreas Fischer
|
a4f575c322
|
Merge branch '3.2.x'
* 3.2.x:
[ticket/14689] Build API docs for 3.2.x
|
2016-07-08 14:12:52 +02:00 |
|
Andreas Fischer
|
7f50c798e6
|
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14689] Build API docs for 3.2.x
|
2016-07-08 14:12:43 +02:00 |
|
Andreas Fischer
|
927cc2ebad
|
Merge pull request #4379 from marc1706/ticket/14689
[ticket/14689] Build API docs for 3.2.x
* marc1706/ticket/14689:
[ticket/14689] Build API docs for 3.2.x
|
2016-07-08 14:12:34 +02:00 |
|
JoshyPHP
|
24da2db987
|
[ticket/14706] Updated [list] BBCode to automatically create a list item
Fixes issues with missing list items. Produces valid HTML.
PHPBB3-14706
|
2016-07-08 07:49:10 +02:00 |
|
Marc Alexander
|
2ec4855cba
|
[ticket/14689] Build API docs for 3.2.x
PHPBB3-14689
|
2016-07-07 19:25:26 +02:00 |
|
Marc Alexander
|
113738fce9
|
Merge branch '3.2.x'
|
2016-07-07 19:20:42 +02:00 |
|
Marc Alexander
|
45ba2e9770
|
Merge branch '3.1.x' into 3.2.x
Conflicts:
phpBB/install/install_install.php
phpBB/language/en/install.php
|
2016-07-07 19:19:40 +02:00 |
|
Marc Alexander
|
55b854906d
|
Merge pull request #4342 from Senky/ticket/14654
[ticket/14654] Change Imagemagick to ImageMagick
|
2016-07-07 19:15:33 +02:00 |
|
Max Krivanek
|
1c52968df6
|
[ticket/14616] Switch prune limit to sql_query_limit instead of sql_and
PHPBB3-14616
|
2016-07-06 23:00:35 -05:00 |
|
Marc Alexander
|
cd45922186
|
Merge branch '3.2.x'
|
2016-07-06 19:30:26 +02:00 |
|
Marc Alexander
|
24b80d6bd7
|
Merge pull request #4375 from bantu/ticket/14692
[ticket/14692] Remove duplicate subexpression in questionnaire.php
|
2016-07-06 19:30:22 +02:00 |
|
Marc Alexander
|
fc8a7013d6
|
Merge branch '3.2.x'
|
2016-07-06 19:24:08 +02:00 |
|
Marc Alexander
|
bb83af0a0a
|
Merge branch '3.1.x' into 3.2.x
|
2016-07-06 19:24:02 +02:00 |
|
Marc Alexander
|
cddb884be6
|
Merge pull request #4354 from Stanzilla/smtp_explain
[ticket/14184] Add a _EXPLAIN translation entry for the SMTP server option
|
2016-07-06 19:23:54 +02:00 |
|