Commit graph

34049 commits

Author SHA1 Message Date
Marc Alexander
ffd7ebf05e
Merge branch '3.3.x' 2020-03-15 17:25:55 +01:00
Marc Alexander
8df557f621
Merge branch '3.2.x' into 3.3.x 2020-03-15 17:25:51 +01:00
Marc Alexander
8b8606349e
Merge pull request #5904 from 3D-I/ticket/13914
[ticket/13914] Cast to INT mixed style ID data in user setup
2020-03-15 17:25:46 +01:00
Marc Alexander
777f91bf39
Merge pull request #5910 from marc1706/ticket/16405
[ticket/16405] Update npm dependencies to latest versions
2020-03-15 17:11:14 +01:00
Marc Alexander
6951e970f3
Merge branch '3.3.x' 2020-03-15 16:52:41 +01:00
Marc Alexander
2b8b04dd55
Merge pull request #5898 from mrgoldy/ticket/16225
[ticket/16225] Display style version in ACP
2020-03-15 16:52:37 +01:00
Marc Alexander
07caac9832
Merge branch '3.3.x' 2020-03-15 16:30:39 +01:00
Marc Alexander
f703f3f20e
Merge branch '3.2.x' into 3.3.x 2020-03-15 16:30:34 +01:00
Marc Alexander
2d39d34ab5
Merge pull request #5897 from mrgoldy/ticket/16245
[ticket/16245] Cast attachment filesize to bigint
2020-03-15 16:30:29 +01:00
Marc Alexander
a92a6d3f47
[ticket/16405] Update npm dependencies to latest versions
PHPBB3-16405
2020-03-15 15:50:44 +01:00
Marc Alexander
b0fae02633
Merge branch '3.3.x' 2020-03-15 15:44:46 +01:00
Marc Alexander
671efc0726
Merge branch '3.2.x' into 3.3.x 2020-03-15 15:44:41 +01:00
Marc Alexander
d17b554666
Merge pull request #5888 from mrgoldy/ticket/16388
[ticket/16388] Add online_list_before template events
2020-03-15 15:44:37 +01:00
Marc Alexander
3cf3c1a256
Merge branch '3.3.x' 2020-03-15 15:38:17 +01:00
Marc Alexander
7557af0594
Merge pull request #5885 from 3D-I/ticket/16394
[ticket/16394] Fix access array offset in MCP topic approval - PHP 7.4
2020-03-15 15:38:12 +01:00
3D-I
e5f88a1462 [ticket/13914] Cast to INT mixed style ID data in user setup
PHPBB3-13914
2020-03-15 04:43:31 +01:00
mrgoldy
4c0a1ec0a0 [ticket/16225] Display style version in ACP
PHPBB3-16225
2020-03-12 22:43:05 +01:00
mrgoldy
8dd76e6e2f [ticket/16245] Cast attachment filesize to bigint
PHPBB3-16245
2020-03-12 22:13:14 +01:00
Marc Alexander
edba2a9434
Merge branch '3.3.x' 2020-03-11 07:00:30 +01:00
Marc Alexander
4f43bc9226
Merge pull request #5887 from marc1706/ticket/16396-master
[ticket/16396] Use new php-webdriver instead of facebook webdriver
2020-03-11 07:00:24 +01:00
Marc Alexander
b732b4d8c8
Merge pull request #5886 from marc1706/ticket/16396
[ticket/16396] Use new php-webdriver instead facebook webdriver
2020-03-11 06:59:52 +01:00
mrgoldy
3b82c8cb10 [ticket/16388] Add online_list_before template events
PHPBB3-16388
2020-03-09 22:04:20 +01:00
Marc Alexander
3c038429b8
Merge branch 'ticket/16396' into ticket/16396-master 2020-03-09 18:06:44 +01:00
Marc Alexander
b9919f7c88
[ticket/16396] Use new php-webdriver instead facebook webdriver
The dependency has been renamed and updated.

PHPBB3-16396
2020-03-09 18:03:17 +01:00
Marc Alexander
015ee4c5ff
Merge branch '3.3.x' 2020-03-09 17:48:23 +01:00
Marc Alexander
2e9b3fc31e
Merge branch '3.2.x' into 3.3.x 2020-03-09 17:48:19 +01:00
Marc Alexander
0a089c8656
Merge pull request #5877 from mrgoldy/ticket/16121
[ticket/16121] Footer classes in simple_footer
2020-03-09 17:48:14 +01:00
Marc Alexander
6d5c2a276d
Merge branch '3.3.x' 2020-03-08 17:14:34 +01:00
Marc Alexander
a82afd6ccf
Merge branch '3.2.x' into 3.3.x 2020-03-08 17:14:11 +01:00
Marc Alexander
7f59805852
Merge pull request #5884 from marc1706/ticket/16392-master
[ticket/16392] Update composer dependencies for master
2020-03-08 17:13:57 +01:00
Marc Alexander
4fc58068c9
Merge pull request #5883 from marc1706/ticket/16392-3.3
[ticket/16392] Update composer dependencies for 3.3
2020-03-08 17:13:37 +01:00
Marc Alexander
fccae1009b
Merge pull request #5882 from marc1706/ticket/16392
[ticket/16392] Update composer dependencies for 3.2
2020-03-08 17:12:57 +01:00
3D-I
5dac5fdb3b [ticket/16394] Fix access array offset in MCP topic approval
PHPBB3-16394
2020-03-08 00:48:32 +01:00
Marc Alexander
bb6c5def59
Merge branch '3.3.x' 2020-03-07 14:15:43 +01:00
Marc Alexander
ddc8e5c712
Merge branch '3.2.x' into 3.3.x 2020-03-07 14:15:38 +01:00
Marc Alexander
3c07c8c2a0
Merge pull request #5862 from dark-1/ticket/16370
[ticket/16370] Add core events for Notification
2020-03-07 14:15:32 +01:00
Marc Alexander
2792c8ac6a
[ticket/16392] Update composer dependencies for master
PHPBB3-16392
2020-03-06 20:47:36 +01:00
Marc Alexander
4efd1b132d
Merge branch 'ticket/16392-3.3' into ticket/16392-master 2020-03-06 20:45:49 +01:00
Marc Alexander
c97a9b0b19
[ticket/16392] Update dependencies for 3.3
PHPBB3-16392
2020-03-06 20:35:50 +01:00
Marc Alexander
57326be5bf
Merge branch 'ticket/16392' into ticket/16392-3.3 2020-03-06 20:33:18 +01:00
Marc Alexander
7e589a529d
[ticket/16392] Update composer dependencies for 3.2
PHPBB3-16392
2020-03-04 17:54:02 +01:00
Marc Alexander
6afa29eb5c
[ticket/16392] Update composer to 1.9.3
PHPBB3-16392
2020-03-04 17:52:31 +01:00
Marc Alexander
95090f791e
Merge branch '3.3.x' 2020-03-04 17:48:53 +01:00
Marc Alexander
d7c3d59799
Merge pull request #5845 from bwoebi/patch-1
[ticket/16363] Allow replying to locked topics if user has m_lock permissions
2020-03-04 17:48:48 +01:00
Marc Alexander
2dd3cf22fb
Merge branch '3.3.x' 2020-03-04 17:45:42 +01:00
Marc Alexander
1c8e7a3483
Merge branch '3.2.x' into 3.3.x 2020-03-04 17:45:36 +01:00
Marc Alexander
a88e640924
Merge pull request #5880 from mrgoldy/ticket/15438
[ticket/15438] Correct log language strings: from > for
2020-03-04 17:45:30 +01:00
Marc Alexander
c14efc0ded
Merge branch '3.3.x' 2020-03-03 22:02:36 +01:00
Marc Alexander
3c27aa2f2e
Merge branch '3.2.x' into 3.3.x 2020-03-03 21:59:05 +01:00
Marc Alexander
0614a1a57f
Merge pull request #5857 from mrgoldy/ticket/16358
[ticket/16358] Hide attachment tab with no filters and display ACP notice
2020-03-03 21:59:00 +01:00