Commit graph

6109 commits

Author SHA1 Message Date
fb7f7435c0 Merge branch 'bug/phpinfo-accessible-hotfix' into 2020.09-rc
# Conflicts:
#	src/Module/Admin/DBSync.php
#	src/Module/Admin/Logs/Settings.php
#	src/Module/Admin/Themes/Details.php
#	src/Module/Admin/Themes/Embed.php
2020-09-08 14:07:46 -04:00
3efa8648c5 Fix security vulnerability in admin modules
- The Module\BaseAdmin::post method checked credentials but didn't abort the process when it failed
- Created Module\BaseAdmin::checkAdminAccess method
2020-09-08 12:27:43 -04:00
9bc2c5a52e Normalize use of form security tokens in Admin modules
# Conflicts:
#	src/Module/Admin/Logs/Settings.php
2020-09-08 12:27:36 -04:00
2ce15cae1a Use router parameters in Admin modules
- Remove 10 @TODO tags

# Conflicts:
#	src/Module/Admin/DBSync.php
#	src/Module/Admin/Themes/Details.php
#	src/Module/Admin/Themes/Embed.php
2020-09-08 12:27:15 -04:00
d15f522752
Merge pull request #9143 from annando/api-count
API: Counts added, local query improved
2020-09-08 11:14:00 -04:00
e45ccea0f2 Tabs instead of spaces 2020-09-08 01:45:59 +00:00
24f1bb4ea1 Class file renamed 2020-09-08 01:44:49 +00:00
Michael Vogel
2bb725fa30
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2020-09-08 03:39:51 +02:00
5f5b97dad6 Create self-only ACL template and helper method 2020-09-07 19:27:32 -04:00
59374eb6c6 Use "StatusCounts" class 2020-09-07 18:24:11 +00:00
1bca280eae StdClass instead of arrays 2020-09-07 14:34:05 +00:00
07ccfb212b Merge remote-tracking branch 'upstream/2020.09-rc' into api-count 2020-09-07 14:29:02 +00:00
f56e765158 Issue 9153 Use "info" instead of "notice" on successful operations 2020-09-07 10:17:42 +00:00
b530ef709d
Merge pull request #9147 from annando/Issue-8882
Issue 8882: Fixes permissions of pinned posts
2020-09-07 03:14:25 -04:00
90315e3434 Don't perform actions on empty conditions 2020-09-07 05:00:17 +00:00
2a0635185a Fix notifications for wrong users 2020-09-07 04:36:28 +00:00
4852458645 Simplify the code / check number of parameters in mergeConditions 2020-09-06 20:28:08 +00:00
0684922ec2 Use array_unique 2020-09-06 20:09:29 +00:00
d332272d55 Issue 9099: Improve mentions from non followers 2020-09-06 19:22:53 +00:00
8d0d6bcd0c Issue 8882: Fixes permissions of pinned posts 2020-09-06 15:05:42 +00:00
f3934eb0c2
Merge pull request #9145 from annando/duplicate-apcontact
Avoid "Duplicate entry" error in apcontact
2020-09-06 12:41:45 +02:00
058a3a2e7c
Merge pull request #9144 from annando/issue-9137
Issue 9137: Fix "Incorrect integer value:"
2020-09-06 11:54:23 +02:00
5af713b336 Issue 9137: Fix "Incorrect integer value:" 2020-09-06 09:41:32 +00:00
a0cb6b409d Avoid "Duplicate entry" error in apcontact 2020-09-06 09:39:47 +00:00
db6282b5e2 API: Counts added, local query improved 2020-09-06 07:12:04 +00:00
0bc4829af2
Merge pull request #9139 from annando/timeline-parameters
API: Fix the timeline parameters
2020-09-05 08:20:46 +02:00
c3ed31bb8f API: Fix the timeline parameters 2020-09-05 05:38:12 +00:00
3a0e1eea04 Tyoi reported by silkevicious on Transifex 2020-09-04 14:17:58 +02:00
e8cae80460 Fix fatal error in storage list console when default backend is used 2020-09-03 16:06:52 -04:00
Michael Vogel
560746eb3b
Merge pull request #9125 from MrPetovan/bug/8999-fix-new-pm
Fix new private message recipient input
2020-09-03 21:45:31 +02:00
90dc60cee7 Replace spaces with tabs 2020-09-03 19:24:30 +00:00
0de372aceb Space replaced 2020-09-03 19:16:42 +00:00
305fe62659 Content is now filled 2020-09-03 19:13:03 +00:00
cd3d4ae4e6 API: New entity "status" 2020-09-03 18:57:18 +00:00
9ea7f7d4ad [frio] Ensure tagsinput library is loaded in pages where new PM can be submitted
- The new private message page loads in a modal, requiring the base page to load them in advance
2020-09-03 10:03:36 -04:00
4a4d0f04cb Fix new private message recipient input
- Add new private message recipient ACL template
- Remove now redundant theme private message templates
2020-09-03 10:01:58 -04:00
a844fd8f58 Move ACL full selector template to subfolder
- Fix display overflow in contact complete suggestion box
2020-09-03 10:00:20 -04:00
6acf660ebd New model class "host" 2020-09-02 19:19:00 +00:00
9870ab8446
Merge pull request #9118 from annando/manually-aprove
New field "manually-approve" for contact table
2020-09-02 04:02:18 -04:00
04b6f00ca9 Simplifications 2020-09-02 07:14:01 +00:00
f2ea2f4961 Fix: Transmit the public contact id 2020-09-02 04:45:50 +00:00
8402450101 Always use the oldest creation data 2020-09-02 04:17:13 +00:00
a2e4a0170b Changed field origin 2020-09-02 03:13:10 +00:00
cbf1e5c699 New field "manually-approve" for contact table 2020-09-02 03:02:50 +00:00
ca9f916ecd Removed comment 2020-09-02 01:45:45 +00:00
7b903e1ca8 The account fields are rearrange to match Mastodon 2020-09-01 20:59:50 +00:00
7be6fbf652 API: Support for the "directory" endpoint 2020-09-01 19:29:39 +00:00
1c5801ca8e Renamed classes 2020-09-01 13:40:37 +00:00
3aa6d516bf Changed priority 2020-09-01 12:55:46 +00:00
41e07a9ae2 Code cleanup 2020-09-01 08:32:53 +00:00