Marc Alexander
|
663bdda53c
|
Merge branch '3.2.x'
|
2017-01-07 00:20:22 +01:00 |
|
Marc Alexander
|
44f130808f
|
Merge pull request #4618 from marc1706/ticket/14961
[ticket/14961] Add cookie notice as enablable feature
|
2017-01-07 00:20:18 +01:00 |
|
Marc Alexander
|
a187c46072
|
Merge branch '3.2.x'
|
2017-01-06 01:14:13 +01:00 |
|
Marc Alexander
|
91637f8070
|
Merge pull request #4608 from marc1706/ticket/14954
[ticket/14954] Properly check if topic has attachments in mcp_queue
|
2017-01-06 01:14:09 +01:00 |
|
Marc Alexander
|
0543413626
|
Merge branch '3.2.x'
|
2017-01-06 01:06:10 +01:00 |
|
Marc Alexander
|
e0eeea800c
|
[ticket/14961] Add cookie notice as enablable feature
Uses Insites cookieconsent v3.0.3:
https://cookieconsent.insites.com
PHPBB3-14961
|
2017-01-06 00:57:12 +01:00 |
|
Marc Alexander
|
777a1ad916
|
[ticket/14945] Parse signature preview with generate_text_for_display()
PHPBB3-14945
|
2017-01-04 22:04:07 +01:00 |
|
Marc Alexander
|
13d0549e59
|
Merge branch '3.2.x'
|
2017-01-04 21:50:47 +01:00 |
|
Marc Alexander
|
cfa2bc534b
|
Merge branch '3.1.x' into 3.2.x
|
2017-01-04 21:50:25 +01:00 |
|
Marc Alexander
|
a0abb1e10e
|
Merge pull request #4600 from hubaishan/ticket/14549
[ticket/14549] fix mcp page redirect back after topic merge and rised warning
|
2017-01-04 21:47:21 +01:00 |
|
Marc Alexander
|
ee3cf0af0f
|
Merge branch '3.2.x'
|
2017-01-04 21:07:36 +01:00 |
|
Marc Alexander
|
24b02ad4d6
|
Merge pull request #4443 from Crizz0/ticket/14780
[ticket/14780] Correction to let group setting overwrite global PM setting
|
2017-01-04 21:07:32 +01:00 |
|
Marc Alexander
|
3fef34a541
|
Merge branch '3.2.x'
|
2017-01-04 17:48:56 +01:00 |
|
Marc Alexander
|
c5ce0cd3c4
|
Merge pull request #4599 from VSEphpbb/ticket/14945
[ticket/14945] Fix bbcode flags in user sig previews
|
2017-01-04 17:48:52 +01:00 |
|
Marc Alexander
|
4c550c221b
|
[ticket/14954] Properly check if topic has attachments in mcp_queue
PHPBB3-14954
|
2017-01-02 23:23:53 +01:00 |
|
Tristan Darricau
|
387d76aa09
|
Merge branch '3.2.x'
* 3.2.x:
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
|
2017-01-02 22:47:51 +01:00 |
|
Tristan Darricau
|
2251816b10
|
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
|
2017-01-02 22:47:47 +01:00 |
|
Marc Alexander
|
7df7cfff33
|
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
PHPBB3-14953
|
2017-01-02 22:39:40 +01:00 |
|
hubaishan
|
40bc4ac484
|
[ticket/14549] Correcting $redirect var to avoid the bug
by this correct $redirect will go to clean mcp page after merge
PHPBB3-14549
|
2016-12-29 13:11:19 +03:00 |
|
Marc Alexander
|
7eddb02568
|
Merge branch '3.2.x'
|
2016-12-28 22:24:12 +01:00 |
|
Marc Alexander
|
442d21ace2
|
Merge branch '3.1.x' into 3.2.x
|
2016-12-28 22:23:52 +01:00 |
|
Marc Alexander
|
3ccaac488b
|
Merge pull request #4531 from senky/ticket/14817
[ticket/14817] Add core.send_file_to_browser_before
|
2016-12-28 22:19:12 +01:00 |
|
Marc Alexander
|
4ca90795af
|
Merge branch '3.2.x'
|
2016-12-28 22:12:48 +01:00 |
|
Marc Alexander
|
8a7607964f
|
Merge branch '3.1.x' into 3.2.x
|
2016-12-28 22:12:26 +01:00 |
|
Marc Alexander
|
54e31efcbc
|
Merge pull request #4525 from senky/ticket/14119
[ticket/14119] Add core.user_unban
|
2016-12-28 22:11:45 +01:00 |
|
Matt Friedman
|
e31c895774
|
[ticket/14945] Send bbcode flags in user sig previews
PHPBB3-14945
|
2016-12-28 09:18:35 -08:00 |
|
Marc Alexander
|
a4911c59fb
|
Merge branch '3.2.x'
|
2016-12-25 11:58:01 +01:00 |
|
Marc Alexander
|
27cf12f807
|
Merge branch '3.1.x' into 3.2.x
|
2016-12-25 11:57:56 +01:00 |
|
Marc Alexander
|
c127591d25
|
Merge pull request #4544 from dsinn/ticket/14882
[ticket/14882] Add core event to MCP after move post sync
|
2016-12-25 11:57:52 +01:00 |
|
Daniel Sinn
|
aa84ea8e5d
|
[ticket/14882] Correct type of topic_id for function_admin's move_posts events
PHPBB3-14882
|
2016-12-20 16:46:50 -05:00 |
|
Jakub Senko
|
5f6fa321ef
|
[ticket/14817] Add core.send_file_to_browser_before
PHPBB3-14817
|
2016-12-18 21:19:31 +01:00 |
|
Marc Alexander
|
585195a646
|
Merge branch '3.2.x'
|
2016-12-18 21:07:27 +01:00 |
|
Marc Alexander
|
58e4ec68b6
|
Merge branch '3.1.x' into 3.2.x
|
2016-12-18 21:07:23 +01:00 |
|
Marc Alexander
|
0f000aff0d
|
Merge pull request #4536 from senky/ticket/13845
[ticket/13845] Add core.ucp_profile_avatar_sql
|
2016-12-18 21:07:19 +01:00 |
|
Marc Alexander
|
6d2f549417
|
Merge branch '3.2.x'
|
2016-12-18 21:01:22 +01:00 |
|
Marc Alexander
|
2c9da5ad47
|
Merge branch '3.1.x' into 3.2.x
|
2016-12-18 21:01:18 +01:00 |
|
Marc Alexander
|
445a8be895
|
Merge pull request #4535 from senky/ticket/14331
[ticket/14331] Add core.get_user_rank_after
|
2016-12-18 21:01:14 +01:00 |
|
Marc Alexander
|
7da6b23ebe
|
Merge branch '3.2.x'
|
2016-12-18 20:47:50 +01:00 |
|
Marc Alexander
|
bef0b15dbd
|
Merge branch '3.1.x' into 3.2.x
|
2016-12-18 20:47:46 +01:00 |
|
Marc Alexander
|
47e7cd7194
|
Merge pull request #4533 from senky/ticket/14524
[ticket/14524] Add core.ucp_register_requests_after
|
2016-12-18 20:47:41 +01:00 |
|
Jakub Senko
|
a03cec5b8d
|
[ticket/14119] Add core.user_unban
PHPBB3-14119
|
2016-12-17 21:56:23 +01:00 |
|
Marc Alexander
|
36c6c1fa55
|
Merge branch '3.2.x'
|
2016-12-17 16:27:07 +01:00 |
|
Marc Alexander
|
b1e4b232b9
|
Merge branch '3.1.x' into 3.2.x
|
2016-12-17 16:26:44 +01:00 |
|
Marc Alexander
|
3c223b3a5d
|
Merge pull request #4526 from senky/ticket/14239
[ticket/14239] Add core.ucp_remind_modify_select_sql
|
2016-12-17 16:20:29 +01:00 |
|
Marc Alexander
|
2ddaf5dc2d
|
Merge branch '3.2.x'
|
2016-12-17 15:58:19 +01:00 |
|
Marc Alexander
|
63f222ca90
|
Merge branch '3.1.x' into 3.2.x
|
2016-12-17 15:57:51 +01:00 |
|
Marc Alexander
|
daee389e53
|
Merge pull request #4518 from senky/ticket/14870
[ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from
|
2016-12-17 15:55:24 +01:00 |
|
Jakub Senko
|
90b7d1fbda
|
[ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from
PHPBB3-14870
|
2016-12-16 12:23:21 +01:00 |
|
Jakub Senko
|
df96351244
|
[ticket/14239] Add core.ucp_remind_modify_select_sql
PHPBB3-14239
|
2016-12-13 11:26:45 +01:00 |
|
Tristan Darricau
|
cb3dd0bce5
|
Merge branch '3.2.x'
* 3.2.x:
[ticket/14901] Remove notice for extension without version check
|
2016-12-11 20:09:18 +01:00 |
|