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

8750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kaniini
e51c20f28a Merge branch 'revert-5c04e817' into 'develop' 
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"

See merge request pleroma/pleroma!1794
 2019-10-05 10:00:44 +00:00
kaniini
e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" 
This reverts merge request !1737
 2019-10-05 10:00:05 +00:00
lain
6a85f7d1ea Transmogrifier: Extend misskey like compatibility. 2019-10-05 10:45:42 +02:00
lain
d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions 2019-10-05 10:42:29 +02:00
kaniini
4168ead672 Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1' 
backport MR 1779 to maint/1.1

See merge request pleroma/pleroma!1791
 2019-10-04 22:37:45 +00:00
Ariadne Conill
2714caac8b update changelog 2019-10-04 22:27:14 +00:00
Haelwenn (lanodan) Monnier
dbd78de176 notification_view.ex: Make sure account isn’t empty 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
 2019-10-04 22:27:07 +00:00
kaniini
43be47c161 Merge branch 'backport/hex-flake-id' into 'maint/1.1' 
backport: hex `flake_id` support

See merge request pleroma/pleroma!1793
 2019-10-04 22:11:34 +00:00
kaniini
15513f02d0 Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1' 
backport: Track failed proxy urls and don't request them again

See merge request pleroma/pleroma!1792
 2019-10-04 22:01:38 +00:00
Ariadne Conill
c19e539d37 changelog 2019-10-04 22:00:18 +00:00
Egor Kislitsyn
67d772dd73 Replace Pleroma.FlakeId with flake_id hex package 2019-10-04 21:59:17 +00:00
Sergey Suprunenko
7307d7d676 Track failed proxy urls and don't request them again 2019-10-04 21:49:51 +00:00
kaniini
1dd6d81ddf Merge branch 'backport/issue-1296' into 'maint/1.1' 
backport 1296 fix to maint/1.1

See merge request pleroma/pleroma!1790
 2019-10-04 21:47:34 +00:00
Ariadne Conill
a859abed2e update changelog 2019-10-04 21:36:49 +00:00
Maksim Pechnikov
16a1f95623 removed legacy api: "/objects/:uuid/likes" 2019-10-04 21:36:04 +00:00
kaniini
923dff21b3 Merge branch 'backport/undo-fixes' into 'maint/1.1' 
backport: undo fixes

See merge request pleroma/pleroma!1789
 2019-10-04 21:29:01 +00:00