Commit Graph

13204 Commits

Author SHA1 Message Date
Angelina Filippova
921d874187 Update :rate_limit types, add placeholders 2021-05-02 16:06:14 +03:00
Angelina Filippova
7c6de228dd Delete unused suggestions 2021-04-13 02:31:28 +03:00
Angelina Filippova
db699f358f Update type of settings whose values should be reversed 2021-04-06 02:46:54 +03:00
Angelina Filippova
f565854b51 Change [:list, :string] and [:list, :atom] types to :multiple_select 2021-03-30 21:28:55 +03:00
Angelina Filippova
05ef2282d5 Change :crontab type to [:keyword, :string] 2021-03-30 00:26:09 +03:00
Angelina Filippova
567c93a26d Update type of :queues, remove unused suggestions 2021-03-29 22:26:34 +03:00
Angelina Filippova
481f63a9a7 Add textarea type 2021-03-28 01:58:36 +03:00
Angelina Filippova
5835f6d0a4 Add map_keys key to :mascots setting 2021-03-27 00:13:35 +03:00
Angelina Filippova
c425f87717 Update type of :ip setting in group Gopher 2021-03-27 00:12:17 +03:00
Angelina Filippova
67f7822b17 Set type :select to settings that are rendered as single selects 2021-03-27 00:11:04 +03:00
Angelina Filippova
68d3d04274 Update types of settings with type image, remove duplicated suggestions 2021-03-26 00:00:32 +03:00
Angelina Filippova
3f9983ee93 Update types of settings groups that don't have keys 2021-03-24 23:07:29 +03:00
Angelina Filippova
63e412ceb5 Update suggestions for settings with type atom 2021-03-23 01:28:46 +03:00
Angelina Filippova
36d93d691d Update types for settings that are selects and multiple selects with reduced labels 2021-03-22 21:26:48 +03:00
Alexander Strizhakov
957a51058b
adding path field to description tabs 2021-03-04 13:23:48 +03:00
Alexander Strizhakov
f20c1afe46
config descriptions v2 endpoint with tabs field 2021-03-04 13:23:45 +03:00
Alexander Strizhakov
f9d9987df8
added tabs setting to the description.exs 2021-03-04 13:22:30 +03:00
Alexander Strizhakov
8827d7a74f
adding tab & tab_label fields to the descriptions
for top level groups
2021-03-04 13:22:30 +03:00
lain
13aa98d689 Merge branch 'mergeback/2.3.0' into 'develop'
Mergeback/2.3.0

See merge request pleroma/pleroma!3360
2021-03-03 15:07:50 +00:00
lain
10f402af6d Changelog: Re-add application support 2021-03-03 15:35:25 +01:00
lain
2e296c079f Revert "StatusController: Deactivate application support for now."
This reverts commit 024c11c18d.
2021-03-03 15:33:06 +01:00
lain
c5352e90be Changelog, mix: merge in stable 2021-03-03 13:56:40 +01:00
Haelwenn
49afbcda5f Merge branch 'fix-migration' into 'develop'
Fix migration in cases where database name has a hyphen

See merge request pleroma/pleroma!3359
2021-03-03 00:57:39 +00:00
Mark Felder
5b8cceba09 Fix migration in cases where database name has a hyphen 2021-03-02 18:17:32 -06:00
Haelwenn
37c37090fa Merge branch 'fix/inconsistent-reference' into 'develop'
MastoAPI Status View: make consistently named object references

See merge request pleroma/pleroma!3358
2021-03-02 20:48:40 +00:00
Haelwenn
81e9c5196f Merge branch 'fix/useless-header' into 'develop'
Test: remove useless header on the get request

See merge request pleroma/pleroma!3357
2021-03-02 20:47:21 +00:00
Mark Felder
8d601d3b23 Make the object reference in both render("show.json", _) functions consistently named 2021-03-02 14:14:38 -06:00
Mark Felder
913d53b7d7 Remove useless header on the get request 2021-03-02 14:04:50 -06:00
lain
b221d77a6d Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0

See merge request pleroma/pleroma!3354
2021-03-02 19:54:30 +00:00
feld
210aa42f74 Merge branch 'application-to-generator' into 'develop'
Status application field: test improvements

See merge request pleroma/pleroma!3356
2021-03-02 18:40:35 +00:00
Mark Felder
ccbf162088 Actually test viewing status after ingestion 2021-03-02 12:33:32 -06:00
Mark Felder
f0208980e4 Test both ingestion of post in the status controller and the correct response during the view 2021-03-02 12:29:16 -06:00
Mark Felder
85b2387f66 Fix build_application/1 match 2021-03-02 11:37:37 -06:00
lain
0a589c887b Mix: Update linkify. 2021-03-02 17:03:14 +01:00
lain
7dac83eb6e Linting. 2021-03-02 15:03:16 +01:00
lain
7d790bb27b Changelog: Remove application support line. 2021-03-02 14:42:11 +01:00
lain
024c11c18d StatusController: Deactivate application support for now.
Some more things to discuss about, so we'll remove it from 2.3.0
2021-03-02 14:40:47 +01:00
lain
cd6aa9bcae Mix: Update version number 2021-03-01 21:13:43 +01:00
lain
9f71b63c2d Update changelog 2021-03-01 21:12:26 +01:00
Mark Felder
808e15b264 Document user agent leak fix 2021-03-01 21:05:58 +01:00
Alex Gleason
7ebbe11e75 user_agent_mock --> request_mock 2021-03-01 21:05:52 +01:00
Alex Gleason
1dc5794e29 Never forward the client's user-agent through the media proxy 2021-03-01 21:05:46 +01:00
lain
4cb166e979 Merge branch 'update-frontend-2021-03-01' into 'develop'
Update frontend

See merge request pleroma/pleroma!3353
2021-03-01 19:21:52 +00:00
lain
5058de328e Update frontend 2021-03-01 20:04:53 +01:00
Haelwenn
d03ee11b72 Merge branch 'application-to-generator' into 'develop'
ActvitityStreams application field should be called "generator"

See merge request pleroma/pleroma!3352
2021-03-01 17:51:15 +00:00
Mark Felder
b1e1db82bc Store application details in the object under the generator key, not application key 2021-03-01 11:29:10 -06:00
feld
9fb8da4293 Merge branch 'feld-develop-patch-26755' into 'develop'
Update CHANGELOG.md

See merge request pleroma/pleroma!3351
2021-02-28 19:01:01 +00:00
feld
8a563efdd8 Update CHANGELOG.md 2021-02-28 18:46:03 +00:00
lain
e8d88a72cf Merge branch 'fix/warning-in-test' into 'develop'
warning fix

See merge request pleroma/pleroma!3350
2021-02-28 16:53:05 +00:00
lain
4a9d3a1f28 Merge branch 'features/reports-enhancements' into 'develop'
Enhance reports in Pleroma API: index, show

See merge request pleroma/pleroma!3280
2021-02-28 16:45:15 +00:00