djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/controllers
History
Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream 
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-10 21:00:30 +01:00
..
activitypub Add specs for activitypub collections controller (#9484) 2018-12-10 21:39:25 +01:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
api Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
auth Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
concerns Improvements to signature verification (#9667) 2019-01-07 21:45:13 +01:00
oauth Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
well_known Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) 2017-12-27 18:21:12 +01:00
about_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-10 16:22:31 +02:00
account_follow_controller.rb Restful refactor of accounts/ routes (#2133) 2017-04-19 13:52:37 +02:00
account_unfollow_controller.rb Restful refactor of accounts/ routes (#2133) 2017-04-19 13:52:37 +02:00
accounts_controller.rb Exclude local-only toots from atom feeds 2018-11-13 18:55:57 +01:00
application_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
authorize_interactions_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
custom_css_controller.rb Add admin custom CSS setting (#8399) 2018-08-24 04:33:27 +02:00
directories_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
emojis_controller.rb Unuse ActiveRecord::Base#cache_key (#8185) 2018-08-19 15:52:38 +02:00
filters_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb Add a per-user setting to hide followers count 2018-12-20 14:51:12 +01:00
following_accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-18 08:47:10 -05:00
home_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-11 15:45:42 +02:00
intents_controller.rb Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
invites_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
manifests_controller.rb Make Chrome splash screen same color as web UI's background color (#5169) 2017-10-02 01:23:32 +02:00
media_controller.rb fix CSP / X-Frame-Options for media embeds (#9558) 2018-12-18 16:40:30 +01:00
media_proxy_controller.rb Raise Mastodon::RaceConditionError if Redis lock failed (#7511) 2018-05-16 12:29:45 +02:00
remote_follow_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-08-18 18:04:49 +02:00
remote_interaction_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-10 21:00:30 +01:00
remote_unfollows_controller.rb Add tests for remote_unfollows_controller (#7879) 2018-06-24 19:55:55 +09:00
shares_controller.rb Merge branch 'master' into glitch-soc/merge 2018-05-11 18:12:42 +02:00
statuses_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-06 12:44:38 +01:00
stream_entries_controller.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
tags_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-11-06 15:22:44 +01:00