Thibaut Girka 611740ce81 Merge branch 'master' into glitch-soc/merge-upstream

2018-10-07 19:47:56 +02:00

..

activitypub

Better pagination for ActivityPub outbox (#7356)

2018-05-04 19:19:11 +02:00

admin

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-05 15:23:57 +02:00

api

Merge branch 'master' into glitch-soc/merge-upstream

2018-10-07 19:47:56 +02:00

auth

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-19 21:46:01 +02:00

concerns

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02: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

2018-10-01 12:43:20 +02:00

well_known

…

about_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

Merge branch 'master' into glitch-soc/master

2018-08-21 18:24:48 +02:00

application_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-09-11 16:51:26 +02: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

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-07-12 19:26:20 +02:00

follower_accounts_controller.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-05-18 08:47:10 -05: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-08-01 00:18:13 +02:00

manifests_controller.rb

…

media_controller.rb

…

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

2018-08-18 18:04:49 +02: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-08-31 19:10:57 +02: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-08-01 00:18:13 +02:00