Commit Graph

  • 7680aec17d Move emoji api to pleroma api dir Ekaterina Vaartis 2019-09-12 00:00:28 +03:00
  • 36f2275dc9 A feature for shareable emoji packs, use it in download_from & tests Ekaterina Vaartis 2019-09-11 22:58:55 +03:00
  • 74fb6d8647 Move EmojiAPIController from EmojiAPI to PleromaAPI Ekaterina Vaartis 2019-09-11 22:43:00 +03:00
  • dd818bdd48 Add documentation for the emoji endpoints Ekaterina Vaartis 2019-09-11 22:39:26 +03:00
  • 6cd651a38b Make the emoji controller api more RESTy Ekaterina Vaartis 2019-09-11 21:50:55 +03:00
  • 3971bf9c5f Change :sha to :checksum Ekaterina Vaartis 2019-09-11 21:43:16 +03:00
  • 7c784128fd Change emoji api responses to JSON Ekaterina Vaartis 2019-09-11 19:39:47 +03:00
  • f24731788e Move emoji pack list from /list to / Ekaterina Vaartis 2019-09-11 19:01:21 +03:00
  • cb125ffaf7 Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex vaartis 2019-09-11 16:00:48 +00:00
  • 8f509e6d1e Use with w/ pack_info_res Ekaterina Vaartis 2019-09-11 18:59:31 +03:00
  • 8790365fef Remove unused variable Ekaterina Vaartis 2019-09-11 18:52:21 +03:00
  • b8a214b0ab Split list_packs vaartis 2019-09-11 15:48:51 +00:00
  • f251225cae Apply suggestions to emoji_api_controller.ex vaartis 2019-09-11 15:32:54 +00:00
  • c049c32270 Fixed a typo in create_archive_and_cache vaartis 2019-09-11 09:12:22 +00:00
  • 163082de6f Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex vaartis 2019-09-11 09:07:19 +00:00
  • f6d4acc871 Fix credo warnings Ekaterina Vaartis 2019-09-10 22:09:20 +03:00
  • 87057101b0 Add documentation for the emoji api endpoints Ekaterina Vaartis 2019-09-10 21:34:57 +03:00
  • 9eb2ee4df0 Allow importing old (emoji.txt / plain) packs from the filesystem Ekaterina Vaartis 2019-09-10 21:16:30 +03:00
  • 13cd93a0d3 Use && insted of "and" for checking shared-files for packs Ekaterina Vaartis 2019-09-01 15:38:45 +03:00
  • f5131540dc Add a way to create emoji packs via an endpoint Ekaterina Vaartis 2019-08-28 19:29:01 +03:00
  • 6b4a144e4d Remove unused yaml dependency from mix.lock vaartis 2019-08-24 21:58:21 +00:00
  • 8dbdd5c280 Allow uploading new emojis to packs from URLs Ekaterina Vaartis 2019-08-20 14:52:36 +03:00
  • 16edfef12e Handle empty shortcode/filename/new_shortcode/new_filename Ekaterina Vaartis 2019-08-19 19:26:15 +03:00
  • 9afe7258dd Implememt emoji pack file updating + write tests Ekaterina Vaartis 2019-08-18 22:05:38 +03:00
  • 261d92f9c2 Update the pack fallback-src sha generation condition Ekaterina Vaartis 2019-08-16 13:30:14 +03:00
  • 9dc9689144 Add tests for pack metadata updating Ekaterina Vaartis 2019-08-16 13:22:14 +03:00
  • bcc0bfd0c5 Add an endpoint for emoji pack metadata updating Ekaterina Vaartis 2019-08-15 19:55:58 +03:00
  • adf31d596e Add tests for downloading from fallback url Ekaterina Vaartis 2019-08-15 12:07:51 +03:00
  • b78973d27f fallback can't have pack.json, reflect that in code Ekaterina Vaartis 2019-08-15 11:46:03 +03:00
  • 2a94eca096 Change YAML to JSON Ekaterina Vaartis 2019-08-15 11:39:39 +03:00
  • b0ecd412f5 Clean out old emojis on reload Ekaterina Vaartis 2019-08-12 18:28:05 +03:00
  • 2d4b8f3d20 Add an endpoint for deleting emoji packs Ekaterina Vaartis 2019-08-12 18:03:59 +03:00
  • 3a8669b487 Fix responses for emoji pack controlller Ekaterina Vaartis 2019-08-12 17:35:25 +03:00
  • 7a0c755d0a Send ok for emoji reloading as text, not as json Ekaterina Vaartis 2019-08-12 16:43:28 +03:00
  • ee620ecbf1 Add caching for emoji pack sharing Ekaterina Vaartis 2019-08-12 13:13:01 +03:00
  • 7e4c8b56ea Add tests for emoji pack sharing Ekaterina Vaartis 2019-08-12 10:35:34 +03:00
  • 7fb7dd9e0e Only find SHA256 for packs that are shared Ekaterina Vaartis 2019-08-11 23:24:23 +03:00
  • 54b8e683bc Swap TOML for YAML to get YAML generation for packs from fallbacks Ekaterina Vaartis 2019-08-11 22:32:15 +03:00
  • b791a08656 Implement API actions on packs Ekaterina Vaartis 2019-08-11 00:39:21 +03:00
  • 6a42641b8d Add pack.toml loading Ekaterina Vaartis 2019-08-10 21:46:36 +03:00
  • ab2ca3038f Merge branch 'hide-follower-following-count' into 'develop' feld 2019-09-18 21:13:15 +00:00
  • 25b4365656 Merge branch 'admin_api_invite_tokens' into 'develop' feld 2019-09-18 21:11:37 +00:00
  • 220afadc55 Merge branch 'restore-tests' into 'develop' feld 2019-09-18 21:05:18 +00:00
  • 76a1019f41 Merge branch 'chore/refetch-poll-changelog-update' into 'develop' rinpatch 2019-09-18 21:00:51 +00:00
  • 56286447ee Merge branch 'fix/test-upload-cleanup' into 'develop' Haelwenn 2019-09-18 21:00:09 +00:00
  • a22b87b30c Add a changelog entry for poll refetching rinpatch 2019-09-19 00:00:05 +03:00
  • e32d099a3a Merge branch 'feature/poll-refresh' into 'develop' Haelwenn 2019-09-18 20:58:53 +00:00
  • a12aeb09c4 Cleanup uploads after the tests are finished rinpatch 2019-09-18 23:34:13 +03:00
  • 5028b7b578 Fix credo issues rinpatch 2019-09-18 22:09:03 +03:00
  • fe33084ea8 Update AdminFE for 1.1 branch Mark Felder 2019-09-18 13:52:11 -05:00
  • c096dd86e5 Do not refetch local objects rinpatch 2019-09-18 19:59:23 +03:00
  • eb87a86b5b Preserve internal fields when reinjecting rinpatch 2019-09-18 19:53:51 +03:00
  • d32894ae51 Move object internal fields to a constant rinpatch 2019-09-18 19:24:20 +03:00
  • e3f902b3a1 Set updated_at even if the object stayed the same rinpatch 2019-09-18 19:07:25 +03:00
  • a9c700ff15 Fix wrong argument order when calling NaiveDateTime.diff rinpatch 2019-09-18 18:52:33 +03:00
  • 84a40f6f26 Capture log in object refetch tests rinpatch 2019-09-18 18:31:24 +03:00
  • 5c78131ee2 Merge branch 'bugfix/docs-formatting' into 'develop' Haelwenn 2019-09-18 15:31:03 +00:00
  • 7ef575d11e Initial poll refresh support rinpatch 2019-09-18 18:13:21 +03:00
  • 384b7dd40d Fix response Maxim Filippov 2019-09-18 18:06:49 +03:00
  • f89728ad95 Merge branch 'develop' into feature/return-link-for-password-reset Maxim Filippov 2019-09-18 16:44:11 +03:00
  • e4f3d7f69d Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex Ivan Tashkinov 2019-09-18 10:31:10 +00:00
  • 847c7f02f5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-09-18 12:32:02 +03:00
  • 551f2fa59e [#1234] Added changelog entry, removed admin OAuth scopes. Ivan Tashkinov 2019-09-18 12:31:33 +03:00
  • c98e761d28 Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions Ivan Tashkinov 2019-09-18 12:06:38 +03:00
  • 9f28249dfb [#1260] Added changelog entry. Ivan Tashkinov 2019-09-18 12:06:12 +03:00
  • a18f1e7cd7 namings Alex S 2019-09-13 08:07:29 +03:00
  • 17ff63b3c3 docs fix Alex S 2019-09-07 08:56:22 +03:00
  • 2263c8b6b9 little fixes Alex S 2019-09-06 17:20:44 +03:00
  • 4faf2b1555 post for creating invite tokens in admin api Alex S 2019-09-06 17:14:31 +03:00
  • 40c968626d Merge branch 'chore/changelog-separate-1.1' into 'develop' Haelwenn 2019-09-17 21:30:58 +00:00
  • ea6d4137da Apply suggestion to CHANGELOG.md rinpatch 2019-09-17 21:24:21 +00:00
  • e501c822c9
    markdown.ex: put two-spaces before the description-newline Haelwenn (lanodan) Monnier 2019-09-17 23:02:24 +02:00
  • 4785596a2c
    markdown.ex: end suggestions list with a newline Haelwenn (lanodan) Monnier 2019-09-17 22:55:29 +02:00
  • d2097fd0f5
    markdown.ex: \n\n on >1 suggestions, 2-spaces on one Haelwenn (lanodan) Monnier 2019-09-17 22:33:32 +02:00
  • d6182a3c8f
    markdown.ex: Make suggestion(s) plural only if on >1 Haelwenn (lanodan) Monnier 2019-09-17 22:22:54 +02:00
  • 32d64102cb
    description.exs: uncomment type for email logo Haelwenn (lanodan) Monnier 2019-09-17 22:19:30 +02:00
  • c0c5628200
    description.exs: remove empty strings on descriptions Haelwenn (lanodan) Monnier 2019-09-17 22:14:56 +02:00
  • 106afaed58
    markdown.ex: do not fail if there is no children Haelwenn (lanodan) Monnier 2019-09-17 22:04:21 +02:00
  • e0d8c8897e
    docs/markdown.ex: do no print empty suggestions Haelwenn (lanodan) Monnier 2019-09-17 22:00:02 +02:00
  • 50ec445b2c
    description.exs: remove empty strings and arrays Haelwenn (lanodan) Monnier 2019-09-17 21:57:13 +02:00
  • bf8567996c Sync develop changelog with master and create a new section for post-1.1 changes rinpatch 2019-09-17 23:48:26 +03:00
  • b17f217bf3 [#1234] Addressed code analysis issue. Ivan Tashkinov 2019-09-17 23:31:05 +03:00
  • b4d775161c [#1234] Undone reordering-related changes in router.ex. Ivan Tashkinov 2019-09-17 23:24:55 +03:00
  • f758e663b2 Merge branch 'feature/bump-elixir-verstion' into 'develop' rinpatch 2019-09-17 20:09:26 +00:00
  • f9dd121ad3 Admin API: Return link alongside with token on password reset Maxim Filippov 2019-09-17 23:09:08 +03:00
  • e686f9be81 Apply suggestion to CHANGELOG.md Maxim Filippov 2019-09-17 20:04:57 +00:00
  • 01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-09-17 22:53:26 +03:00
  • 2ab7aeb3ab Merge branch 'cherry-pick-764931fc' into 'maint/1.1' rinpatch 2019-09-17 19:49:10 +00:00
  • 7f211a48e0
    docs/markdown.ex: child header as "- key (type): description" Haelwenn (lanodan) Monnier 2019-09-17 21:43:27 +02:00
  • 35dcea3e13
    Remove [true,false] for booleans, it is implicit Haelwenn (lanodan) Monnier 2019-09-13 17:05:19 +02:00
  • f339ec3939 Merge branch 'deps/update-tesla' into 'develop' feld 2019-09-17 19:37:29 +00:00
  • 764931fc9f Merge branch 'deps/update-tesla' into 'develop' feld 2019-09-17 19:37:29 +00:00
  • 228bfd8a70 Bump elixir version to ~> 1.8 Maxim Filippov 2019-09-17 22:36:42 +03:00
  • 0447c42715 Merge branch 'develop' into issue/733 Maksim Pechnikov 2019-09-17 22:20:39 +03:00
  • 76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests. Ivan Tashkinov 2019-09-17 22:19:39 +03:00
  • 79376abae3 Merge branch 'support/package_versions' into 'develop' rinpatch 2019-09-17 19:12:24 +00:00
  • ef2e2c5e12 Merge branch 'feature/return-total-for-reports' into 'develop' rinpatch 2019-09-17 19:09:56 +00:00
  • d201eec45c fixed ecto version Maksim Pechnikov 2019-09-17 22:02:37 +03:00
  • 8d812c28a7 Update Tesla to 1.3 rinpatch 2019-09-17 21:51:50 +03:00
  • 7dd51652f9 Merge branch 'develop' into issue/733 Maksim Pechnikov 2019-09-17 21:20:08 +03:00