Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-07-23 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb | |||
2019-07-21 | Remove WebSub subscriptions (#11303) | Eugen Rochko | |
2019-01-10 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close. | |||
2019-01-08 | Redesign admin instances area (#9645) | Eugen Rochko | |
2018-12-23 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it. | |||
2018-12-20 | Add specs for ReportNotePolicy (#9592) | ysksn | |
2018-12-20 | Add specs for policies (#9591) | ysksn | |
* Add spec for RelayPolicy * Add specs for SubscriptionPolicy * Add specs for SettingsPolicy * Add specs for TagPolicy * Add specs for ReportPolicy | |||
2018-12-20 | Add specs for UserPolicy (#9593) | ysksn | |
2018-12-20 | Add specs for InvitePolicy (#9589) | ysksn | |
2018-12-20 | Add specs for EmailDomainBlockPolicy (#9586) | ysksn | |
2018-12-20 | Add specs for InstancePolicy (#9587) | ysksn | |
2018-12-20 | Add specs for DomainBlockPolicy (#9585) | ysksn | |
2018-12-20 | Add specs for CustomEmojiPolicy (#9584) | ysksn | |
2018-12-19 | Add specs for BackupPolicy (#9576) | ysksn | |
2018-12-19 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
2018-12-19 | Add specs for AccountPolicy (#9575) | ysksn | |
2018-12-19 | Add specs for AccountModerationNotePolicy (#9571) | ysksn | |
2018-12-19 | Add specs for StatusPolicy (#9569) | ysksn | |
2018-07-31 | Add test to disallow remote users from fetching local-only toots | Thibaut Girka | |
2017-11-17 | Update StatusPolicy to check current_account for local_only? toots. | David Yip | |
StatusPolicy#account was renamed to StatusPolicy#current_account in upstream. This commit renames the local-only changes to match and augments the #show? policy spec with what we expect for local-only toots. | |||
2017-05-30 | Add status destroy authorization to policy (#3453) | Jack Jennings | |
* Add status destroy authorization to policy * Create explicit unreblog status authorization | |||
2017-05-30 | Fix incorrect visibility setter in StatusPolicySpec (#3456) | Jack Jennings | |
2017-05-30 | Move status reblog authorization into policy (#3425) | Jack Jennings | |
2017-05-29 | Extract authorization policy for viewing statuses (#3150) | Jack Jennings | |