1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:11:47 +02:00
Commit Graph

4650 Commits

Author SHA1 Message Date
Marc Alexander
3d36211101 Merge branch '3.3.x' 2020-09-10 12:43:45 +02:00
Marc Alexander
c141962dc8 Merge pull request #6018 from rxu/ticket/16544
[ticket/16544] Use forum_notify.txt for forum subscription email notifications
2020-09-10 12:43:40 +02:00
Marc Alexander
17c4fe6f9e Merge branch '3.3.x' 2020-09-08 20:41:52 +02:00
William Desportes
fedfc330ef [ticket/16587] Fix phpdoc errors reported by Doctum
PHPBB3-16587
2020-09-07 12:11:31 +02:00
rxu
02f54ef219 [ticket/16544] Fix notifications tests
PHPBB3-16544
2020-09-02 22:11:51 +07:00
rxu
aa76f6b9f2 [ticket/16544] Use forum_notify.txt for forum subscription email notifications
PHPBB3-16544
2020-09-02 22:11:51 +07:00
Marc Alexander
10dbc2878c Merge pull request #5334 from rubencm/ticket/12630
[ticket/12630] Add debug.url_matcher
2020-08-30 14:49:38 +02:00
Marc Alexander
2c65df7185 Merge branch '3.3.x' 2020-08-30 14:47:35 +02:00
Marc Alexander
0d3dd61ad4 Merge pull request #6007 from rxu/ticket/16526
[ticket/16526] Correctly handle ACP CSV settings
2020-08-30 14:47:20 +02:00
rubencm
92c31dd454 [ticket/12630] Use di to inject parameter
PHPBB3-12630
2020-08-30 10:47:28 +00:00
rubencm
21fac34854 [ticket/15765] Change parameter to true
PHPBB3-15765
2020-08-30 10:32:38 +02:00
Marc Alexander
59e5f17cd6 Merge branch '3.3.x' 2020-08-28 21:14:40 +02:00
Marc Alexander
5d0f7229e3 Merge pull request #6019 from rxu/ticket/16488
[ticket/16488] Fix not displaying min input element attribute when 0
2020-08-28 21:14:12 +02:00
Marc Alexander
bd407fd866 [ticket/16488] Add test for min value 0 as min number
PHPBB3-16488
2020-08-27 20:41:38 +02:00
Marc Alexander
e61dcc9590 Merge branch '3.3.x' 2020-08-23 16:49:44 +02:00
Marc Alexander
c1ce0153ea Merge pull request #5981 from ansavin/ticket/16366
[ticket/16366] Make viewtopic lang vars available in feed pages
2020-08-23 16:49:36 +02:00
Marc Alexander
d095a8537d Merge branch '3.3.x' 2020-08-23 16:47:13 +02:00
JoshyPHP
762d9fcf7b [ticket/16580] Updated email-related test
This ensures that re-activating email fields does not introduce any exploit

PHPBB3-16580
2020-08-20 14:35:38 +02:00
JoshyPHP
62333f0ca2 [ticket/16580] Updated regression tests
PHPBB3-16580
2020-08-20 14:35:38 +02:00
JoshyPHP
1ac142347e [ticket/16580] Update rendering tests to match actual Prosilver
PHPBB3-16580
2020-08-20 14:35:38 +02:00
hanakin
277a5b4229 [ticket/16237] remove fontawsome tests
PHPBB3-16237
2020-08-19 10:40:06 -10:00
hanakin
02fcfe5700 [ticket/16237] fix errors
PHPBB3-16237
2020-08-19 10:40:06 -10:00
rubencm
490ddbc2cd [ticket/16346] Fix method arguments
PHPBB3-16346
2020-08-14 18:42:50 +00:00
rubencm
758c28ca69 [ticket/16346] More fixes
PHPBB3-16346
2020-08-14 08:29:14 +00:00
rubencm
b13fb3298f [ticket/16346] Remove code in test
PHPBB3-16346
2020-08-14 08:29:14 +00:00
rubencm
774c609c4a [ticket/16345] Small improvements
PHPBB3-16346
2020-08-14 08:29:06 +00:00
rxu
0bc9d87891 [ticket/16538] Add identifiers quoting
If reserved word is used as identifier, it must be quoted.
If alias is used elsewhere in SQL statement, it must be quoted.

PHPBB3-16535
PHPBB3-16538
2020-08-14 04:51:11 +07:00
rxu
6cd54639b5 [ticket/16526] Adjust test to use better assertions
PHPBB3-16526
2020-08-14 04:30:20 +07:00
rxu
7ef87e3fbd [ticket/16512] Adjust test to use better assertions
PHPBB3-16512
2020-08-14 04:24:57 +07:00
rxu
68122fca27 [ticket/16512] Add user_ipwhois() test which internally uses make_clickable()
PHPBB3-16512
2020-08-14 04:24:55 +07:00
rxu
da4b446ac6 [ticket/16512] Fix make_clickable() to make use of custom link classes
PHPBB3-16512
2020-08-14 04:24:49 +07:00
Marc Alexander
3cceeb45bf Merge branch '3.3.x' 2020-08-13 21:16:33 +02:00
Marc Alexander
7d18ecd1bf Merge pull request #6012 from rxu/ticket/16533
[ticket/16533] Add autologin keys management UCP module events
2020-08-13 21:15:59 +02:00
ansavin
b3199265a2 [ticket/16366] Make viewtopic lang vars available in feed pages
We call add_lang('viewtopic') in feed controller and configure_user(...)
in generate_content() in order to make viewtopic language constants
avaliable for message parser when it is called from feed controller

PHPBB3-16366
2020-08-13 16:46:23 +02:00
Marc Alexander
aae367e394 Merge branch '3.3.x' 2020-08-12 21:47:12 +02:00
Marc Alexander
1c724d0860 Merge pull request #6009 from iMattPro/ticket/16527
[ticket/16527] Add a role_exists method to permissions migrator tool
2020-08-12 21:46:50 +02:00
kasimi
0daf6ccbcb [ticket/16565] Fixed cron.manager tests
PHPBB3-16565
2020-08-12 12:51:59 +02:00
Marc Alexander
f729887320 Merge pull request #5969 from mrgoldy/ticket/16472
[ticket/16472] [3.3.x] Remove UI tests
2020-08-10 17:27:27 +02:00
Marc Alexander
970d7ae91d Merge branch 'ticket/16472' into ticket/16472-master 2020-08-09 13:48:44 +02:00
Marc Alexander
5f0b3c2141 Merge branch '3.3.x' 2020-08-06 17:44:03 +02:00
Marc Alexander
21d656907a Merge branch '3.3.x' 2020-08-06 17:23:05 +02:00
Marc Alexander
2a8239075e Merge branch '3.2.x' into 3.3.x 2020-08-06 17:21:58 +02:00
Marc Alexander
3be435561a Merge branch 'prep-release-3.2.10' into prep-release-3.3.1 2020-07-25 11:18:09 +02:00
Marc Alexander
a378e0eb0c Merge pull request #61 from phpbb/ticket/security-259
[ticket/security-259] Stop checking image size of images in img BBCode
2020-07-25 11:16:07 +02:00
Marc Alexander
8e5a635bfb Merge pull request #60 from phpbb/ticket/security/257
[ticket/security/257] Enforce http(s) for URLs in image BBCode
2020-07-25 11:16:04 +02:00
Marc Alexander
2c04ce7a61 Merge branch 'prep-release-3.2.10' into prep-release-3.3.1 2020-07-22 10:08:47 +02:00
Marc Alexander
df49e0e993 Merge pull request #6006 from rxu/ticket/16524
[ticket/16524] Fix using out-of-bounds UTF8 characters in profile fields
2020-07-22 10:08:00 +02:00
3D-I
4aa3a80558 [ticket/16552] Roll back to FontAwesome 4.7
PHPBB3-16552
2020-07-21 11:58:28 +02:00
rxu
befab4f3c1 [ticket/16524] Remove u_emoji permission checks
PHPBB3-16524
2020-07-21 11:00:41 +02:00
rxu
ab3d8ade72 [ticket/16524] Add test
PHPBB3-16524
2020-07-21 11:00:16 +02:00