Marc Alexander
b51d809491
Merge pull request #4846 from rxu/ticket/15179
...
[ticket/15179] Fix indentation
2017-06-11 21:39:45 +02:00
rxu
467ff41e84
[ticket/15179] Fix indentation
...
PHPBB3-15179
2017-06-12 02:04:30 +07:00
Marc Alexander
a44f31ec42
Merge branch '3.2.x'
2017-06-11 19:09:02 +02:00
Marc Alexander
eafbaf4c30
Merge branch '3.1.x' into 3.2.x
2017-06-11 16:45:02 +02:00
Marc Alexander
c830af48bd
Merge pull request #4799 from marc1706/ticket/15179
...
[ticket/15179] Update dependencies and fix compatibility with newer twig
2017-06-11 16:44:15 +02:00
Marc Alexander
65c6bae91d
Merge pull request #4797 from marc1706/ticket/15178
...
[ticket/15178] Update dependencies for 3.1.x
2017-06-11 16:43:25 +02:00
Marc Alexander
70e30a0591
Merge pull request #4741 from flash1452/ticket/11515
...
[ticket/11515] Extra check after acquiring locks.
2017-06-11 16:40:48 +02:00
Tristan Darricau
5e6d8f44c9
Merge branch '3.2.x'
...
* 3.2.x:
[ticket/15219] Add console command for updating hashes to bcrypt
[ticket/15219] Add missing space
[ticket/15219] Update hashes to bcrypt with cron
2017-06-06 09:33:57 +02:00
Tristan Darricau
474cbe0574
Merge branch '3.1.x' into 3.2.x
...
* 3.1.x:
2017-06-06 09:33:36 +02:00
Tristan Darricau
1571c76ccd
Merge pull request #4826 from marc1706/ticket/15219-rhea
...
[ticket/15219] Update hashes to bcrypt with cron -- Rhea
* github.com:phpbb/phpbb:
[ticket/15219] Add console command for updating hashes to bcrypt
[ticket/15219] Add missing space
[ticket/15219] Update hashes to bcrypt with cron
2017-06-06 09:33:22 +02:00
Tristan Darricau
2a49420124
Merge pull request #4825 from marc1706/ticket/15219
...
[ticket/15219] Update hashes to bcrypt with cron
* github.com:phpbb/phpbb:
[ticket/15219] Add console command for updating hashes to bcrypt
[ticket/15219] Add missing space
[ticket/15219] Update hashes to bcrypt with cron
2017-06-06 09:32:45 +02:00
Marc Alexander
cfa56ed3b8
Merge branch '3.2.x'
2017-06-05 11:57:37 +02:00
Marc Alexander
34fb146ab5
Merge branch '3.1.x' into 3.2.x
2017-06-05 11:57:18 +02:00
Marc Alexander
05a8baffdb
Merge pull request #4840 from rmcgirr83/ticket_15237
...
[ticket/15237] Fix unguarded includes to functions_user
2017-06-05 11:56:22 +02:00
Marc Alexander
c0abca3c1a
Merge pull request #4836 from hanakin/ticket/15234
...
[ticket/15234] quickfix notification avatar sizes
2017-06-05 11:55:06 +02:00
Marc Alexander
92195ede52
Merge branch '3.2.x'
2017-06-05 11:53:07 +02:00
Marc Alexander
4177edf33a
Merge pull request #4833 from javiexin/ticket/15227
...
[ticket/15227] Check PHP version and remove old unused code
2017-06-05 11:53:02 +02:00
Marc Alexander
1377f13f36
Merge branch '3.2.x'
2017-06-05 11:44:13 +02:00
Marc Alexander
192d3932f6
Merge branch '3.1.x' into 3.2.x
2017-06-05 11:43:53 +02:00
Marc Alexander
3f6119c42b
Merge pull request #4818 from rxu/ticket/15205
...
[ticket/15205] Add template events prepending/appending subforum link
2017-06-05 11:22:13 +02:00
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
Marc Alexander
77d73678a1
Merge branch 'ticket/15219' into ticket/15219-rhea
2017-06-03 11:13:03 +02:00
Marc Alexander
170613848a
[ticket/15219] Add console command for updating hashes to bcrypt
...
PHPBB3-15219
2017-06-03 11:07:34 +02:00
Marc Alexander
e2c0356f34
[ticket/15179] Replace spaces with a tab
...
PHPBB3-15179
2017-06-03 10:01:28 +02:00
Michael Miday
686a8e6d3a
[ticket/15234] patch avatar sizes
...
PHPBB3-15234
2017-06-01 16:35:21 -04: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
a079c5fed0
Merge branch 'ticket/15178' into ticket/15179
2017-05-31 20:20:43 +02:00
Marc Alexander
e3ec1440ef
[ticket/15178] Run update again
...
PHPBB3-15178
2017-05-31 20:06:33 +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
