sliver/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Projects Activity
10524 commits 4 branches 89 tags 294 MiB
Commit graph

10524 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
ae94fcc95f Merge branch 'fix-emoji-pagination' into 'develop' 
Fix for emoji pagination in pack show

See merge request pleroma/pleroma!2681
 2020-06-24 15:23:20 +00:00
Alexander Strizhakov
aae1af8cf1
fix for emoji pagination in pack show 2020-06-24 18:06:30 +03:00
lain
4c5fb831b3 Status schema: Add parent_visible. 2020-06-24 14:33:00 +02:00
lain
1702239428 Changelog: Put info under API header. 2020-06-24 14:30:12 +02:00
lain
79ee914bc2 Changelog: Add info about parent_visible field 2020-06-24 13:32:14 +02:00
lain
637bae42b4 Docs: Document added parent_visible field. 2020-06-24 13:31:42 +02:00
lain
35f6770436 StatusView: Add pleroma.parent_visible 2020-06-24 13:29:08 +02:00
lain
88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' 
admin api status count per instance

See merge request pleroma/pleroma!2500
 2020-06-24 10:42:07 +00:00
lain
510031ece2 Merge branch 'issue/1872-updated-tzdata' into 'develop' 
[#1872] use Pleroma.HTTP for Tzdata

See merge request pleroma/pleroma!2678
 2020-06-24 09:00:17 +00:00
lain
65f3eb333b Apply suggestion to test/http/tzdata_test.exs 2020-06-24 08:50:33 +00:00
Maksim Pechnikov
721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient 2020-06-24 09:12:32 +03:00
feld
b4a502fc8b Merge branch 'moving-mrf-namespace-migration-fix' into 'develop' 
Moving to mrf namespace migration fix

See merge request pleroma/pleroma!2676
 2020-06-23 18:51:37 +00:00
lain
98af7b59e4 Merge branch 'update-validator' into 'develop' 
Update validator

See merge request pleroma/pleroma!2668
 2020-06-23 18:10:33 +00:00
Roman Chvanikov
1471b70ef1 Merge develop 2020-06-23 20:56:55 +03:00
Alexander Strizhakov
cb96c82f70
moving to mrf namespace migration fix 2020-06-23 20:28:48 +03:00
Haelwenn
c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' 
Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
 2020-06-23 16:38:27 +00:00
Mark Felder
54039100fe Remove reference to defunct distsn.org 2020-06-23 11:17:26 -05:00
lain
b7f297f0bd Merge branch 'issue/1798' into 'develop' 
[#1798] fixed migration the settings to DB

See merge request pleroma/pleroma!2655
 2020-06-23 10:54:15 +00:00
lain
aee815b478 ObjectValidator: Clarify type of object. 2020-06-23 12:37:05 +02:00
lain
59e2a1018a Merge branch 'fix_1586_provide_index_md' into 'develop' 
Fix 1586 provide index md

See merge request pleroma/pleroma!2669
 2020-06-23 10:06:47 +00:00
lain
adc199c6a8 ActivityPubControllerTest: Capture error log 2020-06-23 12:04:51 +02:00
lain
d93e01137b ActivityPubControllerTest: Testing changes. 2020-06-23 11:43:20 +02:00
lain
2737809bbf An act of desperation. 2020-06-23 11:03:32 +02:00
lain
2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator 2020-06-23 10:17:12 +02:00
Maksim Pechnikov
84aa9c78dd fix tests 2020-06-23 09:08:24 +03:00
Maksim Pechnikov
2715c40e1d added tests 2020-06-23 06:59:00 +03:00
Haelwenn
3875a507d4 Merge branch '@doc/apc2s-upload-media' into 'develop' 
ActivityPubController: Update upload_media @doc

See merge request pleroma/pleroma!2673
 2020-06-23 03:04:27 +00:00
Haelwenn (lanodan) Monnier
c116b6d6d6
ActivityPubController: Update upload_media @doc 
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
 2020-06-23 04:42:44 +02:00
Haelwenn
d21ef5e66b Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop' 
Add missing default config value for :instance, instance_thumbnail

See merge request pleroma/pleroma!2672
 2020-06-23 01:55:33 +00:00
Mark Felder
df5e048cbb Do not need a function to provide fallback value with default defined in config.exs 2020-06-22 17:39:02 -05:00
Mark Felder
bf8310f380 Add missing default config value for :instance, instance_thumbnail 
Follows up on b7fc61e17b
 2020-06-22 17:35:02 -05:00
Haelwenn
98f014d3be Merge branch 'warning/mastofe-settings-blob' into 'develop' 
Add warning against parsing/reusing MastoFE settings blob

See merge request pleroma/pleroma!2671
 2020-06-22 21:59:21 +00:00
Haelwenn (lanodan) Monnier
8f6ba4b22f
Add warning against parsing/reusing MastoFE settings blob 2020-06-22 23:45:29 +02:00
lain
46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop' 
Add `pleroma.is_muted` property to notifications

Closes #1812

See merge request pleroma/pleroma!2670
 2020-06-22 15:40:09 +00:00
Egor Kislitsyn
b3a549e916
Update NotificationOperation spec 2020-06-22 19:18:33 +04:00
Egor Kislitsyn
7e6f43c0d7
Add is_muted to notifications 2020-06-22 19:03:04 +04:00
Maksim Pechnikov
b0a40fc2e4 added verify RUM settings before start app 2020-06-22 17:27:49 +03:00
lain
59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop' 
account visibility in masto api

Closes #1739

See merge request pleroma/pleroma!2488
 2020-06-22 12:37:10 +00:00
lain
31489bc864 Merge branch 'docs_use_include_for_install_further_reading' into 'develop' 
Add include for the "Further reading" section

See merge request pleroma/pleroma!2667
 2020-06-22 12:35:00 +00:00
lain
8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop' 
Proper error codes for error in adminFE

Closes #1825

See merge request pleroma/pleroma!2665
 2020-06-22 12:25:12 +00:00
lain
a0762fd5ea Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!2661
 2020-06-22 12:23:45 +00:00
Ilja
499324f7be Removed a space that was too much 2020-06-22 14:22:23 +02:00
Ilja
1e089cdf29 I forgot to git add some files, oops (should be squashed with MR) 2020-06-22 14:18:55 +02:00
Ilja
a3b10a4f64 Fix 1586 Docs: provide a index.md 
* I renamed the introduction.md to index.md
* I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it)
* While I was at it, I also fixed some broken links
 2020-06-22 14:13:30 +02:00
lain
b05f795326 Credo fixes 2020-06-22 14:02:29 +02:00
lain
e785cd5cae ActivityPub: Remove update and switch to pipeline. 2020-06-22 13:59:45 +02:00
Ben Is
68c812eb2e Translated using Weblate (Italian) 
Currently translated at 0.9% (1 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
 2020-06-22 11:34:18 +00:00
Ben Is
4f5af68b3e Added translation using Weblate (Italian) 2020-06-22 11:34:18 +00:00
rinpatch
c75ba63bef Merge branch '1865-media-only' into 'develop' 
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"

Closes #1865

See merge request pleroma/pleroma!2650
 2020-06-22 11:34:07 +00:00
lain
1e7ca24430 Update Handling Test: Fix for re-used update ids. 2020-06-22 13:23:21 +02:00