Commit graph

2668 commits

Author SHA1 Message Date
Sean Yesmunt
0a7626fe49 remove un-necessary comment 2017-06-07 00:15:55 -07:00
Sean Yesmunt
46862a302e style loading spinner 2017-06-06 23:32:38 -07:00
Sean Yesmunt
708efba091 fix prop name 2017-06-06 22:42:01 -07:00
Sean Yesmunt
7a467f3635 move video-player and video-player-button into their own file 2017-06-06 22:36:12 -07:00
Sean Yesmunt
57a7d1db97 add internal video loading screen component 2017-06-06 21:12:45 -07:00
6ea86b96
626167995a
Ignore .vimrc 2017-06-07 09:12:40 +07:00
6ea86b96
732c9c3bd3 Make channel pages work again 2017-06-07 08:34:43 +07:00
6ea86b96
72137f51d2 Fix resolving uris in file tile 2017-06-07 08:34:13 +07:00
6ea86b96
c023a41a28 Stop cost info getting into an infinite loop 2017-06-07 08:32:41 +07:00
6ea86b96
f97ec7b390 Store claims by id in the state 2017-06-07 08:30:17 +07:00
Jeremy Kauffman
059673983c Bump version: 0.12.0rc4 → 0.12.0rc5 2017-06-06 17:58:32 -04:00
Jeremy Kauffman
e1baebfec5 Merge branch '6ea86b96-npm-5' 2017-06-06 17:43:02 -04:00
Jeremy Kauffman
6f0e429ac4 Merge branch 'npm-5' of https://github.com/6ea86b96/lbry-app into 6ea86b96-npm-5 2017-06-06 17:41:25 -04:00
Jeremy Kauffman
e0bcf44202 Merge branch 'seanyesmunt-master' 2017-06-06 17:25:29 -04:00
Jeremy Kauffman
9c708ca93c correct prettier path 2017-06-06 17:23:58 -04:00
Jeremy Kauffman
2172555096 change prettier options 2017-06-06 17:19:12 -04:00
6ea86b96
955e9564e0
Some package tweaks for npm 5x 2017-06-06 23:58:16 +07:00
Sean Yesmunt
759a9011dc add prettier script 2017-06-06 09:24:55 -07:00
Alex Grintsvayg
6bc1405f2d Bump version: 0.12.0rc3 → 0.12.0rc4 2017-06-06 11:15:34 -04:00
Alex Grintsvayg
a10ebce017 changelog 2017-06-06 11:14:57 -04:00
Alex Grintsvayg
954db08bd1 use new fee metadata format 2017-06-06 11:14:08 -04:00
Sean Yesmunt
c8b949f020 format with prettier 2017-06-05 21:21:55 -07:00
Sean Yesmunt
6f93834990 add prettier 2017-06-05 21:20:41 -07:00
Jeremy Kauffman
e644bc5d89 Bump version: 0.12.0rc2 → 0.12.0rc3 2017-06-05 19:11:26 -04:00
Jeremy Kauffman
5d9cfe00af Merge pull request #199 from filipnyquist/wallet_page_quick_fix
Quick fix for Issue #198 , not being able to go to SEND/RECEIVE page
2017-06-05 18:16:16 -04:00
Fillerino
a2ec397ff8 Quick fix for Issue #198 , not being able to go to SEND/RECEIVE page
This commit fixes the missing _ in one of the i18n translation labels.
fixes #198
2017-06-05 22:35:24 +02:00
Jeremy Kauffman
1dc1b0ed7a Bump version: 0.12.0rc1 → 0.12.0rc2 2017-06-05 12:58:04 -04:00
Jeremy Kauffman
a023c11493 update to latest daemon, remove extra bracket 2017-06-05 12:57:27 -04:00
Jeremy Kauffman
5597f736bf Bump version: 0.11.9 → 0.12.0rc1 2017-06-05 11:49:47 -04:00
Jeremy Kauffman
304a737b6d upgrade changelog 2017-06-05 11:47:18 -04:00
Jeremy Kauffman
c348f552cd Merge pull request #189 from 6ea86b96/play-more-file-types
Render all file types that render-media can handle
2017-06-05 11:40:11 -04:00
Jeremy Kauffman
8d359629fb Merge pull request #160 from intnick/i18n
i18n Support
2017-06-05 11:34:22 -04:00
Jeremy Kauffman
49b706a87c Merge pull request #196 from lbryio/update-deprecated-commands
update deprecated commands
2017-06-05 10:50:07 -04:00
Jack Robison
eb0641d82a update deprecated commands 2017-06-05 10:44:53 -04:00
Jeremy Kauffman
659473bbbb Merge pull request #191 from krrishnarraj/master
Add timeout for jayson client requests
2017-06-04 19:06:37 -04:00
Mayesters
77aa8c61b0 Fix commenting out of setting 2017-06-03 13:34:32 +02:00
Mayesters
a539b58829 Include y18n without creating files + fix modal 2017-06-03 13:27:37 +02:00
Mayesters
4e86023bf1 Merge remote-tracking branch 'upstream/intnick-i18n' into i18n 2017-06-03 13:10:54 +02:00
Mayesters
f59731ff41 Added y18n as dependency 2017-06-03 13:08:45 +02:00
Mayesters
fb36cf12f1 Merge branch 'master' into i18n 2017-06-03 13:06:53 +02:00
Mayesters
e36fa6623b Merge remote-tracking branch 'upstream/master' 2017-06-03 13:06:41 +02:00
Krishnaraj Bhat
db64723c24 Add timeout for jayson client requests
request() didn't hit the callback sometimes
fixes #19
fixes #188
2017-06-03 13:34:58 +05:30
6ea86b96
1fd1b3c064 Render all file types that render-media can handle 2017-06-03 01:29:08 +07:00
Jack Robison
448088a134 update deprecated get_settings call 2017-06-02 12:57:23 -04:00
Jeremy Kauffman
f84c738018 changes to global declaration, eliminate translation files 2017-06-02 12:40:26 -04:00
Jeremy Kauffman
8ab629de01 Merge branch 'i18n' of https://github.com/intnick/lbry-app into intnick-i18n 2017-06-02 12:25:56 -04:00
Mayesters
81afbf8d70 Merge branch 'master' into i18n 2017-06-02 18:11:54 +02:00
Mayesters
f2e87bc8f6 Merge remote-tracking branch 'upstream/master' 2017-06-02 18:10:42 +02:00
Jeremy Kauffman
3a89b01998 Merge pull request #185 from 6ea86b96/play-more-file-types
Play more file types
2017-06-02 08:56:21 -04:00
6ea86b96
912933d4e7
Sync loading between file actions and video player 2017-06-02 14:40:40 +07:00