squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,802 Commits 154 Branches 42 Tags 503 MiB
c57ad0a402
Commit Graph

6802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vaartis
f251225cae Apply suggestions to emoji_api_controller.ex 2019-09-19 00:16:33 +03:00
vaartis
c049c32270 Fixed a typo in create_archive_and_cache 2019-09-19 00:16:33 +03:00
vaartis
163082de6f Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f6d4acc871 Fix credo warnings 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
87057101b0 Add documentation for the emoji api endpoints 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9eb2ee4df0 Allow importing old (emoji.txt / plain) packs from the filesystem 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
13cd93a0d3 Use && insted of "and" for checking shared-files for packs 
share-files can be nil and "and" does not like that
 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f5131540dc Add a way to create emoji packs via an endpoint 2019-09-19 00:16:33 +03:00
vaartis
6b4a144e4d Remove unused yaml dependency from mix.lock 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8dbdd5c280 Allow uploading new emojis to packs from URLs 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
16edfef12e Handle empty shortcode/filename/new_shortcode/new_filename 2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9afe7258dd Implememt emoji pack file updating + write tests 2019-09-19 00:16:33 +03:00
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
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
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