Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,310 Commits 1 Branch 0 Tags 222 MiB
f1218a2b4e
Commit Graph

11310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rinpatch
0733da3205 Fix hiding branch name logic 2019-10-14 22:13:18 +03:00
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
8b39d6f93c Merge branch 'master-to-stable' into 'develop' 
Preparations for renaming `master` to `stable`

See merge request pleroma/pleroma!1840
 2019-10-14 16:08:53 +00:00
rinpatch
17b8896c40 Correct version parser branch name detection 2019-10-14 18:45:16 +03:00
rinpatch
d1e969842d Add a changelog entry for branch-moving 2019-10-14 18:42:30 +03:00
rinpatch
58fea88564 Prepare pleroma_ctl for moving master to stable and relax the error 
message
 2019-10-14 18:39:56 +03:00
rinpatch
0e9243e8a2 Preparations for renaming master to stable 2019-10-14 18:38:51 +03:00
Egor Kislitsyn
8ad015ef64
Skip deactivated users in followers import 2019-10-14 14:16:57 +07:00
Egor Kislitsyn
1d46944fbd
Do not add follower_address to following for non local users 2019-10-14 13:50:43 +07:00
eugenijm
a97b642289 Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints 2019-10-14 02:57:21 +03:00
lain
e3b4a3e96b Merge branch 'incoming-id-fixes' into 'develop' 
Assorted transmogrifier fixes

See merge request pleroma/pleroma!1831
 2019-10-13 15:37:49 +00: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 930cbd6d05)

9bdbf081 Make MediaProxy failure tracking less brutal
 2019-10-12 14:43:20 +00:00
rinpatch
930cbd6d05 Merge branch 'fix/mediaproxy-too-brutal' into 'develop' 
Make MediaProxy failure tracking less brutal

See merge request pleroma/pleroma!1836
 2019-10-12 14:42:55 +00:00
rinpatch
9bdbf0811b Make MediaProxy failure tracking less brutal 
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
 2019-10-11 22:52:38 +03: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
Maxim Filippov
751513b6df This line either causes a warning, or a failed test 2019-10-11 19:31:00 +03:00
Maxim Filippov
cc6875b582 Add GET /api/pleroma/admin/relay endpoint - lists all followed relays 2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions 2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it 2019-10-11 15:58:45 +03: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 44afe4c887)

b750135a pleroma_ctl: Make it possible to specify branches/flavours when updating
 2019-10-11 10:57:30 +00:00
Haelwenn
44afe4c887 Merge branch 'pleroma-ctl-enchancements' into 'develop' 
pleroma_ctl: Make it possible to specify branches/flavours when updating

See merge request pleroma/pleroma!1832
 2019-10-11 10:56:45 +00:00
lain
422aa6befe Ostatus DeleteHandler: Fix for new option format. 2019-10-11 12:53:09 +02:00
lain
cb8492962e SearchController: Fix test. 
Turns out you can't actually find the user with this.
 2019-10-11 12:41:44 +02:00
rinpatch
b750135acd pleroma_ctl: Make it possible to specify branches/flavours when updating 2019-10-11 13:22:21 +03:00
lain
37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject. 2019-10-11 11:48:58 +02:00
lain
9b963064eb Transmogrifier: Actually store who deleted a note. 2019-10-11 11:25:45 +02:00
Maxim Filippov
f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it 2019-10-11 00:24:31 +03:00
yalh76
fb5dce481c Fix https://git.pleroma.social/pleroma/pleroma/issues/1289 2019-10-10 20:05:54 +00:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship 2019-10-11 02:35:32 +07:00
lain
29647dfd09 Transmogrifier: Save correct ids for incoming deletes. 2019-10-10 17:17:33 +02:00
Egor Kislitsyn
2c7ff32e5b
Add thread_visibility to migrations 2019-10-10 21:11:34 +07:00
lain
ecd7ac855b Benchmark config: Don't use the sql sandbox. 2019-10-10 15:42:54 +02:00
lain
b9b00e6e96 Gitlab CI: Run correct benchmark task. 2019-10-10 15:31:32 +02:00
lain
2629493804 Benchmark config: Database adjustments. 2019-10-10 15:01:06 +02:00
lain
c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing 2019-10-10 14:40:59 +02:00
lain
d7f9679ff2 Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-10-10 12:38:51 +00:00
lain
02f8e2a8ab Gitlab: Run benchmark in CI. 2019-10-10 14:24:54 +02:00
Maxim Filippov
24eecc3cb4 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-10 03:33:55 +03:00
kaniini
9fd5176c35 Merge branch 'unicode-search' into 'develop' 
Search: Add tests for unicode searches.

See merge request pleroma/pleroma!1824
 2019-10-09 16:33:05 +00:00
kaniini
c9b3f0151b Merge branch 'webfinger-mocks' into 'develop' 
provide mocks for webfinger endpoints

See merge request pleroma/pleroma!1821
 2019-10-09 16:32:28 +00:00