Commit graph

2703 commits

Author SHA1 Message Date
Jeremy Kauffman
2fb0bf4a14 invites for all 2017-08-29 17:42:11 -04:00
Jeremy Kauffman
b07682ef9d wallet changes
finish rebase
2017-08-29 17:42:09 -04:00
Jeremy Kauffman
8c012bc087 negative progress 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
7b5e752e90 properly split welcome modal logic 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
2013da3fac decent progress 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
2b8296fcc3 rewards refactor to support types, add list 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
31fb723d87 invites basics 2017-08-29 14:40:30 -04:00
Jeremy Kauffman
1cbc96533b refactor wallet area 2017-08-29 14:40:30 -04:00
hackrush
21175ba608 Merge remote-tracking branch 'upstream/master' into tb2 2017-08-29 13:21:23 +05:30
Jeremy Kauffman
6d6f70ed46 Merge branch 'btzr-io-patch-3' 2017-08-28 13:57:10 -04:00
Jeremy Kauffman
ed6c282572 add comment to clarify fix 2017-08-28 13:56:55 -04:00
Jeremy Kauffman
be6f93ac71 Merge branch 'patch-3' of https://github.com/btzr-io/lbry-app into btzr-io-patch-3 2017-08-28 13:47:07 -04:00
Jeremy Kauffman
8838029122 Merge branch 'hackrush01-regression-fix-501' 2017-08-28 11:54:00 -04:00
Jeremy Kauffman
e448f54a73 fix #460 try 783 2017-08-28 11:53:29 -04:00
Jeremy Kauffman
8fd9d64b7f fix #460 again again 2017-08-28 09:29:29 -04:00
Jeremy Kauffman
90c83c6239 fix #460 again 2017-08-28 09:25:53 -04:00
Baltazar Gomez
dec4fb893d update changelog 2017-08-27 19:20:09 -06:00
Baltazar Gomez
daabc1cf7e fix menu bug #503 2017-08-27 15:50:35 -06:00
hackrush
3f7391fc07 Fixed regression in #501 2017-08-27 10:37:54 +05:30
btzr-io
463d09256f tidy up _markdown-styles.scss 2017-08-26 14:50:02 -06:00
btzr-io
f6857313ad fix markdown-editor styles 2017-08-26 14:47:37 -06:00
btzr-io
55cd9123f2 fix export / import error 2017-08-26 13:04:44 -06:00
Jeremy Kauffman
fb2b37c4f1 Merge pull request #501 from hackrush01/channel-claimID-fix
Return proper URI when channel name is present.
2017-08-26 10:00:01 -04:00
hackrush
ebd7c66faa Changelog entry 2017-08-26 13:32:05 +05:30
hackrush
2c14eb77ac Return proper URI when channel name is present 2017-08-26 13:25:26 +05:30
Alex Grintsvayg
1f6b477d24 use test stripe token when connected to api on localhost 2017-08-25 16:49:27 -04:00
Jeremy Kauffman
010534cc16 kill utils.js, reduce (set|get)(Local|Session) to just lbry.js 2017-08-25 16:26:09 -04:00
Jeremy Kauffman
b49318aead Merge pull request #496 from lbryio/redux_volume
Issue #323 switch volume preference to use redux
2017-08-25 16:17:26 -04:00
Jeremy Kauffman
0a51067166 update changelog for #0c1be6e 2017-08-25 16:05:23 -04:00
Jeremy Kauffman
cb70fdb4b3 remove unused code 2017-08-25 16:04:05 -04:00
Jeremy Kauffman
0c1b36e1a6 Merge branch 'btzr-io-patch-8' 2017-08-25 16:03:40 -04:00
Baltazar Gomez
c03c0de0a2 Fix for #461
show full price on confirmation

don't format full price

smart format for full price
2017-08-25 16:03:29 -04:00
hackrush
57cc730f19 Removed useless css 2017-08-26 00:55:53 +05:30
Akinwale Ariwodola
faa1c4634b Issue #323 switch volume preference to use redux 2017-08-25 20:05:00 +01:00
hackrush
5ae8129084 Fix the Mega Breaking change 2017-08-26 00:11:31 +05:30
hackrush
e8c5ba5536 Tipping UI is rendered in FilePage 2017-08-25 23:33:33 +05:30
hackrush
0054723ed6 Added Fee column 2017-08-25 18:56:43 +05:30
Jeremy Kauffman
a31e064c3e fix pagination of channels 2017-08-24 17:12:32 -04:00
Alex Grintsvayg
7e6c55c605 no more token swapping 2017-08-24 15:07:16 -04:00
Baltazar Gomez
03b04ad9b0 Merge branch 'master' into master 2017-08-24 12:28:05 -06:00
Jeremy Kauffman
3de3dd2544 Merge branch 'i18n' 2017-08-24 13:43:16 -04:00
Jeremy Kauffman
68e0eb66d2 save setting, fix warning 2017-08-24 13:33:41 -04:00
btzr-io
4185f22cb2 update dark theme -> header color -> #ccc 2017-08-24 11:06:21 -06:00
btzr-io
8e7c783750 rewrite fallback for themes 2017-08-24 10:55:24 -06:00
btzr-io
c257691b57 move getThemes -> settings -> componentWillMount 2017-08-24 10:29:54 -06:00
btzr-io
8b8c9c9da9 fix settings constant 2017-08-24 10:14:30 -06:00
btzr-io
191b95cc2e load theme on /doDaemonReady 2017-08-24 10:11:39 -06:00
Akinwale Ariwodola
48b02567a0 fixed locale change bug 2017-08-23 00:50:59 +01:00
Jeremy Kauffman
6e61a9f73c further improvements to backup wallet content 2017-08-22 17:28:01 -04:00
btzr-io
a77a6495b0 tidy up themes 2017-08-21 20:43:14 -06:00