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 |
|
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 |
|
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
|
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 |
|
Ariadne Conill
|
0f1486ed4e
|
update changelog
|
2019-10-04 21:18:38 +00:00 |
|
lain
|
a0435dca26
|
ActivityPub.Utils: Fix undo test.
|
2019-10-04 21:17:52 +00:00 |
|
lain
|
b7d2ca0372
|
ActivityPub: Change addressing of Undo.
|
2019-10-04 21:17:46 +00:00 |
|
kaniini
|
4d38e48558
|
Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1'
Sync 1.1.0 changelog with develop
See merge request pleroma/pleroma!1787
|
2019-10-04 18:23:33 +00:00 |
|
rinpatch
|
3a923be434
|
Remove entries from develop that were in the section for some reason
|
2019-10-04 21:19:17 +03:00 |
|
rinpatch
|
c921e32a44
|
Add back streaming fix entry
|
2019-10-04 21:17:29 +03:00 |
|
rinpatch
|
bfc92946e5
|
Sync 1.1.0 changelog with develop
Mostly !1724 backport, but as a new commit because it was easier
this way
|
2019-10-04 21:16:06 +03:00 |
|
kaniini
|
ca6f1644aa
|
Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'
widen streaming API blocks (for 1.1)
See merge request pleroma/pleroma!1785
|
2019-10-04 17:39:28 +00:00 |
|
kaniini
|
222c238e7b
|
Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'
Backport !1777 to 1.1
See merge request pleroma/pleroma!1786
|
2019-10-04 17:39:20 +00:00 |
|
rinpatch
|
6b7cd7d850
|
Fix get_cached_by_nickname_or_id not allowing to get local users by
nickname
Closes #1293
|
2019-10-04 20:26:48 +03:00 |
|
Ariadne Conill
|
d9e0108baa
|
tests: add missing ExUnit.CaptureLog
|
2019-10-04 16:45:14 +00:00 |
|
Ariadne Conill
|
17fed5ae52
|
application: fix up after_supervisor_start removal backport
|
2019-10-04 16:15:54 +00:00 |
|
Ariadne Conill
|
e951c547f7
|
update changelog
|
2019-10-04 16:06:25 +00:00 |
|
Ariadne Conill
|
abb967671a
|
streamer: worker: actually use should_send? consistently
|
2019-10-04 16:06:20 +00:00 |
|
Ariadne Conill
|
d0e874c7f2
|
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
|
2019-10-04 16:06:14 +00:00 |
|
Ariadne Conill
|
51b317a602
|
streamer: add missing copyright headers
|
2019-10-04 16:06:08 +00:00 |
|
Ariadne Conill
|
4305ddef0a
|
tests: streamer: add a test for blocked transitive activities
|
2019-10-04 16:06:00 +00:00 |
|
Steven Fuchs
|
a2e92a1b8a
|
remove remaining errors from tests
|
2019-10-04 16:05:22 +00:00 |
|
Egor Kislitsyn
|
7d5f20b50f
|
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
|
2019-10-04 16:01:31 +00:00 |
|
rinpatch
|
a553ed5427
|
Merge branch 'remove-dynamic-config-from-1.1' into 'maint/1.1'
Remove in-db configuration references from 1.1
See merge request pleroma/pleroma!1781
|
2019-10-04 13:23:01 +00:00 |
|
rinpatch
|
1e6aa10168
|
Remove in-db configuration references from 1.1
It's still too unstable to be used.
|
2019-10-04 16:17:27 +03:00 |
|