rinpatch
|
b5e6ba323d
|
Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'
Backport moving out keys from user info to 1.1
See merge request pleroma/pleroma!1801
|
2019-10-06 15:32:33 +00:00 |
|
Ariadne Conill
|
c6b7980303
|
changelog
|
2019-10-06 15:21:18 +00:00 |
|
rinpatch
|
e442180d11
|
Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
|
2019-10-06 18:20:24 +03:00 |
|
kaniini
|
25cffffaf1
|
Merge branch 'fix/bad-migration' into 'develop'
Fix muted notification migration only working with a schema
See merge request pleroma/pleroma!1803
|
2019-10-06 15:15:00 +00:00 |
|
kPherox
|
c5338764df
|
Extract if block into private function
|
2019-10-06 15:14:53 +00:00 |
|
kPherox
|
cc84563796
|
Update test for custom fields when content-type urlencoded
|
2019-10-06 15:14:46 +00:00 |
|
kPherox
|
86bc83efe5
|
Update test for custom fields when name empty string
|
2019-10-06 15:14:39 +00:00 |
|
kPherox
|
db6c5aa66a
|
Change to delete empty name field
|
2019-10-06 15:14:31 +00:00 |
|
kPherox
|
313b134fac
|
Fix type of fields_attributes
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
|
2019-10-06 15:14:27 +00:00 |
|
kPherox
|
81abee22b6
|
Rename fields to fields_attributes
|
2019-10-06 15:14:21 +00:00 |
|
kaniini
|
8a52f30356
|
Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'
backport: poll refreshing
See merge request pleroma/pleroma!1804
|
2019-10-06 15:07:38 +00:00 |
|
rinpatch
|
ee88afb2e2
|
Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
|
2019-10-06 18:06:04 +03:00 |
|
kaniini
|
10f4ce848a
|
Merge branch 'backport/fix-report-email' into 'maint/1.1'
backport: Use the user.id instead of nickname in report URLs
See merge request pleroma/pleroma!1802
|
2019-10-06 14:59:58 +00:00 |
|
Ariadne Conill
|
bab901bfd7
|
add changelog
|
2019-10-06 14:54:44 +00:00 |
|
rinpatch
|
c7313c8dfb
|
Fix credo issues
|
2019-10-06 14:53:55 +00:00 |
|
rinpatch
|
40c7d6fa17
|
Do not refetch local objects
|
2019-10-06 14:53:48 +00:00 |
|
rinpatch
|
644bc1e64a
|
Preserve internal fields when reinjecting
|
2019-10-06 14:53:40 +00:00 |
|
rinpatch
|
845e8ad5f6
|
Move object internal fields to a constant
|
2019-10-06 14:53:34 +00:00 |
|
rinpatch
|
b9cdead076
|
Set updated_at even if the object stayed the same
|
2019-10-06 14:53:29 +00:00 |
|
rinpatch
|
8be9a9b5bb
|
Fix wrong argument order when calling NaiveDateTime.diff
|
2019-10-06 14:53:23 +00:00 |
|
rinpatch
|
f95ae0e50a
|
Capture log in object refetch tests
|
2019-10-06 14:53:17 +00:00 |
|
rinpatch
|
eae9a6d34d
|
Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
|
2019-10-06 14:53:11 +00:00 |
|
feld
|
2a2d834ff7
|
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
|
2019-10-06 14:48:37 +00:00 |
|
rinpatch
|
a0d336a828
|
Fix the use of queries with a schema in a migration
|
2019-10-06 17:36:42 +03:00 |
|
rinpatch
|
c58da11182
|
Move local keys out of user.info
|
2019-10-06 17:36:24 +03:00 |
|
kaniini
|
2411d09215
|
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
|
2019-10-06 14:32:56 +00:00 |
|
rinpatch
|
125f96e706
|
Fix the use of queries with a schema in a migration
|
2019-10-06 17:23:43 +03:00 |
|
feld
|
09a3b993fe
|
Merge branch 'fix/report-email' into 'develop'
Fix/report email
Closes #1300
See merge request pleroma/pleroma!1800
|
2019-10-06 14:13:04 +00:00 |
|
feld
|
1d8e956c32
|
Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
|
2019-10-06 14:13:04 +00:00 |
|
Ivan Tashkinov
|
b93856874d
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 17:12:17 +03:00 |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of user.info
|
2019-10-06 16:56:36 +03:00 |
|
Ivan Tashkinov
|
06b3bb54c5
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
2019-10-06 11:43:49 +03:00 |
|
lain
|
61097ba6ab
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
2019-10-06 08:11:47 +00:00 |
|
Ivan Tashkinov
|
f459aabdfa
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
# Conflicts:
# CHANGELOG.md
|
2019-10-06 09:30:49 +03:00 |
|
Haelwenn
|
9e34919dcd
|
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
|
2019-10-06 04:41:06 +00:00 |
|
kaniini
|
294e08cb65
|
Merge branch 'backport/update-activity-fixes' into 'maint/1.1'
backport update activity fixes to maint/1.1
See merge request pleroma/pleroma!1797
|
2019-10-05 19:46:23 +00:00 |
|
Ariadne Conill
|
565809592c
|
update changelog
|
2019-10-05 19:32:23 +00:00 |
|
lain
|
b97a7709c7
|
CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
|
2019-10-05 19:31:11 +00:00 |
|
lain
|
4d85e07e9e
|
ActivityPub / Transmogrifier: Correctly store incoming Update id.
|
2019-10-05 19:31:03 +00:00 |
|
kaniini
|
7a318d74e6
|
Merge branch 'split-masto-api/leftovers' into 'develop'
[#1278] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
|
2019-10-05 19:28:53 +00:00 |
|
kaniini
|
45b7f03f89
|
Merge branch 'accept-embedded-announce-object' into 'develop'
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
|
2019-10-05 19:28:29 +00:00 |
|
kaniini
|
17ff4b43cb
|
Merge branch 'unread-conversation-count' into 'develop'
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
|
2019-10-05 19:28:07 +00:00 |
|
eugenijm
|
8249924485
|
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
|
2019-10-05 20:12:00 +03:00 |
|
kaniini
|
0ee6100c8d
|
Merge branch 'update-activity-fixes' into 'develop'
Update activity fixes
Closes #1298
See merge request pleroma/pleroma!1795
|
2019-10-05 15:51:19 +00:00 |
|
lain
|
1ed8fbc4d9
|
Merge remote-tracking branch 'origin/develop' into reactions
|
2019-10-05 15:10:57 +02:00 |
|
lain
|
276a520163
|
CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
|
2019-10-05 14:53:50 +02:00 |
|
lain
|
4b8524f392
|
ActivityPub / Transmogrifier: Correctly store incoming Update id.
|
2019-10-05 14:49:45 +02:00 |
|
Thibaut Girka
|
b1ff66dc5f
|
Add test for handling Announces with inlined object from different origin
|
2019-10-05 13:56:40 +02:00 |
|
Thibaut Girka
|
791d93ff0e
|
Make credo happy
|
2019-10-05 13:56:40 +02:00 |
|
Thibaut Girka
|
977e711e22
|
Import object from self-Announce whenever possible
|
2019-10-05 13:56:40 +02:00 |
|