Commit graph

3449 commits

Author SHA1 Message Date
Liam Cardenas
c52c75758b Rename modalEmailCollection to modalPhoneCollection 2018-01-10 22:00:51 -08:00
Liam Cardenas
c0e9b92a3a Added phone verification option 2018-01-10 21:41:51 -08:00
Igor Gassmann
431c155932
Merge pull request #933 from JoshStrobl/readd-builddir
Re-introduce build dir / dist dir option for isolated build environments.
2018-01-09 11:24:56 -03:00
Igor Gassmann
be0e526dbb Merge branch 'issue/397' into issue/938 2018-01-09 11:02:44 -03:00
Sean Yesmunt
c478bcb587
Merge pull request #934 from lbryio/revert-870-redesign-wip
Revert "Redesign groundwork, homepage, search"
2018-01-08 17:15:58 -08:00
Sean Yesmunt
2b9561f0c0
Revert "Redesign groundwork, homepage, search" 2018-01-08 17:15:44 -08:00
Sean Yesmunt
f92d48a2c7
Merge pull request #870 from lbryio/redesign-wip
Redesign groundwork, homepage, search
2018-01-08 17:15:02 -08:00
Joshua Strobl
4f31b6c9ee Re-introduce build dir / dist dir option for isolated build environments.
This commit re-introduces the functionality for building lbry-app with a directory target. This is important for isolated build environments like solbuild, where build and install directories are different (and the contents of install dir are used in a final binary package) and thus necessitate being able to have unpackaged assets be placed in a directory relative to the build location, so instructions may be performed on those assets.
2018-01-09 01:53:07 +02:00
Igor Gassmann
8947f9ac2f Merge branch 'issue/397' of https://github.com/lbryio/lbry-app into issue/397 2018-01-08 18:39:26 -03:00
Igor Gassmann
9f1d59764b Move brew update to correct place 2018-01-08 18:39:11 -03:00
Igor Gassmann
9d7f3f3b30 Add necessary deployment .gitignore rules 2018-01-08 18:36:34 -03:00
Sean Yesmunt
0e22696e20 fix icon import 2018-01-08 13:24:38 -08:00
Sean Yesmunt
c93f459113 update search action names to proper naming conventions 2018-01-08 13:10:15 -08:00
Sean Yesmunt
92482ee916 cleanup 2018-01-08 13:10:14 -08:00
Sean Yesmunt
7d492ae1fc Redesign groundwork (home/search) 2018-01-08 13:10:14 -08:00
Igor Gassmann
e4dd7f8735
Merge branch 'master' into issue/397 2018-01-08 14:52:37 -03:00
Thomas Zarebczan
d2011551a9
update with channel fix 2018-01-08 11:54:29 -05:00
Liam Cardenas
e4f80b232c Bump version: 0.19.4rc2 → 0.19.4 2018-01-08 08:15:09 -08:00
Igor Gassmann
33d5834722 Fix Electron linting errors (https://github.com/lbryio/lbry-app/issues/397) 2018-01-08 02:16:31 -03:00
Igor Gassmann
d39bd9dda7 Upgrade Electron version 2018-01-08 01:33:51 -03:00
Igor Gassmann
aeb43ff1a0 Replace keytar with keytar-prebuild for resolving https://github.com/atom/node-keytar/issues/39 2018-01-08 01:26:52 -03:00
Igor Gassmann
094c3b8a9f Merge branch 'master' into issue/397 2018-01-08 00:51:34 -03:00
Igor Gassmann
8b37ec6b72 Comply naming with Airbnb guide 2018-01-08 00:46:22 -03:00
Liam Cardenas
f903b75b71 Bump version: 0.19.4rc1 → 0.19.4rc2 2018-01-05 21:25:12 -08:00
Liam Cardenas
d89f87fa73
Update CHANGELOG.md 2018-01-05 21:22:51 -08:00
Liam Cardenas
eed68aae91
Merge pull request #890 from daovist/video-state
track and manage video state
2018-01-05 16:23:55 -08:00
Travis Eden
d3047a741a remove ENV statement 2018-01-05 19:04:12 -05:00
Travis Eden
7bc2f888f1 resolve merge conflicts 2018-01-05 18:57:24 -05:00
Liam Cardenas
5294446987
Merge pull request #928 from lbryio/issue/927
Fix right click bug
2018-01-05 15:36:40 -08:00
Travis Eden
5765c6c1ee remove comment 2018-01-05 18:36:03 -05:00
Liam Cardenas
a568e90bfb
Merge pull request #925 from lbryio/icon-spacing
Fix icon spacing on home page
2018-01-05 15:35:41 -08:00
Igor Gassmann
60772d0a74 Fix right click bug 2018-01-05 19:36:10 -03:00
Liam Cardenas
b3fb847912 Bump version: 0.19.3 → 0.19.4rc1 2018-01-05 14:16:45 -08:00
Liam Cardenas
3e25b33fed Revert to version 19.3 2018-01-05 14:09:57 -08:00
Travis Eden
566fb2e0b5 rename id param to claimId 2018-01-05 15:14:12 -05:00
Travis Eden
0cfc9ab32c remove old positions variable 2018-01-05 14:31:58 -05:00
Travis Eden
504c5469e3 safely type params in position selector 2018-01-05 14:29:25 -05:00
Travis Eden
345badb049 store position by outpoint 2018-01-05 14:27:58 -05:00
Jeremy Kauffman
d83f96668f Bump version: 0.19.4rc1 → 0.19.5rc1 2018-01-04 17:57:40 -05:00
Sean Yesmunt
e6bd648116 use one icon component and add padded prop 2018-01-04 17:05:29 -05:00
Sean Yesmunt
0f458b66d9 Bump version: 0.19.3 → 0.19.4rc1 2018-01-04 16:47:18 -05:00
Sean Yesmunt
4be9271c7c
Merge pull request #921 from lbryio/wunderbar-text
update wunderbar text
2018-01-02 21:30:30 -05:00
Thomas Zarebczan
535730eede
update wunderbar text
change "movies" to "videos" (more generic)
2018-01-02 19:47:48 -05:00
Liam Cardenas
d4f67ec521
Update CONTRIBUTING.md 2018-01-02 15:15:30 -08:00
Liam Cardenas
77b0606751
Update CONTRIBUTING.md 2018-01-02 15:07:48 -08:00
Liam Cardenas
f4c894deef
Update CONTRIBUTING.md 2018-01-02 15:05:15 -08:00
Liam Cardenas
6ec7b81409
Update CONTRIBUTING.md 2018-01-02 15:04:14 -08:00
Igor Gassmann
8203594989
Merge pull request #918 from lbryio/issue/917
Fix cannot send tip, transaction failed (#917)
2018-01-02 18:40:40 -03:00
Igor Gassmann
0e77be0ab5 HOTFIX: Fix creation of channel 2018-01-02 16:54:57 -03:00
Igor Gassmann
4e97c105c4 Fix cannot send tip, transaction failed (#917) 2018-01-02 09:07:28 -03:00