itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
8774 commits 3 branches 2 tags 276 MiB
Commit graph

136 commits

Author SHA1 Message Date
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task 2020-03-23 10:44:47 +03:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting 2020-03-20 16:36:20 +03:00
rinpatch
38f796a5c6 Merge branch 'feature/mastofe-admin-scope' into 'develop' 
auth_controller.ex: Add admin scope to MastoFE

See merge request pleroma/pleroma!2256
 2020-03-13 18:58:52 +00:00
feld
2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop' 
Allow account registration without an email

See merge request pleroma/pleroma!2246
 2020-03-11 16:53:05 +00:00
lain
4bce13fa2f MastodonController: Return 404 errors correctly. 2020-03-04 18:09:06 +01:00
Mark Felder
05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email 2020-03-02 15:35:49 +04:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07 
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
 2020-03-02 06:08:45 +01:00
rinpatch
b5465bf385 timeline controller: add a TODO for replacing copypaste with a macro 2020-03-01 02:03:46 +03:00
rinpatch
ffcebe7e22 timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user 2020-03-01 01:13:08 +03:00
Haelwenn (lanodan) Monnier
3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
 2020-02-29 01:25:14 +01:00
Egor Kislitsyn
f446744a6a
Allow account registration without an email 2020-02-26 20:13:53 +04:00
Maksim Pechnikov
21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
Hakaba Hitoyo
dabd535e43 Remove user recommendation by third party engine 2020-01-27 13:21:50 +00:00
Maksim Pechnikov
8589632d09 fixed delete ScheduledActivity 2020-01-23 17:18:23 +03:00
Maksim Pechnikov
b8d5c09f48 Merge branch 'develop' into issue/1383 2020-01-22 09:30:30 +03:00
Maksim Pechnikov
6e88a7e591 exclude blocked user posts from search results 2020-01-21 07:40:13 +03:00
lain
6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop' 
Bump credo to 1.1.5

See merge request pleroma/pleroma!2115
 2020-01-20 14:42:43 +00:00
Haelwenn
e8759cb5ba Merge branch 'hashtag-benchmarks' into 'develop' 
Hashtag benchmarks

See merge request pleroma/pleroma!2116
 2020-01-20 11:26:07 +00:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
lain
2ee6754095 Mix Tasks: Add pleroma.benchmarks.tags 2020-01-14 17:24:26 +01:00
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found 2019-12-19 20:45:44 +07:00
Maksim Pechnikov
67cb46e15d Merge branch 'develop' into issue/1383 2019-12-14 21:44:10 +03:00
Mark Felder
9ef912aecf Merge branch 'develop' into issue/1411 2019-12-11 15:02:53 -06:00
Hakaba Hitoyo
701815e64c [ActivityPub] Configurable ActivityPub actor type 2019-12-10 13:19:26 +00:00
Maksim Pechnikov
5876a9cb79 Merge branch 'develop' into issue/1383 2019-12-08 19:52:46 +03:00
lain
e8cee4d9a0 ActivityPub: For user timelines, respects blocks. 
Unless the timeline belongs to a blocked user.
 2019-12-06 14:25:13 +01:00
Maksim Pechnikov
e21afdb7c7 Merge branch 'develop' into issue/1411 2019-12-05 12:18:59 +03:00
Ivan Tashkinov
30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user.ex
 2019-12-04 18:56:31 +03:00
Maksim Pechnikov
29a98b86b7 Merge branch 'develop' into issue/1383 2019-12-04 09:34:44 +03:00
Maksim Pechnikov
652cc6ba4b updated ScheduledActivity 2019-12-04 09:12:17 +03:00
lain
7722e5a67a Merge branch 'feature/move-activity' into 'develop' 
Support "Move" activity

Closes #1316

See merge request pleroma/pleroma!1883
 2019-12-02 16:26:19 +00:00
Maksim Pechnikov
88f7cf51d4 Merge branch 'develop' into issue/1411 2019-12-01 16:18:16 +03:00
Ivan Tashkinov
cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs
 2019-11-21 16:47:52 +03:00
lain
8feb5dcb42 Merge branch 'issue/1348' into 'develop' 
[#1348] excluded invisible actors from gets  /api/v1/accounts/:id

See merge request pleroma/pleroma!1937
 2019-11-21 13:13:14 +00:00
Ivan Tashkinov
ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring. 2019-11-19 23:22:10 +03:00
Maksim Pechnikov
0937895182 updated fetch_favorites 2019-11-18 16:56:47 +03:00
Maksim Pechnikov
9da4c88b49 fix test 2019-11-18 10:00:48 +03:00
Maksim Pechnikov
4beb3ce5c5 /api/v1/favourites: added sorting for activites by adds to favorites 2019-11-18 09:44:08 +03:00
Ivan Tashkinov
01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 2019-11-15 21:40:14 +03:00
Ivan Tashkinov
c31ddce51e [#1335] Reorganized users.mutes as relation to UserMute entity. 2019-11-15 21:38:54 +03:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity 2019-11-14 16:39:45 +07:00
Egor Kislitsyn
e6d7e27bd6
Add allow_following_move setting to User 2019-11-12 18:45:28 +07:00
Steven Fuchs
94627baa5c New rate limiter 2019-11-11 12:13:06 +00:00
Ivan Tashkinov
3db988250b [#1335] User: refactored :blocks field into :blocked_users relation. 
Introduced UserBlock.
 2019-11-10 16:30:21 +03:00
Maksim Pechnikov
9d0b989521 add subject to atom feed 2019-11-10 11:10:20 +03:00
Maksim Pechnikov
4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id 2019-11-04 20:44:24 +03:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Ivan Tashkinov
8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	lib/pleroma/notification.ex
 2019-10-23 17:22:42 +03:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships 2019-10-21 14:19:15 +07:00