Commit graph

52 commits

Author SHA1 Message Date
hackrush
5b49915ff6 Merge branch 'master' into tipping_button 2017-09-01 14:02:35 +05:30
Jeremy Kauffman
339945018d Fix bugs in history navigation in stack ordering and loss of scrolling
and refactor history
2017-08-30 13:40:51 -04:00
Jeremy Kauffman
c7522dc0a5 better?
merging is hard

releasable?
2017-08-29 17:42:11 -04:00
hackrush
21175ba608 Merge remote-tracking branch 'upstream/master' into tb2 2017-08-29 13:21:23 +05:30
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
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
Jeremy Kauffman
5bec6accc2 mostly done
refactor modals and settings, clean-up CHANGELOG
2017-08-18 17:47:30 -04:00
hackrush
03ee864af0 (WIP) Tip as support Functionality Only. 2017-08-08 03:56:43 +05:30
hackrush
a701011245 Removed useless passing of claim arg in filePage 2017-08-08 03:49:22 +05:30
hackrush
ba6d093d1c Added new component form for price, also only tipping form is shown when
clicked.
2017-08-08 03:49:22 +05:30
hackrush
a74d61d685 Added tip related code in different file. 2017-08-08 03:49:22 +05:30
hackrush
f54f8a4e10 Testing with tip link in different file. 2017-08-08 03:49:22 +05:30
hackrush
f403260598 (WIP) Adds tipping feature to app.
For issue #355
2017-08-08 03:49:22 +05:30
6ea86b96
12e0d99a95
Quick fix to stop an infinite loop 2017-07-26 15:44:05 +07:00
6ea86b96
1f9fc456d3 Restart download monitoring in redux for pending downloads after
restart
2017-07-25 15:45:21 +07:00
Jeremy Kauffman
ac34faea80 Merge remote-tracking branch 'origin/master' into rewards3 2017-07-24 18:09:37 -04:00
6ea86b96
4745088eff Display the download button for files that are not downloading and have
0 progress
2017-07-25 00:37:57 +07:00
Jeremy Kauffman
c67fe5aae6 update to master 2017-07-21 17:45:37 -04:00
6ea86b96
76a99cc576 Add a loading file info message. 2017-07-21 16:02:03 +07:00
Jeremy Kauffman
b3de4ceee9 beginnings of new flow 2017-07-15 15:25:39 -04:00
Jeremy Kauffman
8ea972200a refactor remove file modal 2017-07-02 14:23:38 -04:00
6ea86b96
91359c2966 Add option to abandon claim when deleting published file 2017-07-02 13:48:53 -04:00
Jeremy Kauffman
f95853892b disable availability check 2017-06-15 20:02:57 -04:00
Sean Yesmunt
e13d7c2149 use React.PureComponent 2017-06-07 21:42:19 -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
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
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
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
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
6ea86b96
37344b3517
Stop blowing up if user attempts to download before cost info fetched 2017-05-28 18:24:10 +04:00
Intnick
0119ed8edc filaActions and fileCard components translated 2017-05-26 09:02:37 +02:00
Jeremy Kauffman
951190bf96 channel and file selector fixes 2017-05-21 10:42:34 -04:00
Jeremy Kauffman
209db5e3d0 Merge branch 'redux' into es6-classes 2017-05-19 09:17:41 -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
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
6ea86b96
513555e402 Fix for timed out content 2017-05-02 19:40:42 -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