David Yip 870d71b78b Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

..

account/components

Merge remote-tracking branch 'upstream/master' into gs-master

2017-10-16 09:23:59 -05:00

account_gallery

Change IDs to strings rather than numbers in API JSON output (#5019)

2017-09-20 14:53:48 +02:00

account_timeline

Merge pull request #125 from glitch-soc/data-column

2017-09-30 15:02:21 -04:00

blocks

Added data-column="{account|local|federated|favourites|hashtag|home|notifications|mutes|blocks|getting-started|follow-requests}" to Column

2017-08-06 21:27:47 +02:00

community_timeline

Merge pull request #125 from glitch-soc/data-column

2017-09-30 15:02:21 -04:00

compose

Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

direct_timeline

Added a timeline for Direct statuses

2017-10-22 18:35:14 -07:00

emoji

Enable ESLint rules import/* (#5414)

2017-10-16 11:12:09 +02:00

favourited_statuses

Merge pull request #125 from glitch-soc/data-column

2017-09-30 15:02:21 -04:00

favourites

Change IDs to strings rather than numbers in API JSON output (#5019)

2017-09-20 14:53:48 +02:00

follow_requests

Merge pull request #125 from glitch-soc/data-column

2017-09-30 15:02:21 -04:00

followers

Change IDs to strings rather than numbers in API JSON output (#5019)

2017-09-20 14:53:48 +02:00

following

Change IDs to strings rather than numbers in API JSON output (#5019)

2017-09-20 14:53:48 +02:00

generic_not_found

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

getting_started

Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline

2017-10-25 16:01:20 -05:00

hashtag_timeline

Merge pull request #125 from glitch-soc/data-column

2017-09-30 15:02:21 -04:00

home_timeline

Merge remote-tracking branch 'origin/master' into gs-master

2017-10-16 01:29:02 -05:00

mutes

Added data-column="{account|local|federated|favourites|hashtag|home|notifications|mutes|blocks|getting-started|follow-requests}" to Column

2017-08-06 21:27:47 +02:00

notifications

Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

pinned_statuses

Add Pinned toot column (#4817)

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

public_timeline

Merge pull request #125 from glitch-soc/data-column

2017-09-30 15:02:21 -04:00

reblogs

Change IDs to strings rather than numbers in API JSON output (#5019)

2017-09-20 14:53:48 +02:00

report

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

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

standalone

Redesign public hashtag pages (#5237)

2017-10-07 20:00:35 +02:00

status

Merge remote-tracking branch 'upstream/master' into gs-master

2017-10-16 09:23:59 -05:00

ui

Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline

2017-10-25 16:01:20 -05:00

video

Fix an error when video playback buffer is empty (#5300)

2017-10-10 15:17:53 +02:00