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

..

accounts_counters.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

accounts.js

feat: Cache status height to avoid expensive renders (#4439)

2017-08-07 20:32:03 +02:00

alerts.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

cards.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

compose.js

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

contexts.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

index.js

FIXED STUFF FROM THE MERGE SORRY ;_;

2017-07-15 15:42:39 -07:00

media_attachments.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

meta.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

modal.js

Remove unused variables (#3906)

2017-06-23 16:05:04 +02:00

notifications.js

Improved notifications cleaning UI with set operations (#109)

2017-07-30 12:36:28 -04:00

push_notifications.js

Web Push Notifications (#3243)

2017-07-13 22:15:32 +02:00

relationships.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

reports.js

Fix second report (regression from 3b81baaaaf51ff1c70fb1f865eef07fdb33a5950) (#4863)

2017-09-09 13:42:48 +02:00

search.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

settings.js

Merge upstream!! #64 <3 <3

2017-07-12 02:03:17 -07:00

status_lists.js

Add Pinned toot column (#4817)

2017-09-07 09:58:11 +02:00

statuses.js

Add Pinned toot column (#4817)

2017-09-07 09:58:11 +02:00

timelines.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00

user_lists.js

refactor: Rewrite immutablejs import statements using destructuring (#4147)

2017-07-11 01:00:14 +02:00