darkkirb/akkoma
1
0
Fork 0
forked from mirrors/akkoma
Code Pull requests Activity
7773 commits 16 branches 84 tags 294 MiB
Commit graph

7773 commits

This branch
This branch
All branches
Author SHA1 Message Date
Egor Kislitsyn
cf52106e05
Update Floki dependency 2019-12-02 13:38:35 +07:00
rinpatch
0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop' 
Removed users.info field

See merge request pleroma/pleroma!2006
 2019-11-30 10:42:51 +00:00
rinpatch
cf0c861d00 Merge branch 'hide-relation-for-friendica' into 'develop' 
Hide relation for friendica users

See merge request pleroma/pleroma!2026
 2019-11-30 10:41:18 +00:00
rinpatch
b21738d4c0 Merge branch 'benchmarks/favourites_timeline' into 'develop' 
Benchmarks: favourites timeline

See merge request pleroma/pleroma!2027
 2019-11-30 10:39:48 +00:00
kPherox
1915b23e72
test missing first field 2019-11-30 15:43:12 +09:00
kPherox
0326683932
hide follower/following for friendica 2019-11-30 15:43:05 +09:00
lain
a990374e80 Merge branch 'fix/extract_first_external_url' into 'develop' 
Fix Pleroma.HTML.extract_first_external_url/2

Closes #1451

See merge request pleroma/pleroma!2024
 2019-11-29 10:10:30 +00:00
Egor Kislitsyn
a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2 2019-11-29 15:49:35 +07:00
Ivan Tashkinov
52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	mix.lock
 2019-11-29 10:17:59 +03:00
rinpatch
d7b40dd4ba Merge branch 'bugfix/1447-set-following' into 'develop' 
Migrations: Set users.following_count to NOT NULL

Closes #1447

See merge request pleroma/pleroma!2021
 2019-11-28 19:13:42 +00:00
Maksim Pechnikov
a36607c27e add mix task to set\unset privacy option of notification 2019-11-28 22:13:28 +03:00
Maksim Pechnikov
04a8ffbe84 added privacy option to push notifications 2019-11-28 22:13:11 +03:00
Maksim Pechnikov
a52da55eb9 added User.NotificationSetting struct 2019-11-28 22:08:30 +03:00
rinpatch
ca1acfa314 Merge branch 'chore/manual-benchmark' into 'develop' 
CI: Make benchmarks manually triggered.

See merge request pleroma/pleroma!2020
 2019-11-28 17:46:23 +00:00
lain
20564600e8 Merge branch 'use-pg12-in-ci' into 'develop' 
Use PosgreSQL v12 in the federated tests

See merge request pleroma/pleroma!2022
 2019-11-28 16:58:41 +00:00
Egor Kislitsyn
798aa0c335
Use PosgreSQL v12 in the federated tests 2019-11-28 23:08:13 +07:00
lain
f0bdbe3f61 Migrations: Set users.following_count to NOT NULL 
Also set following_count for local users to the correct value and for remote
users to 0.
 2019-11-28 17:01:43 +01:00
lain
98990d2d61 Merge branch 'fed-testing-updates' into 'develop' 
Add federated test infrastructure

See merge request pleroma/pleroma!2014
 2019-11-28 14:34:07 +00:00
lain
9a2d38107c CI: Make benchmarks manually triggered. 2019-11-28 15:14:11 +01:00
lain
8627fb0bb5 Merge branch 'cleanup-tests-output' into 'develop' 
Cleanup tests output

See merge request pleroma/pleroma!2018
 2019-11-28 12:19:15 +00:00
Egor Kislitsyn
c4b468a95b
Cleanup tests output 2019-11-28 16:44:48 +07:00
kaniini
cb656938ca Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop' 
User: Never return nil for user follower counts.

Closes #1442

See merge request pleroma/pleroma!2017
 2019-11-27 16:46:41 +00:00
Maxim Filippov
fcabcab443 Fetch account from report, not from status (it might be deleted) 2019-11-28 00:09:00 +09:00
Maxim Filippov
5135656f57 Handle reopened reports with deleted statuses 2019-11-27 22:54:12 +09:00
lain
50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count 2019-11-27 14:48:28 +01:00
lain
ef1718a045 Merge branch 'remove-user-info' into 'develop' 
Remove User.user_info/2

See merge request pleroma/pleroma!2016
 2019-11-27 13:40:39 +00:00
lain
f36724efb1 User: Never return nil for user follower counts. 2019-11-27 14:13:36 +01:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2 2019-11-27 19:43:47 +07:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification 2019-11-27 17:52:02 +07:00
stwf
bd1984f054 update tests and Oban 2019-11-26 15:24:34 -05:00
lain
bbec9bb727 Tests: Run the daemon 2019-11-26 15:03:17 -05:00
lain
74aa42998f CI: Add testing stage for federated tests. 2019-11-26 15:03:16 -05:00
lain
717d246491 Tests: Don't run federated tests by default 2019-11-26 15:03:16 -05:00
Chris McCord
f01881e82a Add federated test infrastructure 2019-11-26 15:01:35 -05:00
lain
139b1feda1 Merge branch 'feature/direct_conversation_id_web_push' into 'develop' 
Add `direct_conversation_id` to web push payload

See merge request pleroma/pleroma!2012
 2019-11-26 19:43:16 +00:00
Egor Kislitsyn
4af69f047d
Remove account field from web push payload 2019-11-27 02:32:55 +07:00
Egor Kislitsyn
80ededc04f
Add direct_conversation_id to web push payload 2019-11-26 19:53:43 +07:00
feld
eb3c47f1d8 Merge branch 'fix/prod-syslog-level' into 'develop' 
Default log level for syslog in prod should also be :warn

See merge request pleroma/pleroma!2011
 2019-11-26 12:03:44 +00:00
Mark Felder
f673e3deef Default log level for syslog in prod should also be :warn 2019-11-26 05:46:48 -06:00
Ivan Tashkinov
c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex
 2019-11-26 10:42:36 +03:00
Maxim Filippov
5869a43fe7 Fix tests 2019-11-26 01:06:54 +09:00
Maxim Filippov
b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status 2019-11-26 00:25:43 +09:00
lain
dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop' 
Disable rendering AP representation for remote users and objects

See merge request pleroma/pleroma!2010
 2019-11-25 15:23:45 +00:00
Maxim Filippov
b3b4e5ca80 AdminAPI: Grouped reports old/new fix 
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
 2019-11-26 00:20:46 +09:00
Maxim Filippov
1364d303f8 AdminAPI: Fix grouped reports for closed/resolved reports 2019-11-26 00:13:11 +09:00
rinpatch
4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead 2019-11-25 17:55:17 +03:00
rinpatch
02f7383891 ActivityPub controller: do not render remote users 2019-11-25 17:19:33 +03:00
feld
5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' 
Admin API: list all statuses from a given instance

See merge request pleroma/pleroma!1981
 2019-11-25 13:29:53 +00:00
feld
9374b52756 Merge branch 'fix/update-reports-old-format' into 'develop' 
Admin API: Fix error when trying to update reports in the "old" format

See merge request pleroma/pleroma!1986
 2019-11-25 13:29:22 +00:00
rinpatch
756bdef5f5 Merge branch 'feature/useragent-override' into 'develop' 
Add ability to set a custom user-agent string

See merge request pleroma/pleroma!2009
 2019-11-25 11:36:59 +00:00