Commit graph

203 commits

Author SHA1 Message Date
Jeremy Kauffman
241a0118a2 Merge remote-tracking branch 'origin/master' into tear_down_this_wall 2017-06-08 20:03:11 -04:00
Jeremy Kauffman
69bf1bdfea two more pure components 2017-06-08 19:41:44 -04:00
Jeremy Kauffman
f21bf287d9 Merge branch 'master' into should-component-update 2017-06-08 19:36:17 -04:00
Jeremy Kauffman
f2cabfb07a minor correction 2017-06-08 19:16:38 -04:00
Jeremy Kauffman
5d5badd567 Merge branch 'master' of https://github.com/seanyesmunt/lbry-app into seanyesmunt-master 2017-06-08 19:07:50 -04:00
Jeremy Kauffman
09ecae7e0d reviewable 2017-06-08 17:15:34 -04:00
Sean Yesmunt
e13d7c2149 use React.PureComponent 2017-06-07 21:42:19 -07:00
Jeremy Kauffman
18a40defba mostly done? 2017-06-07 20:56:52 -04:00
Jeremy Kauffman
cbf35014cd previously uncommitted copy change 2017-06-07 12:11:47 -04:00
Jeremy Kauffman
4f65957287 not enough progress 2017-06-07 12:11:47 -04:00
Jeremy Kauffman
b6881c829c uncommitted work from last night 2017-06-07 12:08:05 -04:00
Jeremy Kauffman
a17d19038e good chunk of progress towards auth and rewards refactor / degating 2017-06-07 12:08:04 -04:00
Sean Yesmunt
11fa00504d switch to BEM naming pattern 2017-06-07 09:06:14 -07:00
6ea86b96
eb170b9720 Working on rewards refactor 2017-06-07 12:04:39 -04:00
Jeremy Kauffman
e0b8afe028 midway through auth rewrite 2017-06-07 11:56:01 -04:00
Jeremy Kauffman
ddd01855b0 slight progress 2017-06-07 11:50:44 -04:00
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
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
Jeremy Kauffman
2172555096 change prettier options 2017-06-06 17:19:12 -04:00
Sean Yesmunt
c8b949f020 format with prettier 2017-06-05 21:21:55 -07: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
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
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
6ea86b96
1fd1b3c064 Render all file types that render-media can handle 2017-06-03 01:29:08 +07: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
6ea86b96
912933d4e7
Sync loading between file actions and video player 2017-06-02 14:40:40 +07:00
6ea86b96
8505959c22 Use render-media to render audio and images 2017-06-02 14:11:59 +07:00
6ea86b96
fa66f4e918 Fix download progress for recontructing files 2017-06-02 14:11:59 +07:00
Mayesters
c658211e2c merge translations fixed 2017-06-01 17:49:07 +02:00
Mayesters
0153a6dab5 Merge branch 'master' into i18n 2017-06-01 17:41:49 +02:00
Intnick
02ed8145ca Merge branch 'i18n' of github.com:intnick/lbry-app into i18n 2017-06-01 17:02:16 +02:00
Intnick
addf29f3bc global i18n object defined in app.js; smaller translation improvements 2017-06-01 17:02:02 +02:00
Jeremy Kauffman
9f1e5489a1 fix multiple install ids 2017-05-31 18:19:48 -04:00
Mayesters
313cea5580 fix master merge translations 2017-05-31 12:55:32 +02:00
Mayesters
31190ea5b0 Merge branch 'master' into i18n 2017-05-31 12:48:49 +02:00
Mayesters
fe7b5eb4e0 removed unnecessary y 2017-05-31 12:34:39 +02:00
Jeremy Kauffman
7a8a2c4913 connection changes and changelog 2017-05-30 19:56:48 -04:00
Jeremy Kauffman
c3eb921685 Merge branch 'master' into autoplay 2017-05-30 17:18:04 -04:00
6ea86b96
230e6e2d70 Fix autoplaying 2017-05-30 23:16:41 +04:00
Jeremy Kauffman
2bdc2ce268 fix close modal in video component 2017-05-30 14:12:07 -04:00
Mayesters
a8a42cee2e wunderbar translated 2017-05-28 21:35:21 +02:00
Mayesters
1a3c20a637 Translated updated components 2017-05-28 18:56:01 +02:00