1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-03 23:43:10 +02:00

34026 Commits

Author SHA1 Message Date
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
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
Marc Alexander
310162fd1c
Merge branch '3.3.x' 2020-03-03 21:40:06 +01:00
Marc Alexander
447a5391ed
Merge pull request #5873 from marc1706/ticket/16325
[ticket/16325] Ensure lock file is opened for updating
2020-03-03 21:40:01 +01:00
Marc Alexander
395f9efa89
Merge branch '3.3.x' 2020-03-03 21:22:17 +01:00
Marc Alexander
7345f1ce2e
Merge branch '3.2.x' into 3.3.x 2020-03-03 21:22:12 +01:00
Marc Alexander
75abae80fd
Merge pull request #5878 from mrgoldy/ticket/16377
[ticket/16377] Rename navlinks loop variable
2020-03-03 21:22:07 +01:00
Dark❶
70513f8da4
[ticket/16370] Add core events for Notification
PHPBB3-16370
2020-03-04 01:41:37 +05:30
Marc Alexander
74b86bd2fc
Merge branch '3.3.x' 2020-03-03 19:47:47 +01:00
Marc Alexander
d5acfc5c2f
Merge branch '3.2.x' into 3.3.x 2020-03-03 19:47:43 +01:00
Marc Alexander
83c886781d
Merge pull request #5876 from mrgoldy/ticket/16163
[ticket/16163] Notice when no posts inside MCP topic
2020-03-03 19:47:38 +01:00
Marc Alexander
a5a1379a97
Merge branch '3.3.x' 2020-03-03 18:03:27 +01:00
Marc Alexander
1215c3ddbf
Merge branch '3.2.x' into 3.3.x 2020-03-03 18:03:23 +01:00
Marc Alexander
ea1a4ffbb8
Merge pull request #5875 from mrgoldy/ticket/16289
[ticket/16289] Correct ampersand in report notification email
2020-03-03 18:03:17 +01:00
mrgoldy
cada6f294d [ticket/15438] Correct log language strings: remove excessive o
PHPBB3-15438
2020-03-02 21:58:19 +01:00
mrgoldy
4ade2789f6 [ticket/15438] Correct log language strings
PHPBB3-15438
2020-03-02 21:22:19 +01:00
Marc Alexander
10f6d65469
Merge branch '3.3.x' 2020-03-02 21:01:49 +01:00
Marc Alexander
c06f224ace
Merge branch '3.2.x' into 3.3.x 2020-03-02 20:52:11 +01:00
Marc Alexander
bb21336191
Merge pull request #5872 from dark-1/ticket/16384
[ticket/16384] Add template events friends list username {prepend/append}
2020-03-02 20:52:06 +01:00
Marc Alexander
f2392b4689
Merge branch '3.3.x' 2020-03-02 20:47:00 +01:00
Marc Alexander
d32030a374
Merge branch '3.2.x' into 3.3.x 2020-03-02 20:46:55 +01:00
Marc Alexander
adf10ef492
Merge pull request #5871 from dark-1/ticket/16383
[ticket/16383] Add core events to modify friends list
2020-03-02 20:46:50 +01:00
Marc Alexander
990408da2f
Merge branch '3.3.x' 2020-03-02 20:41:38 +01:00
Marc Alexander
6788d82316
Merge branch '3.2.x' into 3.3.x 2020-03-02 20:41:33 +01:00
Marc Alexander
a470f0a6db
Merge pull request #5870 from dark-1/ticket/16381
[ticket/16381] Add core event to Modify Topics SQL
2020-03-02 20:41:26 +01:00