Commit graph

2860 commits

Author SHA1 Message Date
Alex Grintsvayg
adbc02838c does removing lock files make it build right? 2017-06-22 10:04:25 -04:00
Jeremy Kauffman
282cf4f708 Merge pull request #269 from intnick/master
Transifex configuration
2017-06-22 08:50:43 -04:00
Jeremy Kauffman
b8af474375 Merge branch 'master' into master 2017-06-22 08:50:36 -04:00
Jeremy Kauffman
2285f2f01e Merge pull request #270 from intnick/transiflex
separated page name translations
2017-06-22 08:50:17 -04:00
Alex Grintsvayg
d9bc7f9777 Bump version: 0.12.2rc5 → 0.12.2rc6 2017-06-21 20:12:35 -04:00
Alex Grintsvayg
89b5e20b15 iron out auth issues 2017-06-21 20:09:30 -04:00
Intnick
b14293cd14 separated page name translations 2017-06-22 01:15:24 +02:00
Alex Grintsvayg
0d5a04b451 pass the function, dont call it 2017-06-21 18:49:23 -04:00
Alex Grintsvayg
a9fe3a0ed2 those arent real functions anymore 2017-06-21 18:27:07 -04:00
Alex Grintsvayg
9da8a4b8dc build on master too 2017-06-21 15:43:21 -04:00
Alex Grintsvayg
613c15280c ping travis 2017-06-21 15:42:50 -04:00
Alex Grintsvayg
31565c3d5a ping travis 2017-06-21 15:34:55 -04:00
Alex Grintsvayg
b95f818604 ping travis 2017-06-21 15:27:40 -04:00
Alex Grintsvayg
da1314fb2c transifex travis integration 2017-06-21 15:23:14 -04:00
Mayesters
3721500c2d Transifex preparation 2017-06-21 20:48:04 +02:00
Alex Grintsvayg
c183ebc838 travis work 2017-06-21 14:33:32 -04:00
Mayesters
85464fb3cb Merge remote-tracking branch 'upstream/master' 2017-06-21 20:31:12 +02:00
Alex Grintsvayg
70ae11520c actually use travis 2017-06-21 14:26:43 -04:00
Alex Grintsvayg
f12a39352a Bump version: 0.12.2rc4 → 0.12.2rc5 2017-06-21 14:20:38 -04:00
Alex Grintsvayg
c539544778 bump versions in package lock files 2017-06-21 14:20:14 -04:00
Jeremy Kauffman
d389292ef3 Bump version: 0.12.2rc3 → 0.12.2rc4 2017-06-21 12:59:30 -04:00
Jeremy Kauffman
0f5bcf1a77 update changelog 2017-06-21 12:56:47 -04:00
Jeremy Kauffman
19eb1eda13 Merge pull request #266 from zestyr/patch-1
Support more file extensions
2017-06-21 12:07:24 -04:00
Alex Grintsvayg
024278e235 Merge branch 'new_auth'
* new_auth:
  build is hard
  fixed package-lock and electron-rebuild
  prettier
  i need shebang-command to get the precommit hook working
  update locks
  store auth token in OS keyring, not in local storage
  minor cleanup
2017-06-21 10:01:28 -04:00
Alex Grintsvayg
92bac9de54 build is hard 2017-06-21 09:20:29 -04:00
Alex Grintsvayg
efb7876b93 fixed package-lock and electron-rebuild 2017-06-21 09:16:23 -04:00
Alex Grintsvayg
cb68c538ee prettier 2017-06-21 08:42:22 -04:00
Alex Grintsvayg
d67f07bcbb i need shebang-command to get the precommit hook working 2017-06-21 08:41:07 -04:00
Alex Grintsvayg
e37472aeca update locks 2017-06-21 08:41:07 -04:00
Alex Grintsvayg
4376c34678 store auth token in OS keyring, not in local storage 2017-06-21 08:41:07 -04:00
Alex Grintsvayg
d4e572a2b6 minor cleanup 2017-06-21 08:34:50 -04:00
Alex Grintsvayg
4562b0bf99 add extractlocals to build script 2017-06-21 08:25:57 -04:00
Alex Grintsvayg
024ff3cb50 create locales dir if it doesnt exist 2017-06-21 08:23:21 -04:00
Zed
c27d492d48 Support more file extensions 2017-06-20 20:34:00 +02:00
Alex Grintsvayg
741a88a7b4 added i18n-extract to package-lock 2017-06-20 10:08:28 -04:00
Alex Grintsvayg
aaec1f3a48 prettify all the files 2017-06-20 08:08:52 -04:00
Jeremy Kauffman
202570f286 update to daemon 0.13.1 proper 2017-06-19 16:55:15 -04:00
Jeremy Kauffman
02f226e484 Merge pull request #258 from intnick/transiflex
fix i18n stuff + string extraction script for Transifex
2017-06-19 15:13:19 -04:00
Mayesters
0540b3d3b8 welcome modal i18n simplification 2017-06-19 15:51:28 +02:00
Mayesters
7fd9c25af2 fix publish again cuz im stupid 2017-06-19 15:50:10 +02:00
Mayesters
51ea169329 fix publish page 2017-06-19 15:49:26 +02:00
Mayesters
95a37e3f88 fix components + pages 2017-06-19 14:58:39 +02:00
Mayesters
df19708a5c fix components 2017-06-19 14:42:24 +02:00
Jeremy Kauffman
9c791e50a1 Merge pull request #257 from lbryio/fix-url-load-on-start
Make URLs load correctly after clicking a lbry:// link with the app closed
2017-06-19 08:34:03 -04:00
Mayesters
25589a6a45 Merge branch 'master' into transiflex 2017-06-19 14:26:35 +02:00
Mayesters
e46e1bd5f7 Merge remote-tracking branch 'upstream/master' 2017-06-19 14:24:27 +02:00
Alex Liebowitz
a5968c2c20 Remove unnecessary load of Discover page during startup
We were loading the Discover page at the end of the launch screen.
That meant that if a user started with LBRY closed and started it by
clicking on a lbry:// link, it would load during the launch screen
but then get overridden by the Discover page as soon as the launch
screen finished.

Fortunately, this load was redundant anyway as the necessary state is
already being set in the default state for the App component:
902fb96878/ui/js/reducers/app.js (L5)
2017-06-19 08:12:00 -04:00
Jeremy Kauffman
ac067b78d1 Bump version: 0.12.2rc2 → 0.12.2rc3 2017-06-18 10:53:17 -04:00
Jeremy Kauffman
320eb8d93a update changelog 2017-06-18 10:53:06 -04:00
Jeremy Kauffman
eb3f1086a2 Merge branch 'master' of github.com:lbryio/lbry-app 2017-06-18 10:34:54 -04:00