lain
|
a7f31bf06c
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-09-13 16:31:27 +02:00 |
|
lain
|
f649a2e972
|
Pleroma API Docs: Documented Emoji reaction endpoints.
|
2019-09-13 16:19:50 +02:00 |
|
lain
|
e5b3ad3d04
|
ActivityPub: Use is_unicode_emoji? function.
|
2019-09-13 16:06:34 +02:00 |
|
Haelwenn
|
0d9609894f
|
Merge branch 'feature/change-email' into 'develop'
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
|
2019-09-13 12:46:16 +00:00 |
|
rinpatch
|
f884987ace
|
Merge branch 'admin-config-description' into 'develop'
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
|
2019-09-13 12:36:24 +00:00 |
|
Maksim Pechnikov
|
bc3e8c033b
|
fix formatting
|
2019-09-13 15:06:34 +03:00 |
|
Maksim Pechnikov
|
ec5aaf5bd7
|
fix tests
|
2019-09-13 14:59:58 +03:00 |
|
rinpatch
|
3896a51b8a
|
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
|
2019-09-13 10:09:56 +00:00 |
|
rinpatch
|
5170170483
|
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
|
2019-09-13 10:09:46 +00:00 |
|
rinpatch
|
fb96facc32
|
Remove unused functions and fix credo issues
|
2019-09-13 12:29:42 +03:00 |
|
rinpatch
|
ce23529d91
|
Use delivery info when federating deletes
|
2019-09-13 11:38:17 +03:00 |
|
Egor Kislitsyn
|
7b5c81b391
|
Add a note about compatibility with Mastodon
|
2019-09-13 13:09:37 +07:00 |
|
Egor Kislitsyn
|
25d8216804
|
Add email change endpoint
|
2019-09-13 13:09:35 +07:00 |
|
Egor Kislitsyn
|
5bfbad13ad
|
Add more tests for Pleroma.Activity
|
2019-09-13 12:49:52 +07:00 |
|
Egor Kislitsyn
|
39dc9b470c
|
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
|
2019-09-13 12:44:59 +07:00 |
|
Maksim Pechnikov
|
d8a178274b
|
fix Activity.get_by_id
|
2019-09-13 07:12:34 +03:00 |
|
Maksim
|
58b17196fa
|
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
|
2019-09-13 03:58:58 +00:00 |
|
Maksim Pechnikov
|
2b40e57a72
|
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
|
2019-09-13 06:55:05 +03:00 |
|
kaniini
|
5ca643b80d
|
Merge branch 'fix/admin-api-docs' into 'develop'
Fix admin api docs for creating users
See merge request pleroma/pleroma!1660
|
2019-09-13 03:31:16 +00:00 |
|
Angelina Filippova
|
528a88a686
|
Fix admin api docs for creating users
|
2019-09-13 03:31:16 +00:00 |
|
lain
|
a697f0d791
|
Emoji: Add function to detect if a character is an emoji
|
2019-09-13 02:11:02 +02:00 |
|
Haelwenn
|
51609217c2
|
Merge branch 'fix/error-log-double-quotes' into 'develop'
Fix double quotes in error logs
See merge request pleroma/pleroma!1656
|
2019-09-12 20:21:56 +00:00 |
|
rinpatch
|
b0e6058021
|
Parse http signature for request to objects/activities
|
2019-09-12 23:03:52 +03:00 |
|
Maksim Pechnikov
|
936951826e
|
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
|
2019-09-12 22:15:43 +03:00 |
|
rinpatch
|
dabc4a00f5
|
Put the cache with the right key when using a tracking function
|
2019-09-12 22:10:15 +03:00 |
|
rinpatch
|
769fb778d4
|
Track object/create activity fetches
|
2019-09-12 21:37:36 +03:00 |
|
Mark Felder
|
102eb4455c
|
Fix associated test as well
|
2019-09-12 12:29:08 -05:00 |
|
lain
|
8d4b661ecb
|
Transmogrifier: Strip internal emoji reaction fields.
|
2019-09-12 18:59:13 +02:00 |
|
lain
|
05e9776517
|
PleromaAPIController: Add endpoint to fetch emoji reactions.
|
2019-09-12 18:48:25 +02:00 |
|
Maksim Pechnikov
|
4f548cb2b7
|
added test for Ostatus
|
2019-09-12 10:25:43 +03:00 |
|
Mark Felder
|
74e4c72c4a
|
Fix double quotes in error logs
Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil
|
2019-09-11 16:16:09 -05:00 |
|
kaniini
|
50269e9cac
|
Merge branch 'feature/jason-view-render' into 'develop'
Use Jason for rendering responses
See merge request pleroma/pleroma!1655
|
2019-09-11 20:47:25 +00:00 |
|
Maksim Pechnikov
|
007e0c1ce1
|
added tests
|
2019-09-11 23:19:06 +03:00 |
|
rinpatch
|
56828abf6d
|
Use Jason for rendering responses
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59))
|
2019-09-11 23:06:31 +03:00 |
|
Haelwenn
|
46ae62d159
|
Merge branch 'patch-5' into 'develop'
Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642
|
2019-09-11 17:47:19 +00:00 |
|
lain
|
fb7332aec7
|
Merge branch 'fix/oom-parallel-rendering' into 'develop'
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
|
2019-09-11 11:21:03 +00:00 |
|
rinpatch
|
5a76d5d239
|
Add extended benchmark
|
2019-09-11 11:13:17 +03:00 |
|
Alex S
|
e47089cf55
|
web_cache_ttl description
|
2019-09-11 09:32:58 +03:00 |
|
Alex S
|
38b29779c3
|
refactoring
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
be32d90a0c
|
little refactor
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
5ff12e7df1
|
some changes
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
aa7fb22008
|
placeholder for config.md
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
57dc59d98d
|
little fix
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
6b0e8b73df
|
bump ex_doc version
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
10827eecad
|
formatting
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
35757b6d0e
|
don't add behaviour to suggestions
|
2019-09-11 09:25:33 +03:00 |
|
Alexander Strizhakov
|
5db2920644
|
Apply suggestion to config/description.exs
|
2019-09-11 09:25:33 +03:00 |
|
Alexander Strizhakov
|
65bc9e66ad
|
Apply suggestion to config/description.exs
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
0624e06a9c
|
little fix
|
2019-09-11 09:25:33 +03:00 |
|
Alex S
|
8f5ee7db06
|
typo fix
|
2019-09-11 09:25:33 +03:00 |
|