fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
7750 commits 26 branches 107 tags 316 MiB
Commit graph

7750 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rinpatch 8dbe2dfde1 docs: use tabs and improve grammar in OTP install guide 2019-12-09 20:09:47 +03:00
rinpatch 0a8b32a661 docs: remove overoptimistic OTP benefits and use tabs in migration from source 2019-12-09 20:08:31 +03:00
rinpatch b0505b2cc7 docs: fix incorrect display in digest task docs 2019-12-09 20:07:43 +03:00
rinpatch 990cd7ef5d Merge branch 'feat/docs-otp-source-picker' into 'develop' 
docs: add OTP/From source tabs to CLI tasks

See merge request pleroma/pleroma!2046
 2019-12-09 10:27:43 +00:00
rinpatch 1e2bb450db Merge branch 'move-api-docs' into 'develop' 
Document `with_move` parameter of the notification API

See merge request pleroma/pleroma!2047
 2019-12-09 10:16:26 +00:00
Egor Kislitsyn b4027e7187 Document with_move parameter of the notification API 2019-12-09 14:46:06 +07:00
rinpatch eb9ea8475b docs: add OTP/From source tabs to CLI tasks 2019-12-09 04:07:16 +03:00
rinpatch af5fef1f22 Merge branch 'fix/clause-never-matches' into 'develop' 
Fix never matching clause

See merge request pleroma/pleroma!2042
 2019-12-08 13:50:57 +00:00
rinpatch a21340caa1 Fix never matching clause 
`length/1` is only used with lists.
 2019-12-08 16:46:18 +03:00
rinpatch 8404f8c8fb Merge branch 'improve-move-notificaions-api' into 'develop' 
Add `with_move` query param to the notifications API

See merge request pleroma/pleroma!2032
 2019-12-08 13:07:05 +00:00
rinpatch 29a3f70cba Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop' 
ActivityPub: For user timelines, respects blocks.

Closes #1463

See merge request pleroma/pleroma!2041
 2019-12-08 11:23:31 +00:00
rinpatch 6cb31edd76 Merge branch 'feature/1455-chat-character-limit' into 'develop' 
Feature/1455 chat character limit

Closes #1455

See merge request pleroma/pleroma!2034
 2019-12-06 15:36:30 +00:00
lain a280be34e3 Merge branch 'fix/mrf-delete' into 'develop' 
ActivityPub: Fix deletes being exempt from MRF

Closes #1461

See merge request pleroma/pleroma!2037
 2019-12-06 13:48:37 +00: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
rinpatch cdff5b8267 Merge branch 'develop' into fix/mrf-delete 2019-12-06 00:12:21 +03:00
rinpatch 9f99640cfc ActivityPub: Fix deletes being exempt from MRF 
Closes #1461
 2019-12-05 21:45:57 +03:00
lain 67d8df04a4 Merge branch '1335-user-api-id-fields-relations' into 'develop' 
[#1335] User: refactoring of AP ID fields into relations

Closes #1335

See merge request pleroma/pleroma!1963
 2019-12-05 17:16:23 +00:00
feld d0bd4348b3 Merge branch 'feature/admin-api-render-whole-status' into 'develop' 
Miscellaneous grouped reports fixes

Closes admin-fe#48 and admin-fe#51

See merge request pleroma/pleroma!2007
 2019-12-05 13:34:34 +00:00
Egor Kislitsyn d4953474ac Merge branch 'develop' into improve-move-notificaions-api 2019-12-05 14:55:48 +07:00
Ivan Tashkinov d3bce89edd [#1335] Merge issue fix. 2019-12-04 19:41:14 +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
lain 228bf4d214 Merge branch 'fix_test' into 'develop' 
[#1457] fix test

See merge request pleroma/pleroma!2035
 2019-12-04 13:25:12 +00:00
lain 24599c519f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit 2019-12-04 14:25:00 +01:00
Maksim Pechnikov ed7f850ad2 fix test 2019-12-04 16:22:01 +03:00
lain 9487995e8b Cheat Sheet: Addg chat_limit information. 2019-12-04 12:51:06 +01:00
lain 21353a8ee9 Changelog: Add information about chat limit. 2019-12-04 12:49:46 +01:00
lain aa97fe8f17 ChatChannel: Ignore messages that are too long. 2019-12-04 12:48:34 +01:00
Egor Kislitsyn 05fb8d0084 Fix Pleroma.FollowingRelationship.move_following/2 2019-12-03 22:31:12 +07:00
Egor Kislitsyn 624e720aa4 Add with_move query param to the notifications API 2019-12-03 22:13:38 +07: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
rinpatch d468cba2d5 Merge branch 'update-floki' into 'develop' 
Update Floki dependency

See merge request pleroma/pleroma!2028
 2019-12-02 11:18:58 +00:00
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
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