1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 05:20:56 +02:00
Commit Graph

11060 Commits

Author SHA1 Message Date
Marc Alexander
a70aa74dd1 Merge branch '3.2.x' 2018-10-10 22:49:14 +02:00
Marc Alexander
40332ecfcc Merge pull request #5374 from senky/ticket/15758
[ticket/15758] Show translated msg for INSECURE_REDIRECT
2018-10-10 22:49:08 +02:00
Marc Alexander
8b6eddd50b Merge branch '3.2.x' 2018-10-09 22:59:16 +02:00
Marc Alexander
6087f0347c Merge pull request #5377 from senky/ticket/15700
[ticket/15700] Use correct T_THEME_LANG_NAME
2018-10-09 22:58:32 +02:00
Marc Alexander
466d331fec Merge pull request #5313 from senky/ticket/12628
[ticket/12628] Introduce debug.memory
2018-10-09 14:05:42 +02:00
Marc Alexander
49f0680a18 Merge pull request #5004 from JoshyPHP/ticket/15410
[ticket/15410] Remove obsolete code from BBCodes ACP
2018-10-09 08:54:07 +02:00
Marc Alexander
3aae3eea0e Merge branch '3.2.x' 2018-10-09 08:07:54 +02:00
Marc Alexander
ae672b0c7f Merge pull request #5326 from rubencm/ticket/15762
[ticket/15762] Update type for forum_topics_per_page
2018-10-09 08:07:49 +02:00
Marc Alexander
0b16ded3ca Merge branch '3.2.x' 2018-10-08 22:28:06 +02:00
Marc Alexander
6e61804e45 Merge pull request #5370 from senky/ticket/15805
[ticket/15805] Add result to core.login_box_redirect
2018-10-08 22:27:55 +02:00
Marc Alexander
362123be48 Merge branch '3.2.x' 2018-10-08 22:22:05 +02:00
Marc Alexander
2de198e30d Merge pull request #5354 from Elsensee/ticket/15329
[ticket/15329] Parse drafts before saving them (and decode)
2018-10-08 22:21:55 +02:00
Marc Alexander
dd236c6bc9 Merge branch '3.2.x' 2018-10-08 22:08:33 +02:00
Marc Alexander
b8c5537948 Merge pull request #5343 from senky/ticket/15716
[ticket/15716] Remove OAuth data upon user deletion
2018-10-08 22:07:35 +02:00
Marc Alexander
74b5c48aec Merge branch '3.2.x' 2018-10-08 21:49:07 +02:00
Marc Alexander
bcd4b01071 Merge pull request #5338 from senky/ticket/15420
[ticket/15420] Only update quote notification with original author
2018-10-08 21:48:56 +02:00
Marc Alexander
6ea9ed57b7 Merge branch '3.2.x' 2018-10-08 21:35:50 +02:00
Marc Alexander
dd43c6a61e Merge pull request #5296 from MikelAlejoBR/ticket/15622
[ticket/15622] Fix quoting in PMs when BBCodes are disabled
2018-10-08 21:35:38 +02:00
Marc Alexander
d3aae52d66 Merge branch '3.2.x' 2018-10-08 21:24:04 +02:00
Marc Alexander
8bdb2ce6ba Merge pull request #5220 from senky/ticket/15662
[ticket/15662] Add $this->template to core.modify_notification_message
2018-10-08 21:23:54 +02:00
Marc Alexander
7ed89f3c4b Merge branch '3.2.x' 2018-10-08 21:06:19 +02:00
Marc Alexander
426d8ce79f Merge pull request #5152 from senky/ticket/15579
[ticket/15579] Add ucp_front events
2018-10-08 21:04:56 +02:00
Jakub Senko
d29d4389f9 [ticket/15758] Show translated msg for INSECURE_REDIRECT
PHPBB3-15758
2018-09-28 12:27:55 +02:00
Jakub Senko
dab4c10c2f [ticket/15700] Use correct T_THEME_LANG_NAME
PHPBB3-15700
2018-09-25 15:24:34 +02:00
Jakub Senko
1d0fdc446f [ticket/15805] Add result to core.login_box_redirect
PHPBB3-15805
2018-09-24 16:09:51 +02:00
Marc Alexander
9929ff1fef [ticket/15772] Remove not needed check for IN_INSTALL
PHPBB3-15772
2018-09-22 22:20:30 +02:00
rubencm
f3a2c99a14 [ticket/15772] Hide warning in acp when allow_install_dir is true
PHPBB3-15772
2018-09-22 12:08:32 +02:00
Marc Alexander
ca04dca6e9 Merge branch '3.2.x' 2018-09-17 21:01:51 +02:00
Marc Alexander
9000936926 Merge pull request #5292 from rubencm/ticket/15723
[ticket/15723] Rewrite gen_rand_string() and gen_rand_string_friendly()
2018-09-17 21:01:45 +02:00
MikelAlejoBR
4396bfba65 [ticket/15622] Rename function to avoid potential future conflicts
PHPBB3-15622
2018-09-16 19:23:30 +02:00
MikelAlejoBR
e17f00fb6b [ticket/15622] Remove "since" tag as it belongs to events
PHPBB3-15622
2018-09-16 19:23:16 +02:00
Marc Alexander
d2c5c65682 Merge branch '3.2.x' 2018-09-16 17:15:29 +02:00
Marc Alexander
a505a3adf9 Merge pull request #5309 from Zoddo/ticket/15737
[ticket/15737] Add $user_rows to core.delete_user_before
2018-09-16 17:15:24 +02:00
Jakub Senko
1a284ebe8d [ticket/15579] Add ucp_front events
PHPBB3-15579
2018-09-16 14:20:49 +02:00
Jakub Senko
0725723813 [ticket/15662] Add template
PHPBB3-15662
2018-09-16 14:19:13 +02:00
Marc Alexander
d80b208a4b Merge pull request #5303 from senky/ticket/11838
[ticket/11838] OAuth registration from ucp_register
2018-09-16 13:26:19 +02:00
Marc Alexander
ca408a899c Merge branch '3.2.x' 2018-09-16 13:15:05 +02:00
Marc Alexander
3e85190798 Merge pull request #5305 from MikelAlejoBR/ticket/15733
[ticket/15733] Remove unused code related to deprecated flood control
2018-09-16 13:14:59 +02:00
Marc Alexander
e7b7c66c77 Merge pull request #5248 from rubencm/ticket/15692
[ticket/15692] Move checks if file exists from adapter to storage
2018-09-16 13:05:35 +02:00
Marc Alexander
9ab4e3b958 Merge pull request #5288 from rubencm/ticket/15413
[ticket/15413] Login redirect to previous page
2018-09-16 11:36:51 +02:00
Marc Alexander
62e191826d Merge branch '3.2.x' 2018-09-16 11:27:11 +02:00
Marc Alexander
eb5d61044c Merge pull request #5160 from kasimi/ticket/15590
[ticket/15590] Add events core.acp_bbcodes_(modify_create|delete)_after
2018-09-16 11:27:03 +02:00
Oliver Schramm
0d7c33c1af [ticket/15329] Parse drafts before saving them (and decode)
PHPBB3-15329
2018-09-14 14:54:51 +02:00
Derky
5367c09ec0 Merge branch '3.2.x' 2018-09-14 14:43:48 +02:00
Derky
1991df9519 Merge pull request #5349 from rubencm/ticket/15566
[ticket/15566] Set category to none if extension don't exist
2018-09-14 14:40:46 +02:00
rubencm
af5a2c4a20 [ticket/15566] Add missing variable sign
PHPBB3-15566
2018-09-13 15:26:17 +00:00
rubencm
0898c4c1cc [ticket/15566] Set category to none if extension don't exist
PHPBB3-15566
2018-09-13 11:55:05 +00:00
Jakub Senko
0f10c6ff6f [ticket/15716] Remove OAuth data upon user deletion
PHPBB3-15716
2018-09-06 21:34:19 +02:00
Jakub Senko
4a30818e12 [ticket/15420] Only update quote notification with original author
PHPBB3-15420
2018-09-04 14:30:19 +02:00
Rubén Calvo
9719d5a3d5 [ticket/15762] Update type for forum_topics_per_page in acp_forums
PHPBB3-15762
2018-08-30 19:05:12 +02:00