Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,721 Commits 1 Branch 0 Tags 222 MiB
862d4886c9
Commit Graph

8721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ekaterina Vaartis
261d92f9c2 Update the pack fallback-src sha generation condition 
The old one would not regenerate sha when fallback src changed
 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9dc9689144 Add tests for pack metadata updating 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
bcc0bfd0c5 Add an endpoint for emoji pack metadata updating 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
adf31d596e Add tests for downloading from fallback url 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
b78973d27f fallback can't have pack.json, reflect that in code 
having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself
 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2a94eca096 Change YAML to JSON 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
b0ecd412f5 Clean out old emojis on reload 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2d4b8f3d20 Add an endpoint for deleting emoji packs 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
3a8669b487 Fix responses for emoji pack controlller 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7a0c755d0a Send ok for emoji reloading as text, not as json 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
ee620ecbf1 Add caching for emoji pack sharing 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7e4c8b56ea Add tests for emoji pack sharing 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7fb7dd9e0e Only find SHA256 for packs that are shared 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
54b8e683bc Swap TOML for YAML to get YAML generation for packs from fallbacks 
If fallback url doesn't have a pack.yml file, one from the source will
be used
 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
b791a08656 Implement API actions on packs 
That incldues listing them and downloading them from other instances
or from the remote url
 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
6a42641b8d Add pack.toml loading 2019-09-19 00:16:33 +03:00
feld
ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop' 
Add a setting to hide follows/followers stats from the user profile

See merge request pleroma/pleroma!1663
 2019-09-18 21:13:15 +00:00
feld
25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop' 
POST for creating invite tokens in admin api

See merge request pleroma/pleroma!1637
 2019-09-18 21:11:37 +00:00
feld
220afadc55 Merge branch 'restore-tests' into 'develop' 
Restore tests for `change_password` and `delete_account`

See merge request pleroma/pleroma!1658
 2019-09-18 21:05:18 +00:00
rinpatch
76a1019f41 Merge branch 'chore/refetch-poll-changelog-update' into 'develop' 
Add a changelog entry for poll refetching

See merge request pleroma/pleroma!1696
 2019-09-18 21:00:51 +00:00
Haelwenn
56286447ee Merge branch 'fix/test-upload-cleanup' into 'develop' 
Cleanup uploads after the tests are finished

See merge request pleroma/pleroma!1695
 2019-09-18 21:00:09 +00:00
rinpatch
a22b87b30c Add a changelog entry for poll refetching 2019-09-19 00:00:05 +03:00
Haelwenn
e32d099a3a Merge branch 'feature/poll-refresh' into 'develop' 
Poll refetching

See merge request pleroma/pleroma!1694
 2019-09-18 20:58:53 +00:00
rinpatch
a12aeb09c4 Cleanup uploads after the tests are finished 2019-09-18 23:34:13 +03:00
rinpatch
5028b7b578 Fix credo issues 2019-09-18 22:09:03 +03:00
Mark Felder
fe33084ea8 Update AdminFE for 1.1 branch 
Latest build of AdminFE with Settings disabled as the feature is not stable yet
 2019-09-18 13:52:11 -05:00
rinpatch
c096dd86e5 Do not refetch local objects 2019-09-18 20:01:26 +03:00
rinpatch
eb87a86b5b Preserve internal fields when reinjecting 2019-09-18 19:53:51 +03:00
rinpatch
d32894ae51 Move object internal fields to a constant 2019-09-18 19:24:20 +03:00
rinpatch
e3f902b3a1 Set updated_at even if the object stayed the same 2019-09-18 19:07:25 +03:00
rinpatch
a9c700ff15 Fix wrong argument order when calling NaiveDateTime.diff 2019-09-18 18:52:33 +03:00
rinpatch
84a40f6f26 Capture log in object refetch tests 2019-09-18 18:31:24 +03:00
Haelwenn
5c78131ee2 Merge branch 'bugfix/docs-formatting' into 'develop' 
Improve generated docs formatting

See merge request pleroma/pleroma!1688
 2019-09-18 15:31:03 +00:00
rinpatch
7ef575d11e Initial poll refresh support 
Implement refreshing the object with an interval and call the function
when getting the poll.
 2019-09-18 18:13:21 +03:00
Maxim Filippov
384b7dd40d Fix response 2019-09-18 18:06:49 +03:00
Maxim Filippov
f89728ad95 Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-18 16:44:11 +03:00
Ivan Tashkinov
e4f3d7f69d Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex 2019-09-18 10:31:10 +00:00
Ivan Tashkinov
847c7f02f5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 2019-09-18 12:32:02 +03:00
Ivan Tashkinov
551f2fa59e [#1234] Added changelog entry, removed admin OAuth scopes. 2019-09-18 12:31:33 +03:00
Ivan Tashkinov
c98e761d28 Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 2019-09-18 12:06:38 +03:00
Ivan Tashkinov
9f28249dfb [#1260] Added changelog entry. 2019-09-18 12:06:12 +03:00
Alex S
a18f1e7cd7 namings 2019-09-18 10:49:14 +03:00
Alex S
17ff63b3c3 docs fix 2019-09-18 10:49:14 +03:00
Alex S
2263c8b6b9 little fixes 2019-09-18 10:49:14 +03:00
Alex S
4faf2b1555 post for creating invite tokens in admin api 2019-09-18 10:49:14 +03:00
Haelwenn
40c968626d Merge branch 'chore/changelog-separate-1.1' into 'develop' 
Sync develop changelog with master and create a new section for post-1.1 changes

See merge request pleroma/pleroma!1689
 2019-09-17 21:30:58 +00:00
rinpatch
ea6d4137da Apply suggestion to CHANGELOG.md 2019-09-17 21:24:21 +00:00
Haelwenn (lanodan) Monnier
e501c822c9
markdown.ex: put two-spaces before the description-newline 2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier
4785596a2c
markdown.ex: end suggestions list with a newline 
Otherwise we end up with suggestion on the same level as the childs

Markdown is a fuck…
 2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier
d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one 2019-09-17 23:05:27 +02:00