rinpatch
988654a720
Merge branch 'stable-fix-docs' into 'stable'
...
Fix documentation deploy for stable
See merge request pleroma/pleroma!1844
2019-10-14 18:55:09 +00:00
rinpatch
dd859e6847
Fix documentation deploy for stable
2019-10-14 21:54:13 +03:00
rinpatch
442acb31ac
Fix pleroma_ctl link
2019-10-14 21:29:47 +03:00
rinpatch
832d892c2c
Merge branch 'final-release-prep' into 'maint/1.1'
...
Final 1.1 release preparations
See merge request pleroma/pleroma!1843
2019-10-14 18:21:49 +00:00
rinpatch
8ef4afcc3b
Final 1.1 release preparations
2019-10-14 21:20:29 +03:00
rinpatch
13966f1504
Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'
...
Backport/1.1 branch name change
See merge request pleroma/pleroma!1841
2019-10-14 16:47:27 +00:00
rinpatch
2b6cd10b68
Correct version parser branch name detection
2019-10-14 19:34:38 +03:00
rinpatch
164f42c5f8
Add a changelog entry for branch-moving
2019-10-14 19:34:29 +03:00
rinpatch
bbe409c914
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
2019-10-14 19:34:06 +03:00
rinpatch
3d3c166e59
Preparations for renaming master to stable
2019-10-14 19:33:57 +03:00
rinpatch
1f99abbeba
Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
...
Backport mediaproxy failure tracking enchancements to maint
See merge request pleroma/pleroma!1837
2019-10-12 14:54:49 +00:00
rinpatch
a8afbe977a
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'
...
Make MediaProxy failure tracking less brutal
See merge request pleroma/pleroma!1836
(cherry picked from commit 930cbd6d059bdbf081
2019-10-12 14:43:20 +00:00
rinpatch
d9410c488a
Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'
...
Backport pleroma-ctl enchancements to maint
See merge request pleroma/pleroma!1833
2019-10-11 19:39:37 +00:00
Haelwenn
fbbb032bc5
Merge branch 'pleroma-ctl-enchancements' into 'develop'
...
pleroma_ctl: Make it possible to specify branches/flavours when updating
See merge request pleroma/pleroma!1832
(cherry picked from commit 44afe4c887b750135a
2019-10-11 10:57:30 +00:00
kaniini
ac113f6724
Merge branch 'backport/exclude-replies' into 'maint/1.1'
...
mastodon api: fix exclude_replies (closes #1287 )
See merge request pleroma/pleroma!1816
2019-10-07 13:12:46 +00:00
Ariadne Conill
3e1d2ace73
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 13:01:05 +00:00
kaniini
72bd763d9f
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
...
update changelog date
See merge request pleroma/pleroma!1812
2019-10-07 12:14:56 +00:00
Ariadne Conill
129fb9f499
update changelog date
2019-10-07 12:14:04 +00:00
kaniini
d928f0c4c3
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
...
Pleroma 1.0.91 (aka 1.1 RC2).
See merge request pleroma/pleroma!1811
2019-10-07 12:12:45 +00:00
Ariadne Conill
c5b7d2ef26
Pleroma 1.0.91 (aka 1.1 RC2).
2019-10-07 12:10:57 +00:00
kaniini
079d069eb4
Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1'
...
backport: Mastodon API: Fix private and direct statuses not being filtered out from the...
See merge request pleroma/pleroma!1807
2019-10-07 11:40:31 +00:00
kaniini
cb36fe0128
Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'
...
clean up bundled litepub schema (closes #1303 )
See merge request pleroma/pleroma!1809
2019-10-07 11:37:01 +00:00
Ariadne Conill
d3e04d5590
clean up bundled litepub schema ( closes #1303 )
2019-10-07 11:36:05 +00:00
eugenijm
790ae8e189
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)
2019-10-07 11:28:51 +00:00
kaniini
f6ff19e074
Merge branch 'backport/custom-field-update' into 'maint/1.1'
...
Backport: custom field update
See merge request pleroma/pleroma!1805
2019-10-06 15:33:33 +00:00
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
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
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
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
