Marc Alexander
|
47684bd684
|
Merge branch '3.2.x'
|
2017-06-05 11:19:26 +02:00 |
|
Marc Alexander
|
98415c43cf
|
Merge branch '3.1.x' into 3.2.x
|
2017-06-05 11:19:07 +02:00 |
|
Marc Alexander
|
f0dbfc56d5
|
Merge pull request #4812 from rxu/ticket/15200-3.1.x
[ticket/15200] Allow extensions using custom templates for help/faq controllers
|
2017-06-05 11:18:27 +02:00 |
|
Marc Alexander
|
970c44b05f
|
Merge branch '3.2.x'
|
2017-06-05 11:16:35 +02:00 |
|
Marc Alexander
|
fd5a013f06
|
Merge pull request #4811 from rxu/ticket/15200
[ticket/15200] Allow extensions using custom templates for help/faq controllers
|
2017-06-05 11:16:32 +02:00 |
|
Marc Alexander
|
a58d032bf9
|
Merge branch '3.2.x'
|
2017-06-05 11:13:43 +02:00 |
|
Marc Alexander
|
be76d582dc
|
Merge branch '3.1.x' into 3.2.x
|
2017-06-05 11:13:39 +02:00 |
|
Marc Alexander
|
acf9cdba01
|
Merge pull request #4810 from rxu/ticket/15199
[ticket/15199] Add core event to the messenger send() function
|
2017-06-05 11:13:35 +02:00 |
|
Marc Alexander
|
509ea30aa2
|
Merge branch '3.2.x'
|
2017-06-05 11:02:49 +02:00 |
|
Marc Alexander
|
346c784bf3
|
Merge branch '3.1.x' into 3.2.x
|
2017-06-05 11:02:30 +02:00 |
|
Marc Alexander
|
a6939fcb8e
|
Merge pull request #4784 from rubencm/ticket/15150
[ticket/15150] Add Jabber SSL context configuration options
|
2017-06-05 11:00:38 +02:00 |
|
Marc Alexander
|
df2a0e0b00
|
Merge branch '3.2.x'
|
2017-06-05 10:54:46 +02:00 |
|
Marc Alexander
|
a282eb1328
|
Merge branch '3.1.x' into 3.2.x
|
2017-06-05 10:54:41 +02:00 |
|
Marc Alexander
|
fb29d79bc1
|
Merge pull request #4782 from nomind60s/ticket/14498
[ticket/14498] Don't display 'Who is online' members when permission is No
|
2017-06-05 10:54:31 +02:00 |
|
Marc Alexander
|
cfafc32694
|
Merge branch '3.2.x'
|
2017-06-03 11:43:13 +02:00 |
|
Marc Alexander
|
e10d563fc9
|
Merge branch '3.1.x' into 3.2.x
|
2017-06-03 11:43:09 +02:00 |
|
Marc Alexander
|
b357f78546
|
Merge pull request #4747 from ErnadoO/ticket/15132
[ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
|
2017-06-03 11:43:06 +02:00 |
|
Marc Alexander
|
2a8f3e0101
|
Merge branch '3.2.x'
|
2017-06-03 11:37:10 +02:00 |
|
Marc Alexander
|
4d4dbd52f7
|
Merge branch '3.1.x' into 3.2.x
|
2017-06-03 11:37:06 +02:00 |
|
Marc Alexander
|
58bd7a90a9
|
Merge pull request #4746 from ErnadoO/ticket/15131
[ticket/15131] Add variable to the 'core.mcp_main_modify_fork_sql' event
|
2017-06-03 11:37:02 +02:00 |
|
Erwan Nader
|
0914123391
|
[ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
PHPBB3-15132
|
2017-05-31 21:21:04 +02:00 |
|
Erwan Nader
|
e754a51acc
|
[ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' event
PHPBB3-15131
|
2017-05-31 21:04:22 +02:00 |
|
Marc Alexander
|
9a18d3e79c
|
Merge branch '3.2.x'
|
2017-05-30 19:10:22 +02:00 |
|
Marc Alexander
|
f63f9693d8
|
Merge branch '3.1.x' into 3.2.x
|
2017-05-30 19:09:21 +02:00 |
|
Marc Alexander
|
635f73bc06
|
Merge pull request #4690 from javiexin/ticket/15081
[ticket/15081] Add acp_ext_details_notice template event
|
2017-05-30 19:05:44 +02:00 |
|
Marc Alexander
|
145a3a2c75
|
Merge branch '3.2.x'
|
2017-05-29 12:14:10 +02:00 |
|
Marc Alexander
|
7dc288cb89
|
Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.x
|
2017-05-29 12:13:41 +02:00 |
|
Marc Alexander
|
0a3d290551
|
Merge branch '3.2.x'
|
2017-05-25 21:50:23 +02:00 |
|
Marc Alexander
|
8fcdf1747c
|
Merge pull request #4841 from DavidIQ/ticket/14992
[ticket/14992] Add temp index migration for removing duplicates
|
2017-05-25 21:50:13 +02:00 |
|
David Colón
|
9029a925aa
|
[ticket/14992] Add temp index migration for removing duplicates
|
2017-05-25 14:42:45 -04:00 |
|
Marc Alexander
|
cb3ce2b19a
|
Merge branch '3.2.x'
|
2017-05-25 19:38:02 +02:00 |
|
Marc Alexander
|
deb9240546
|
Merge pull request #4701 from DavidIQ/ticket/14992
[ticket/14992] Improve user_notifications table performance
|
2017-05-25 19:36:26 +02:00 |
|
David Colón
|
a6317dc52d
|
[ticket/14992] Reduce notification table col sizes
|
2017-05-25 09:40:58 -04:00 |
|
Marc Alexander
|
36763ab244
|
Merge branch '3.2.x'
|
2017-05-25 08:52:49 +02:00 |
|
Marc Alexander
|
de4b2eb620
|
Merge branch '3.1.x' into 3.2.x
|
2017-05-25 08:52:45 +02:00 |
|
Marc Alexander
|
3f58b5f9ab
|
Merge pull request #4717 from rmcgirr83/ticket/15107
[ticket/15107] Add message_parser to event
|
2017-05-25 08:52:41 +02:00 |
|
David Colón
|
4c67f65d5d
|
[ticket/14992] 'method' is needed for the unique index
|
2017-05-24 16:56:24 -04:00 |
|
David Colón
|
c2711fb6c4
|
[ticket/14992] Remove temp index migration
|
2017-05-23 14:01:30 -04:00 |
|
Marc Alexander
|
f3c782b358
|
[ticket/14992] Make unit tests run more verbose
PHPBB3-14992
|
2017-05-21 22:19:44 +02:00 |
|
javiexin
|
37c48a59c3
|
Merge branch 'ticket/15068' of https://github.com/javiexin/phpbb into ticket/15068
|
2017-05-21 18:25:57 +02:00 |
|
javiexin
|
60d6667eb4
|
[ticket/15068] Add template vars retrieval from the template object
Added tests.
PHPBB3-15068
|
2017-05-21 18:18:59 +02:00 |
|
Marc Alexander
|
ee95103ced
|
Merge branch '3.2.x'
|
2017-05-21 16:42:17 +02:00 |
|
Marc Alexander
|
37e30ad83e
|
Merge pull request #4822 from Louis7777/ticket/15212
[ticket/15212] Fix code box double horizontal scrollbars
|
2017-05-21 16:38:21 +02:00 |
|
Marc Alexander
|
0d1c6d46af
|
Merge branch '3.2.x'
|
2017-05-21 16:33:08 +02:00 |
|
Marc Alexander
|
6a69c6a006
|
Merge pull request #4834 from senky/ticket/15056
[ticket/15056] Update subforum icons with Mark forums read
|
2017-05-21 16:33:02 +02:00 |
|
Marc Alexander
|
bcc85ab679
|
[ticket/14992] Correctly remove table name and prefix from keys
PHPBB3-14992
|
2017-05-21 16:01:27 +02:00 |
|
Marc Alexander
|
3c9843dc42
|
Merge branch '3.2.x'
|
2017-05-21 14:20:12 +02:00 |
|
Marc Alexander
|
15e80cebe8
|
Merge branch '3.1.x' into 3.2.x
|
2017-05-21 14:20:08 +02:00 |
|
Marc Alexander
|
03c30d4bc6
|
Merge pull request #4838 from marc1706/ticket/15020
[ticket/15020] Add Event for mcp_topic_postrow_post_subject
|
2017-05-21 14:20:03 +02:00 |
|
Marc Alexander
|
11f968e774
|
[ticket/14992] Shorten index name for user_id and item_id
PHPBB3-14992
|
2017-05-21 14:18:10 +02:00 |
|