tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/mastodon/features
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
..
account/components Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
account_gallery Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
account_timeline Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
blocks Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
community_timeline Refactoring streaming connections (#4645) 2017-08-21 15:04:34 +02:00
compose Fix onboarding modal & add re-open button (#129) 2017-08-08 21:42:29 +02:00
favourited_statuses Add Smartphone screen favourite back button and adjust styles (#4813) 2017-09-06 17:32:15 +02:00
favourites Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
follow_requests feat: Cache status height to avoid expensive renders (#4439) 2017-08-07 20:32:03 +02:00
followers Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
following Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
generic_not_found Replace sprockets/browserify with Webpack (#2617) 2017-05-03 02:04:16 +02:00
getting_started Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00
hashtag_timeline Refactoring streaming connections (#4645) 2017-08-21 15:04:34 +02:00
home_timeline Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
mutes Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
notifications Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
pinned_statuses Add Pinned toot column (#4817) 2017-09-07 09:58:11 +02:00
public_timeline Refactoring streaming connections (#4645) 2017-08-21 15:04:34 +02:00
reblogs Use Class and Property Decorators (#3730) 2017-06-23 19:36:54 +02:00
report feat: Cache status height to avoid expensive renders (#4439) 2017-08-07 20:32:03 +02:00
standalone Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
status Merge branch 'origin/master' into sync/upstream 2017-09-09 14:27:47 -05:00
ui Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 2017-09-09 23:56:21 -05:00