0733da3205
Fix hiding branch name logic
5 years ago
988654a720
Merge branch 'stable-fix-docs' into 'stable'
...
Fix documentation deploy for stable
See merge request pleroma/pleroma!1844
5 years ago
dd859e6847
Fix documentation deploy for stable
5 years ago
442acb31ac
Fix pleroma_ctl link
5 years ago
832d892c2c
Merge branch 'final-release-prep' into 'maint/1.1'
...
Final 1.1 release preparations
See merge request pleroma/pleroma!1843
5 years ago
8ef4afcc3b
Final 1.1 release preparations
5 years ago
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
5 years ago
2b6cd10b68
Correct version parser branch name detection
5 years ago
164f42c5f8
Add a changelog entry for branch-moving
5 years ago
bbe409c914
Prepare pleroma_ctl for moving master to stable and relax the error
...
message
5 years ago
3d3c166e59
Preparations for renaming `master` to `stable`
5 years ago
1f99abbeba
Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
...
Backport mediaproxy failure tracking enchancements to maint
See merge request pleroma/pleroma!1837
5 years ago
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
5 years ago
d9410c488a
Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'
...
Backport pleroma-ctl enchancements to maint
See merge request pleroma/pleroma!1833
5 years ago
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
5 years ago
ac113f6724
Merge branch 'backport/exclude-replies' into 'maint/1.1'
...
mastodon api: fix exclude_replies (closes #1287 )
See merge request pleroma/pleroma!1816
5 years ago
3e1d2ace73
mastodon api: fix exclude_replies ( closes #1287 )
5 years ago
72bd763d9f
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
...
update changelog date
See merge request pleroma/pleroma!1812
5 years ago
129fb9f499
update changelog date
5 years ago
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
5 years ago
c5b7d2ef26
Pleroma 1.0.91 (aka 1.1 RC2).
5 years ago
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
5 years ago
cb36fe0128
Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'
...
clean up bundled litepub schema (closes #1303 )
See merge request pleroma/pleroma!1809
5 years ago
d3e04d5590
clean up bundled litepub schema ( closes #1303 )
5 years ago
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`)
5 years ago
f6ff19e074
Merge branch 'backport/custom-field-update' into 'maint/1.1'
...
Backport: custom field update
See merge request pleroma/pleroma!1805
5 years ago
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
5 years ago
c6b7980303
changelog
5 years ago
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
5 years ago
c5338764df
Extract if block into private function
5 years ago
cc84563796
Update test for custom fields when content-type urlencoded
5 years ago
86bc83efe5
Update test for custom fields when name empty string
5 years ago
db6c5aa66a
Change to delete empty name field
5 years ago
313b134fac
Fix type of fields_attributes
...
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
5 years ago
81abee22b6
Rename fields to fields_attributes
5 years ago
8a52f30356
Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'
...
backport: poll refreshing
See merge request pleroma/pleroma!1804
5 years ago
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
5 years ago
bab901bfd7
add changelog
5 years ago
c7313c8dfb
Fix credo issues
5 years ago
40c7d6fa17
Do not refetch local objects
5 years ago
644bc1e64a
Preserve internal fields when reinjecting
5 years ago
845e8ad5f6
Move object internal fields to a constant
5 years ago
b9cdead076
Set updated_at even if the object stayed the same
5 years ago
8be9a9b5bb
Fix wrong argument order when calling NaiveDateTime.diff
5 years ago
f95ae0e50a
Capture log in object refetch tests
5 years ago
eae9a6d34d
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
2a2d834ff7
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
5 years ago
a0d336a828
Fix the use of queries with a schema in a migration
5 years ago
c58da11182
Move local keys out of `user.info`
5 years ago
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
5 years ago
rinpatch