tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
67ad453373
mastodon/app/views
History
David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 
Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss
2017-09-09 23:56:21 -05:00
..
about Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
accounts Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
admin Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
admin_mailer Make salutation of email localizable (#4454) 2017-07-31 00:18:44 +02:00
application Added haml-lint and fix warnings (#2773) 2017-05-08 03:35:25 +02:00
auth Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
authorize_follows Add "signed in as" header to some pages (#4523) 2017-08-05 04:24:58 +02:00
errors Added haml-lint and fix warnings (#2773) 2017-05-08 03:35:25 +02:00
follower_accounts Add option to opt out of search engines on public profile/status pages (#4199) 2017-07-14 16:41:02 +02:00
following_accounts Add option to opt out of search engines on public profile/status pages (#4199) 2017-07-14 16:41:02 +02:00
home Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
kaminari Pagination improvements (#1445) 2017-04-11 01:11:41 +02:00
layouts Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
manifests Fix manifest description (regression from #4122) (#4324) 2017-07-23 23:04:44 +02:00
notification_mailer Make salutation of email localizable (#4454) 2017-07-31 00:18:44 +02:00
oauth Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
remote_follow Fix remote follow (#2547) 2017-04-28 00:16:44 +02:00
settings Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
shared Redesign public profiles (#4608) 2017-08-16 17:12:58 +02:00
shares Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
stream_entries Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
tags Adjust tags and accounts page (#4534) 2017-08-07 20:33:06 +02:00
user_mailer i10n OC / FR update Pinned toots (#4842) 2017-09-07 22:07:03 +02:00
well_known Send short account URL to remote instance (regression from #3844) (#4355) 2017-07-25 15:59:43 +02:00