Maksim Pechnikov
|
e21afdb7c7
|
Merge branch 'develop' into issue/1411
|
5 years ago |
|
Egor Kislitsyn
|
d4953474ac
|
Merge branch 'develop' into improve-move-notificaions-api
|
5 years ago |
|
Maxim Filippov
|
4453a9cb73
|
Add failing test, which exposes a bug
|
5 years ago |
|
Ivan Tashkinov
|
d3bce89edd
|
[#1335] Merge issue fix.
|
5 years ago |
|
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
|
lain
|
228bf4d214
|
Merge branch 'fix_test' into 'develop'
[#1457] fix test
See merge request pleroma/pleroma!2035
|
5 years ago |
|
lain
|
24599c519f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
|
5 years ago |
|
Maksim Pechnikov
|
ed7f850ad2
|
fix test
|
5 years ago |
|
lain
|
9487995e8b
|
Cheat Sheet: Addg chat_limit information.
|
5 years ago |
|
lain
|
21353a8ee9
|
Changelog: Add information about chat limit.
|
5 years ago |
|
lain
|
aa97fe8f17
|
ChatChannel: Ignore messages that are too long.
|
5 years ago |
|
Egor Kislitsyn
|
05fb8d0084
|
Fix Pleroma.FollowingRelationship.move_following/2
|
5 years ago |
|
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
5 years ago |
|
Egor Kislitsyn
|
624e720aa4
|
Add `with_move` query param to the notifications API
|
5 years ago |
|
lain
|
7722e5a67a
|
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
5 years ago |
|
rinpatch
|
d468cba2d5
|
Merge branch 'update-floki' into 'develop'
Update Floki dependency
See merge request pleroma/pleroma!2028
|
5 years ago |
|
Egor Kislitsyn
|
356a936ecb
|
Fix `mix pleroma.user list` task
|
5 years ago |
|
Egor Kislitsyn
|
cf52106e05
|
Update Floki dependency
|
5 years ago |
|
Maksim Pechnikov
|
88f7cf51d4
|
Merge branch 'develop' into issue/1411
|
5 years ago |
|
rinpatch
|
0d24ab04c5
|
Merge branch 'remove-info-from-users' into 'develop'
Removed users.info field
See merge request pleroma/pleroma!2006
|
5 years ago |
|
rinpatch
|
cf0c861d00
|
Merge branch 'hide-relation-for-friendica' into 'develop'
Hide relation for friendica users
See merge request pleroma/pleroma!2026
|
5 years ago |
|
rinpatch
|
b21738d4c0
|
Merge branch 'benchmarks/favourites_timeline' into 'develop'
Benchmarks: favourites timeline
See merge request pleroma/pleroma!2027
|
5 years ago |
|
kPherox
|
1915b23e72
|
test missing first field
|
5 years ago |
|
kPherox
|
0326683932
|
hide follower/following for friendica
|
5 years ago |
|
Ivan Tashkinov
|
51111e286b
|
[#1427] Initial support for OAuth admin scopes.
|
5 years ago |
|
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
|
5 years ago |
|
Egor Kislitsyn
|
a98cda7758
|
Fix Pleroma.HTML.extract_first_external_url/2
|
5 years ago |
|
Ivan Tashkinov
|
52cc7de82c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# mix.lock
|
5 years ago |
|
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
|
5 years ago |
|
Maksim Pechnikov
|
a36607c27e
|
add mix task to set\unset privacy option of notification
|
5 years ago |
|
Maksim Pechnikov
|
04a8ffbe84
|
added privacy option to push notifications
|
5 years ago |
|
Maksim Pechnikov
|
a52da55eb9
|
added User.NotificationSetting struct
|
5 years ago |
|
rinpatch
|
ca1acfa314
|
Merge branch 'chore/manual-benchmark' into 'develop'
CI: Make benchmarks manually triggered.
See merge request pleroma/pleroma!2020
|
5 years ago |
|
lain
|
20564600e8
|
Merge branch 'use-pg12-in-ci' into 'develop'
Use PosgreSQL v12 in the federated tests
See merge request pleroma/pleroma!2022
|
5 years ago |
|
Egor Kislitsyn
|
798aa0c335
|
Use PosgreSQL v12 in the federated tests
|
5 years ago |
|
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.
|
5 years ago |
|
lain
|
98990d2d61
|
Merge branch 'fed-testing-updates' into 'develop'
Add federated test infrastructure
See merge request pleroma/pleroma!2014
|
5 years ago |
|
lain
|
9a2d38107c
|
CI: Make benchmarks manually triggered.
|
5 years ago |
|
lain
|
8627fb0bb5
|
Merge branch 'cleanup-tests-output' into 'develop'
Cleanup tests output
See merge request pleroma/pleroma!2018
|
5 years ago |
|
Sadposter
|
c7cc80a9ee
|
obligatory format commit
|
5 years ago |
|
Sadposter
|
fa97eddf8a
|
make follows take precedence over domain blocks
|
5 years ago |
|
Egor Kislitsyn
|
c4b468a95b
|
Cleanup tests output
|
5 years ago |
|
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
|
5 years ago |
|
Maxim Filippov
|
fcabcab443
|
Fetch account from report, not from status (it might be deleted)
|
5 years ago |
|
Maxim Filippov
|
5135656f57
|
Handle reopened reports with deleted statuses
|
5 years ago |
|
lain
|
50b152766f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
|
5 years ago |
|
lain
|
ef1718a045
|
Merge branch 'remove-user-info' into 'develop'
Remove User.user_info/2
See merge request pleroma/pleroma!2016
|
5 years ago |
|
lain
|
f36724efb1
|
User: Never return nil for user follower counts.
|
5 years ago |
|
Egor Kislitsyn
|
f595cfe623
|
Remove User.user_info/2
|
5 years ago |
|
Egor Kislitsyn
|
1fc28a4b44
|
Add a view for the move notification
|
5 years ago |
