1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-14 21:56:39 +02:00
Commit Graph

11694 Commits

Author SHA1 Message Date
c14efc0ded Merge branch '3.3.x' 2020-03-03 22:02:36 +01:00
3c27aa2f2e Merge branch '3.2.x' into 3.3.x 2020-03-03 21:59:05 +01:00
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
0b8ecb4e22 Merge branch '3.3.x' 2020-03-01 18:58:28 +01:00
ffe201be36 Merge pull request #5864 from mrgoldy/ticket/16376
[ticket/16376] Add default for display_subforum_limit
2020-03-01 18:58:24 +01:00
a7bc774a53 Merge branch '3.3.x' 2020-03-01 17:11:18 +01:00
94419d4573 Merge branch '3.2.x' into 3.3.x 2020-03-01 17:11:09 +01:00
f59419ed7e Merge pull request #5856 from mrgoldy/ticket/16356
[ticket/16356] Delete attachments on saving a draft
2020-03-01 17:11:00 +01:00
eaea09047f Merge branch '3.3.x' 2020-03-01 16:50:31 +01:00
457f13ad0b Merge branch '3.2.x' into 3.3.x 2020-03-01 16:50:26 +01:00
aea5c3545c Merge pull request #5855 from mrgoldy/ticket/10506
[ticket/10506] Preserve attachments on not-saving PM draft
2020-03-01 16:50:20 +01:00
1d49ddd86f [ticket/16376] Add default for display_subforum_limit
PHPBB3-16376
2020-02-27 15:29:32 +01:00
fc541c1943 Merge branch '3.3.x' 2020-02-15 16:51:34 +01:00
b1f0276307 Merge branch '3.2.x' into 3.3.x 2020-02-15 16:46:02 +01:00
5ce1e1e7df Merge pull request #5849 from rubencm/ticket/16351
[ticket/16351] Use CHMOD constants from filesystem_interface
2020-02-15 16:45:57 +01:00
2ed21c98d5 [ticket/16351] Update commends
PHPBB3-16351
2020-02-14 13:11:44 +00:00
6b380063e9 Merge branch '3.3.x' 2020-02-14 07:31:29 +01:00
9715054102 Merge branch '3.2.x' into 3.3.x 2020-02-14 07:31:24 +01:00
7735f22562 Merge pull request #5853 from mrgoldy/ticket/16060
[ticket/16060] Correct auto prune column for cron job
2020-02-14 07:31:19 +01:00
3ff9d24935 Merge branch '3.3.x' 2020-02-14 07:30:35 +01:00
d8e441b079 Merge branch '3.2.x' into 3.3.x 2020-02-14 07:30:31 +01:00
d75952394f Merge pull request #5852 from mrgoldy/ticket/16348
[ticket/16348] Prevent double freeing database results on user_ban
2020-02-14 07:30:27 +01:00
b86c197d95 Merge branch '3.3.x' 2020-02-14 07:28:49 +01:00
af012e8b5a Merge branch '3.2.x' into 3.3.x 2020-02-14 07:28:26 +01:00
b6a320503e Merge pull request #5850 from rubencm/ticket/16352
[ticket/16352] Deprecate a few functions/classes
2020-02-14 07:11:12 +01:00
0a738440af Merge branch '3.3.x' 2020-02-14 07:06:39 +01:00
9a919d8fa3 Merge branch '3.2.x' into 3.3.x 2020-02-14 07:06:35 +01:00
b4ecdae8e4 Merge pull request #5848 from rubencm/ticket/16350
[ticket/16350] Move shared code to functions_admin.php
2020-02-14 07:06:31 +01:00
0ceebede32 Merge pull request #5847 from rubencm/ticket/16349
[ticket/16349] Fix merge issues in acp_attachments and posting_attach_body.html
2020-02-12 07:17:32 +01:00
495428f2ad Merge branch '3.3.x' 2020-02-11 17:05:39 +01:00
b1eaaea89a Merge branch '3.2.x' into 3.3.x 2020-02-11 17:05:34 +01:00
33c50f236a Merge branch '3.3.x' 2020-02-06 17:36:49 +01:00
d0d1fd189b Merge pull request #5831 from marc1706/ticket/16314
[ticket/16314] Improve handling of page_footer output for controllers
2020-02-06 17:19:33 +01:00
76cca33525 [ticket/16335] Ensure event variables are always defined
PHPBB3-16335
2020-02-05 15:24:40 +01:00
31cbb60a38 [ticket/16358] Hide attachment tab with no filters and display ACP notice
PHPBB3-16358
2020-02-05 13:03:01 +01:00
582919804a [ticket/16356] Delete attachments on saving a draft
PHPBB3-16356
2020-02-05 11:04:01 +01:00
eaa597a430 [ticket/10506] Preserve attachments on not-saving PM draft
PHPBB3-10506
2020-02-05 10:54:49 +01:00
2d2c0ab6cd [ticket/16060] Correct auto prune column for cron job
Also only log pruning once per forum

PHPBB3-16060
2020-02-04 17:58:28 +01:00
5625078cfe [ticket/16348] Prevent double freeing database results on user_ban
PHPBB3-16348
2020-02-04 17:16:10 +01:00
9e7dc9433a [ticket/16350] Move code to functions_admin
PHPBB3-16350
2020-02-04 06:33:11 +00:00
b07fb709ba [ticket/16352] Remove duplicated function
PHPBB3-16352
2020-02-03 02:24:56 +00:00
96a7e04ea5 [ticket/16352] Deprecate phpbb_delete_user_pms
PHPBB3-16352
2020-02-03 02:20:35 +00:00
2fea7969d3 [ticket/16352] Deprecate more functions
PHPBB3-16352
2020-02-03 01:44:02 +00:00
d668f3a3c3 [ticket/16352] Deprecate a few function/classes
PHPBB3-16352
2020-02-03 00:44:44 +00:00
9749aa936c [ticket/16351] Use CHMOD constants from filesystem_interface
PHPBB3-16351
2020-02-02 22:00:38 +00:00
e2cc1aec26 [ticket/16350] Move shared code to functions.php
PHPBB3-16350
2020-02-02 21:45:08 +00:00
ebdb771a0a [ticket/16349] Fix merges
PHPBB3-16349
2020-02-02 21:09:21 +00:00
e6624c1fd5 [ticket/16314] Deprecate phpbb_check_and_display_sql_report
PHPBB3-16314
2020-02-02 13:48:46 +01:00
2d5289ed7e Merge branch '3.3.x' 2020-02-01 08:50:24 +01:00
3bb2edd53d Merge branch '3.2.x' into 3.3.x 2020-02-01 08:50:19 +01:00