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
Mayesters
804c9a646b
Merge branch 'master' into i18n
2017-05-28 18:46:31 +02:00
Intnick
02b13fc252
i18n ready for testing
2017-05-28 18:36:35 +02:00
Intnick
13989632a7
language switch implementation. Needs more testing
2017-05-28 17:52:23 +02:00
Mayesters
469e769e01
lots of stuff translated
2017-05-28 17:52:23 +02:00
Intnick
1d09f08392
header and tranactionList component translated
2017-05-28 17:46:08 +02:00
Intnick
972ac78595
fileListSearch and fileTitle component translated
2017-05-28 17:46:08 +02:00
Intnick
7d6368aeca
fileList component translated
2017-05-28 17:46:08 +02:00
Intnick
ff02e0452b
filaActions and fileCard components translated
2017-05-28 17:45:40 +02:00
Intnick
d30d4353e8
moved the import of y18n component before some other imports; translations for auth developer
2017-05-28 17:33:25 +02:00
Jeremy Kauffman
6bccb67585
Merge pull request #153 from 6ea86b96/double-fetch-cost
...
Don't try to fetch cost info if it's already fetching
2017-05-28 11:28:14 -04:00
Jeremy Kauffman
fd093f0a95
Merge pull request #152 from 6ea86b96/file-actions-cost-info
...
Stop blowing up if user attempts to download before cost info fetched
2017-05-28 11:27:35 -04:00
6ea86b96
b2b99b31b9
Don't try to fetch cost info if it's already fetching
2017-05-28 19:16:07 +04:00
6ea86b96
37344b3517
Stop blowing up if user attempts to download before cost info fetched
2017-05-28 18:24:10 +04:00
6ea86b96
862d711391
Add a message for when we're reconstructing a moved/deleted file before playback
2017-05-28 17:38:36 +04:00
6ea86b96
2bb5f9acc6
Fix playing videos that were deleted and require no cost info
2017-05-26 22:50:43 +04:00
Jeremy Kauffman
260980ff38
fix app upgrades?
2017-05-25 16:07:32 -04:00
Jeremy Kauffman
a899d623d0
fix reward check on startup
2017-05-25 13:38:53 -04:00
Jeremy Kauffman
dd305c0a87
correct beta type ;)
2017-05-24 21:13:06 -04:00
Jeremy Kauffman
51a2f4f52e
Merge branch 'api-fixes'
2017-05-24 20:10:36 -04:00
Jeremy Kauffman
a8082b0e0d
minor style fix
2017-05-24 20:07:38 -04:00
Jeremy Kauffman
5d68da9dba
fix access without code
2017-05-24 20:07:38 -04:00
Jeremy Kauffman
0c41cbb823
error and auth fixes
2017-05-24 20:07:38 -04:00
6ea86b96
3659c989b8
Display search results immediately if they are in the state
2017-05-23 12:59:35 +04:00
6ea86b96
27b9d844b7
Fix navigating back through search results
2017-05-23 12:46:52 +04:00
6ea86b96
53efd55890
Fix snackbar
2017-05-23 11:21:21 +04:00
Jeremy Kauffman
a08a214d34
fix text areas and bug reporting
2017-05-21 18:34:12 -04:00
Jeremy Kauffman
0936d28e5d
minor bug fixes
2017-05-21 12:15:41 -04:00
Jeremy Kauffman
951190bf96
channel and file selector fixes
2017-05-21 10:42:34 -04:00
Jeremy Kauffman
bb16156034
re-enable rewards
2017-05-19 12:17:19 -04:00
Jeremy Kauffman
209db5e3d0
Merge branch 'redux' into es6-classes
2017-05-19 09:17:41 -04:00
Jeremy Kauffman
f60d17f604
Merge branch 'redux' into file-selector
2017-05-19 09:11:32 -04:00
Jeremy Kauffman
9d8fa102ee
bug fixes, file info and my claims refactor, list claims in channel
2017-05-18 19:14:26 -04:00
Jeremy Kauffman
900c5cbc2b
some progress towards cost and file info refactor, plus other fixes
2017-05-18 13:58:28 -04:00
Alex Liebowitz
09834941ab
Convert more callbacks to arrow functions
2017-05-18 04:39:18 -04:00
Alex Liebowitz
3e35d44978
Basics of conversion to ES6 classes
2017-05-18 04:39:18 -04:00
Jeremy Kauffman
3fa4d0dfe7
progress towards fixing settings and costs
2017-05-17 17:52:45 -04:00
Jeremy Kauffman
aa935c1c07
more refactors, fixes
2017-05-15 12:34:33 -04:00
Jeremy Kauffman
6783bcdfeb
i'm making things better... right?
2017-05-14 23:50:59 -04:00
Jeremy Kauffman
0fad6864ec
let improvements and breaking continue
2017-05-12 18:50:51 -04:00
Jeremy Kauffman
c823ccd056
fix infinite resolve, add valid uri check
2017-05-12 16:49:15 -04:00
Jeremy Kauffman
950f3183cf
more bug fixes + optimizations
2017-05-12 14:36:44 -04:00
Jeremy Kauffman
5605b10f54
more bug fixes and bugs
2017-05-12 13:14:06 -04:00
Alex Liebowitz
c8f7cb2110
Update FormField to use new Electron file/directory selector
2017-05-12 07:31:33 -04:00
Alex Liebowitz
044d3612c2
Add FileSelector component
2017-05-12 07:31:23 -04:00
Jeremy Kauffman
c1161fc10b
mainly more bug fixes
2017-05-11 19:28:43 -04:00
Alex Grintsvayg
df7ce9cc64
api returns fields in lowercase now
2017-05-11 17:44:00 -04:00
Jeremy Kauffman
3c325b2f0a
where's the triggers?! also very broken
2017-05-10 20:59:47 -04:00
Jeremy Kauffman
d517316554
some progress but also broken show
2017-05-09 23:06:48 -04:00
Jeremy Kauffman
1dedb9873c
more fixes but not all of the fixes :(
2017-05-09 21:33:13 -04:00
Jeremy Kauffman
60d298b354
Merge remote-tracking branch 'origin/master' into redux
2017-05-09 16:58:48 -04:00
Jeremy Kauffman
9c02327b26
merge plus some bug fixes
2017-05-09 16:12:48 -04:00
6ea86b96
786f57e787
Fix search results html
2017-05-09 14:33:01 +07:00
6ea86b96
84b86ff8e4
Make FileTile resolve URIs (fixes exact search matching)
2017-05-09 13:38:43 +07:00
Jeremy Kauffman
e4ca14aa47
fix some minor things with search
2017-05-08 18:22:27 -04:00
6ea86b96
4b5187bc7f
Better search
2017-05-07 19:50:32 +07:00
6ea86b96
225921c0a4
Use HTML from master file tile stream
2017-05-07 14:07:40 +07:00
6ea86b96
d2c97d3460
Back button working properly
2017-05-06 23:31:47 +07:00
6ea86b96
fb3d366fe0
Fix upgrading and start on history
2017-05-06 00:05:33 +07:00
6ea86b96
29c53a9bf8
Search kind of working, but nasty
2017-05-05 15:01:16 +07:00
6ea86b96
daabe975e1
Add showPage again. Not 100% sure if it's needed?
2017-05-05 13:13:06 +07:00
6ea86b96
494d885f31
Use SubHeader for all sub navigation
2017-05-05 12:28:28 +07:00
6ea86b96
ac626ab9f9
File page working
2017-05-05 12:10:37 +07:00
Alex Liebowitz
536c5391fb
Make error modals display full screen properly
...
Was not passing in the generic modal-overlay class. (ExpandableModal
doesn't provide it automatically so you can omit it and make a totally
custom overlay if you want.)
2017-05-05 00:46:10 -04:00
Jeremy Kauffman
36a992343f
much progress towards a working merge
2017-05-03 23:44:08 -04:00
Jeremy Kauffman
d94ef70f60
more bug fixes
2017-05-02 19:49:02 -04:00
6ea86b96
e1e172a11e
Switch to https://github.com/Selz/plyr video player (recommended by @fillerino).
2017-05-02 19:43:34 -04:00
6ea86b96
44ad47c05f
Fix publish page link in router
2017-05-02 19:41:37 -04:00
6ea86b96
513555e402
Fix for timed out content
2017-05-02 19:40:42 -04:00
6ea86b96
6d35eb69c5
File tile stream fixes
2017-05-02 19:40:42 -04:00
6ea86b96
001d5e21f1
Get rewards page working
2017-05-02 19:40:42 -04:00
6ea86b96
b97703dc3c
Refactor UriIndicator
2017-05-02 19:38:14 -04:00
6ea86b96
2547d85751
Fix file card stream loading text
2017-05-02 19:37:15 -04:00
6ea86b96
3c31a9fca1
Published files working
2017-05-02 19:36:31 -04:00
6ea86b96
84a2f48c24
Increase deactivate search timeout
2017-05-02 19:35:59 -04:00
6ea86b96
1d549ff258
Fix purchasing from file actions and allow content to be watched when being
...
downloaded from file actions download link
2017-05-02 19:35:59 -04:00
6ea86b96
7a6dd93886
Downloaded file list kind of working. Not sure about sort.
2017-05-02 19:35:59 -04:00
6ea86b96
e1d23667bc
Fix NSFW blurring on search and make search show/hide smarter
2017-05-02 19:35:22 -04:00
6ea86b96
1d16c73cf4
More refactoring/fixing of file actions, tiles, etc
2017-05-02 19:34:01 -04:00
6ea86b96
f08ce3d300
A bunch of improvements and broken the back of the file rendering code now
2017-05-02 19:31:34 -04:00
6ea86b96
b0f32aebc7
Refactoring
2017-05-02 19:30:28 -04:00
6ea86b96
13008f5f31
Videos playing properly immediately after purchase
2017-05-02 19:29:10 -04:00
6ea86b96
0d658b2767
Playing videos actually working now
2017-05-02 19:27:57 -04:00
6ea86b96
e0b78368ab
Playing videos working better
2017-05-02 19:25:06 -04:00
6ea86b96
674fafd31a
Able to watch already downloaded videos
2017-05-02 19:23:52 -04:00
6ea86b96
67b79fc3a0
Search working
2017-05-02 19:22:44 -04:00
6ea86b96
768326fb4a
Working on search
2017-05-02 19:20:53 -04:00
6ea86b96
bb9a71805b
Loading show page content fast, resolving cost and file info.
...
Rewards and uploaded/downloaded files currently broken
2017-05-02 19:16:42 -04:00
6ea86b96
6c4ad8cee9
Starting on downloaded/published content
2017-05-02 19:13:01 -04:00
6ea86b96
5c3772dc86
Featured content
2017-05-02 19:10:35 -04:00
6ea86b96
ecd2063fed
Progress on featured content
2017-05-02 19:07:46 -04:00
6ea86b96
089572880f
Wallet progress
2017-05-02 18:47:03 -04:00
