aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-12-02Merge branch 'update-floki' into 'develop'rinpatch
Update Floki dependency See merge request pleroma/pleroma!2028
2019-12-02Fix `mix pleroma.user list` taskEgor Kislitsyn
2019-12-02Update Floki dependencyEgor Kislitsyn
2019-12-01Merge branch 'develop' into issue/1411Maksim Pechnikov
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
Removed users.info field See merge request pleroma/pleroma!2006
2019-11-30Merge branch 'hide-relation-for-friendica' into 'develop'rinpatch
Hide relation for friendica users See merge request pleroma/pleroma!2026
2019-11-30Merge branch 'benchmarks/favourites_timeline' into 'develop'rinpatch
Benchmarks: favourites timeline See merge request pleroma/pleroma!2027
2019-11-30test missing first fieldkPherox
2019-11-30hide follower/following for friendicakPherox
2019-11-29[#1427] Initial support for OAuth admin scopes.Ivan Tashkinov
2019-11-29Merge branch 'fix/extract_first_external_url' into 'develop'lain
Fix Pleroma.HTML.extract_first_external_url/2 Closes #1451 See merge request pleroma/pleroma!2024
2019-11-29Fix Pleroma.HTML.extract_first_external_url/2Egor Kislitsyn
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # mix.lock
2019-11-28Merge branch 'bugfix/1447-set-following' into 'develop'rinpatch
Migrations: Set users.following_count to NOT NULL Closes #1447 See merge request pleroma/pleroma!2021
2019-11-28add mix task to set\unset privacy option of notificationMaksim Pechnikov
2019-11-28added privacy option to push notificationsMaksim Pechnikov
2019-11-28added User.NotificationSetting structMaksim Pechnikov
2019-11-28Merge branch 'chore/manual-benchmark' into 'develop'rinpatch
CI: Make benchmarks manually triggered. See merge request pleroma/pleroma!2020
2019-11-28Merge branch 'use-pg12-in-ci' into 'develop'lain
Use PosgreSQL v12 in the federated tests See merge request pleroma/pleroma!2022
2019-11-28Use PosgreSQL v12 in the federated testsEgor Kislitsyn
2019-11-28Migrations: Set users.following_count to NOT NULLlain
Also set following_count for local users to the correct value and for remote users to 0.
2019-11-28Merge branch 'fed-testing-updates' into 'develop'lain
Add federated test infrastructure See merge request pleroma/pleroma!2014
2019-11-28CI: Make benchmarks manually triggered.lain
2019-11-28Merge branch 'cleanup-tests-output' into 'develop'lain
Cleanup tests output See merge request pleroma/pleroma!2018
2019-11-28obligatory format commitSadposter
2019-11-28make follows take precedence over domain blocksSadposter
2019-11-28Cleanup tests outputEgor Kislitsyn
2019-11-27Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop'kaniini
User: Never return nil for user follower counts. Closes #1442 See merge request pleroma/pleroma!2017
2019-11-28Fetch account from report, not from status (it might be deleted)Maxim Filippov
2019-11-27Handle reopened reports with deleted statusesMaxim Filippov
2019-11-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
bugfix/1442-dont-return-nil-for-following-count
2019-11-27Merge branch 'remove-user-info' into 'develop'lain
Remove User.user_info/2 See merge request pleroma/pleroma!2016
2019-11-27User: Never return nil for user follower counts.lain
2019-11-27Remove User.user_info/2Egor Kislitsyn
2019-11-27Add a view for the move notificationEgor Kislitsyn
2019-11-26update tests and Obanstwf
2019-11-26Tests: Run the daemonlain
2019-11-26CI: Add testing stage for federated tests.lain
2019-11-26Tests: Don't run federated tests by defaultlain
2019-11-26Add federated test infrastructureChris McCord
2019-11-26Merge branch 'feature/direct_conversation_id_web_push' into 'develop'lain
Add `direct_conversation_id` to web push payload See merge request pleroma/pleroma!2012
2019-11-27Remove `account` field from web push payloadEgor Kislitsyn
2019-11-26Add `direct_conversation_id` to web push payloadEgor Kislitsyn
2019-11-26Merge branch 'fix/prod-syslog-level' into 'develop'feld
Default log level for syslog in prod should also be :warn See merge request pleroma/pleroma!2011
2019-11-26Default log level for syslog in prod should also be :warnMark Felder
2019-11-26Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26Fix testsMaxim Filippov
2019-11-26Merge branch 'develop' into feature/admin-api-render-whole-statusMaxim Filippov
2019-11-25Merge branch 'fix/ap-disable-remote-render' into 'develop'lain
Disable rendering AP representation for remote users and objects See merge request pleroma/pleroma!2010
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-23 10:28:01 +0000