Thibaut Girka
|
24968d20a0
|
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
|
5 years ago |
Eugen Rochko
|
24552b5160
|
Add whitelist mode (#11291)
|
5 years ago |
|
Thibaut Girka
|
249991c498
|
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
|
5 years ago |
|
Eugen Rochko
|
63c7fe8e48
|
Refactor controllers for statuses, accounts, and more (#11249)
|
5 years ago |
|
Eugen Rochko
|
bbb9ff0e84
|
[Glitch] Redesign landing page
Port 65fffeac3f to glitch-soc
|
6 years ago |
|
Eugen Rochko
|
65fffeac3f
|
Redesign landing page (#10232)
|
6 years ago |
