Marc Alexander
35b7a4fae5
Merge branch 'prep-release-3.1.11' into prep-release-3.2.1
2017-06-25 21:53:12 +02:00
Marc Alexander
65f7137825
[prep-release-3.1.11] Add migration for update to 3.1.11-RC1
2017-06-25 17:45:07 +02:00
Marc Alexander
848cc8c5e6
Merge branch '3.2.x'
2017-06-25 17:27:50 +02:00
Marc Alexander
4f81c94a95
Merge branch '3.1.x' into 3.2.x
2017-06-25 17:27:47 +02:00
David Colón
cc556122f3
[ticket/14982] Always do a ban check except on contact me form
...
PHPBB3-14982
2017-06-25 15:32:49 +02:00
Marc Alexander
c876392b98
Merge branch '3.2.x'
2017-06-25 14:13:58 +02:00
Agris
ba5a2bcb73
[ticket/15251] Use dispatcher_interface in help manager
...
Allow TraceableEventDispatcher for webprofiler
PHPBB3-15251
2017-06-25 12:02:25 +02:00
Marc Alexander
fd9a084386
Merge branch '3.2.x'
2017-06-25 10:32:43 +02:00
Marc Alexander
774c79c631
Merge branch '3.1.x' into 3.2.x
2017-06-25 10:32:39 +02:00
Marc Alexander
ea8334b693
Merge pull request #4850 from rxu/ticket/15246
...
[ticket/15246] Allow use of Unix socket as memcache(d) host
2017-06-25 10:32:35 +02:00
Marc Alexander
1660f7e52c
Merge branch '3.2.x'
2017-06-25 10:24:15 +02:00
Marc Alexander
868ae09e1b
Merge pull request #4843 from rxu/ticket/15238
...
[ticket/15238] Add console command to fix forums/modules left/right IDs
2017-06-25 10:20:49 +02:00
Marc Alexander
1b3bdddfd1
Merge branch '3.2.x'
2017-06-25 10:10:14 +02:00
Marc Alexander
c5501d90a4
Merge pull request #4824 from senky/ticket/15217
...
[ticket/15217] Add core.user_format_date_override event
2017-06-25 10:10:09 +02:00
Marc Alexander
976d799ff2
Merge branch '3.2.x'
2017-06-24 21:42:54 +02:00
Marc Alexander
b59073cf3e
Merge pull request #4794 from lr94/ticket/15176
...
[ticket/15176] Add setting for user activity display limit.
2017-06-24 21:42:39 +02:00
rxu
f3403fb10d
[ticket/15238] Add missing protected keyword
...
PHPBB3-15238
2017-06-20 21:07:11 +07:00
rxu
9402339af9
[ticket/15238] Add missing protected keyword
...
PHPBB3-15238
2017-06-20 21:06:01 +07:00
rxu
840cb510e4
[ticket/15238] More code cleanup
...
PHPBB3-15238
2017-06-18 23:15:05 +07:00
rxu
c1fa252fc1
[ticket/15238] Code cleanup, add docblocks
...
PHPBB3-15238
2017-06-18 23:14:09 +07:00
rxu
fd822ade20
[ticket/15238] Add console command to fix forums/modules left/right IDs
...
PHPBB3-15238
2017-06-18 23:14:09 +07:00
rxu
7f08d46aa4
[ticket/15238] More code cleanup
...
PHPBB3-15238
2017-06-18 23:11:44 +07:00
rxu
b0ed1f2388
[ticket/15238] Code cleanup, add docblocks
...
PHPBB3-15238
2017-06-18 23:11:27 +07:00
rxu
8a8d435ed4
[ticket/15238] Add console command to fix forums/modules left/right IDs
...
PHPBB3-15238
2017-06-18 23:11:12 +07:00
Marc Alexander
4303ae9ae6
[ticket/security/124] Filter out disallowed search query items
...
SECURITY-124
2017-06-18 12:15:46 +02:00
rxu
c255e1fae8
[ticket/15246] Allow use of Unix socket as memcache(d) host
...
PHPBB3-15246
2017-06-17 15:42:08 +07:00
Marc Alexander
011aa0a125
Merge branch '3.2.x'
2017-06-16 19:49:13 +02:00
Rubén Calvo
e6bdba7da1
[ticket/15243] Check permissions before installing with SQLite
...
PHPBB3-15243
2017-06-15 16:56:19 +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
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
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
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
Jakub Senko
27b2d91713
[ticket/15217] Add core.user_format_date_override event
...
PHPBB3-15217
2017-06-05 13:02:05 +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
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
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
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
Marc Alexander
a079c5fed0
Merge branch 'ticket/15178' into ticket/15179
2017-05-31 20:20:43 +02:00
Marc Alexander
145a3a2c75
Merge branch '3.2.x'
2017-05-29 12:14:10 +02:00
