1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-11 03:12:21 +02:00

33122 Commits

Author SHA1 Message Date
Marc Alexander
f4462bdfd6
Merge branch '3.3.x' 2019-09-28 12:57:43 +02:00
Marc Alexander
a85bb1332d
Merge pull request #5480 from mrgoldy/ticket/15905
[ticket/15905] Create multiple twig extensions
2019-09-28 12:57:06 +02:00
Marc Alexander
f05022941d
[ticket/15905] Reset avatar manager enabled drivers property
PHPBB3-15905
2019-09-28 11:58:02 +02:00
Marc Alexander
e00a154882
[ticket/15905] Add tests for twig extensions
PHPBB3-15905
2019-09-26 22:33:52 +02:00
mrgoldy
f21003f977
[ticket/15905] Re-add add_class and lang_defined
PHPBB3-15905
2019-09-25 20:43:01 +02:00
mrgoldy
133dfd0a84
[ticket/15905] Try it without auth
PHPBB3-15905
2019-09-25 20:39:04 +02:00
mrgoldy
eee00652e7
[ticket/15905] Resolve conflicts
PHPBB3-15905
2019-09-25 20:08:40 +02:00
mrgoldy
7989f3f71f
[ticket/15905] Try with existing phpbb extension
PHPBB3-15905
2019-09-25 20:07:09 +02:00
mrgoldy
012fe18879
[ticket/15905] Correct line endings
PHPBB3-15905
2019-09-25 19:49:24 +02:00
mrgoldy
91b89b6374
[ticket/15905] Create multiple twig extensions
PHPBB3-15905
2019-09-25 19:49:17 +02:00
Marc Alexander
dc0374eca3
Merge branch '3.3.x' 2019-09-25 17:13:06 +02:00
Marc Alexander
36614e6f81
Merge pull request #5135 from senky/ticket/15564
[ticket/15564] Switch to Invisible reCAPTCHA
2019-09-25 17:13:00 +02:00
Jakub Senko
7fac5be2cc [ticket/15564] Improve wording
PHPBB3-15564
2019-09-24 14:04:40 +02:00
Jakub Senko
d7dd91d0e2 [ticket/15564] Improve wording since captcha can be invisible now
PHPBB3-15564
2019-09-24 14:04:32 +02:00
Jakub Senko
25d3292d30 [ticket/15564] Move recaptcha callbacks to global space
PHPBB3-15564
2019-09-24 14:04:23 +02:00
Jakub Senko
a05d744266 [ticket/15564] Move JS functions closer to related code
PHPBB3-15564
2019-09-24 14:04:14 +02:00
Jakub Senko
772e801d4f [ticket/15564] Don't use ES2015, it breaks UI tests
PHPBB3-15564
2019-09-24 14:04:04 +02:00
Jakub Senko
27153d7e46 [ticket/15564] Remove console.log() call
PHPBB3-15564
2019-09-24 14:03:55 +02:00
Jakub Senko
c0e9ef21fe [ticket/15564] Update ACP as well
PHPBB3-15564
2019-09-24 14:03:47 +02:00
Jakub Senko
0f3559528a [ticket/15564] Use es2015
PHPBB3-15564
2019-09-24 14:03:38 +02:00
Jakub Senko
760a03fffc [ticket/15564] Switch to Invisible reCAPTCHA
PHPBB3-15564
2019-09-24 14:03:27 +02:00
Marc Alexander
21bf3b1102 Merge branch '3.3.x' 2019-09-24 13:51:32 +02:00
Marc Alexander
a90f5e6bcc Merge pull request #5694 from marc1706/ticket/15436
[ticket/15436] Remove folder icons code from index
2019-09-24 13:51:27 +02:00
Marc Alexander
200271d872
Merge branch '3.3.x' 2019-09-23 17:37:22 +02:00
Marc Alexander
f4935ef500
Merge branch '3.2.x' into 3.3.x 2019-09-23 17:37:17 +02:00
Marc Alexander
9217b85c68
Merge pull request #5678 from rxu/ticket/16148
[ticket/16148] Add template events to acp_groups.html
2019-09-23 17:37:13 +02:00
Marc Alexander
a30e4de1e9
Merge branch '3.3.x' 2019-09-22 21:16:47 +02:00
Marc Alexander
ba945496b4
Merge branch '3.2.x' into 3.3.x 2019-09-22 21:16:42 +02:00
Marc Alexander
4ddd3511de
Merge pull request #5677 from mrgoldy/ticket/14815
[ticket/14815] Enable contact links in memberlist
2019-09-22 21:16:37 +02:00
Marc Alexander
70574ac2da
Merge branch '3.3.x' 2019-09-22 21:04:46 +02:00
Marc Alexander
ae08036b2c
Merge branch '3.2.x' into 3.3.x 2019-09-22 21:04:41 +02:00
Marc Alexander
16941ff495
Merge pull request #5676 from mrgoldy/ticket/15422
[ticket/15422] Remove redundant BBCode helpline
2019-09-22 21:04:36 +02:00
Marc Alexander
1ba63ddfab
Merge branch '3.3.x' 2019-09-22 16:59:13 +02:00
Marc Alexander
a028dfab12
Merge branch '3.2.x' into 3.3.x 2019-09-22 16:59:09 +02:00
Marc Alexander
70044669e0
Merge pull request #5665 from 3D-I/ticket/16139
[ticket/16139] Add core.viewtopic_modify_quick_reply_template_vars
2019-09-22 16:59:04 +02:00
Marc Alexander
a0428ff900
Merge branch '3.3.x' 2019-09-22 16:54:58 +02:00
Marc Alexander
914199d50f
Merge branch '3.2.x' into 3.3.x 2019-09-22 16:54:53 +02:00
Marc Alexander
344b603f42
Merge pull request #5669 from OxCom/ticket/16143
[ticket/16143] Add new events before and after move topics
2019-09-22 16:54:48 +02:00
Marc Alexander
8f6c2507a8
Merge branch '3.3.x' 2019-09-22 13:02:28 +02:00
Marc Alexander
7e8c6d8c0d
Merge branch '3.2.x' into 3.3.x 2019-09-22 13:02:24 +02:00
Marc Alexander
a4edb41e3f
Merge pull request #5664 from mrgoldy/ticket/16076
[ticket/16076] addFileFilter to check max file size per mime type
2019-09-22 13:02:19 +02:00
Marc Alexander
6b3e616777
Merge branch '3.3.x' 2019-09-22 12:17:50 +02:00
Marc Alexander
9454377e55
Merge branch '3.2.x' into 3.3.x 2019-09-22 12:05:05 +02:00
Marc Alexander
53aa79cd29
Merge pull request #5673 from AlfredoRamos/ticket/15643
[ticket/15643] Fix open_basedir warnings
2019-09-22 12:05:01 +02:00
mrgoldy
c9284e1c68 [ticket/16076] camelCase and callback
PHPBB3-16076
2019-09-22 12:04:10 +02:00
Marc Alexander
4aa778ba9e
Merge branch '3.3.x' 2019-09-21 14:33:29 +02:00
Marc Alexander
1ef43bc1a1
Merge branch '3.2.x' into 3.3.x 2019-09-21 14:33:25 +02:00
Marc Alexander
0b2a0cc9b4
Merge pull request #5687 from rxu/ticket/16157
[ticket/16157] Fix FORM_INVALID error in the sending email form
2019-09-21 14:33:20 +02:00
Marc Alexander
289849b5da
Merge branch '3.3.x' 2019-09-21 14:29:23 +02:00
Marc Alexander
13932e9aba
Merge branch '3.2.x' into 3.3.x 2019-09-21 14:29:18 +02:00