Marc Alexander
797bde42aa
Merge branch '3.2.x'
2017-06-25 11:07:13 +02:00
Marc Alexander
b28dc339f0
Merge branch '3.1.x' into 3.2.x
2017-06-25 11:06:47 +02:00
Marc Alexander
689ebd3bb6
Merge pull request #4855 from dsinn/ticket/15250
...
[ticket/15250] Add core event to MCP at the end of merge_posts
2017-06-25 11:05:40 +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
3b8a155de0
Merge pull request #4848 from rubencm/ticket/15203
...
[ticket/15203] Include missing constants in web installer
2017-06-25 10:29:49 +02:00
Marc Alexander
1660f7e52c
Merge branch '3.2.x'
2017-06-25 10:24:15 +02:00
Marc Alexander
e45ba1d279
Merge branch '3.1.x' into 3.2.x
2017-06-25 10:23:53 +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
e50e5dbcae
Merge pull request #4842 from rxu/ticket/15238-3.1
...
[ticket/15238] Add console command to fix forums/modules left/right IDs
2017-06-25 10:20:19 +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
Marc Alexander
d77c018d7f
Merge branch '3.2.x'
2017-06-24 21:32:14 +02:00
Marc Alexander
909976f076
Merge pull request #4856 from rxu/ticket/15252
...
[ticket/15252] Fix editing a topic with poll by user not permitted to edit poll
2017-06-24 21:31:39 +02:00
rxu
14cea02412
[ticket/15252] Fix editing a topic with poll by user not permitted to edit poll
...
Basically, decoding the original poll title and options text was missing.
PHPBB3-15252
2017-06-21 22:22:47 +07:00
Daniel Sinn
127f5a3ffa
[ticket/15250] Add core event to MCP at the end of merge_posts
...
PHPBB3-15250
2017-06-20 17:56:48 -04: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
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
059c08181e
Merge branch '3.2.x'
2017-06-16 20:18:55 +02:00
Marc Alexander
7301748a3a
Merge branch '3.1.x' into 3.2.x
2017-06-16 20:18:50 +02:00
Marc Alexander
1c4f49249f
Merge pull request #4845 from javiexin/ticket/15241
...
[ticket/15241] Add ACP template event acp_profile_contact_last
2017-06-16 20:18:46 +02:00
Marc Alexander
011aa0a125
Merge branch '3.2.x'
2017-06-16 19:49:13 +02:00
Marc Alexander
c555bd78df
Merge pull request #4849 from rubencm/ticket/15243
...
[ticket/15243] Check permissions before installing with SQLite
2017-06-16 19:49:08 +02:00
Rubén Calvo
e6bdba7da1
[ticket/15243] Check permissions before installing with SQLite
...
PHPBB3-15243
2017-06-15 16:56:19 +02:00
Rubén Calvo
833a4c9e95
[ticket/15203] Remove require since is already in startup.php
...
PHPBB3-15203
2017-06-14 08:37:12 +02:00
Rubén Calvo
0f941a8db2
[ticket/15203] Include missing constants in web installer
...
PHPBB3-15203
2017-06-14 06:12:02 +02:00
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
javiexin
ecdc05a13e
[ticket/15241] Add ACP template event acp_profile_contact_last
...
Event to place code in Profile Field configuration screen,
as additional information for Contact Profile Fields.
PHPBB-15241
2017-06-05 15:14:42 +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
cfa56ed3b8
Merge branch '3.2.x'
2017-06-05 11:57:37 +02:00
