Commit graph

1546 commits

Author SHA1 Message Date
Sean Yesmunt
143f17feb7 redesign fixes 2019-12-09 09:50:50 -05:00
Sean Yesmunt
a8707405ad check for device_types 2019-12-06 16:30:33 -05:00
Sean Yesmunt
2944ed3664 add open in app link 2019-12-06 16:16:14 -05:00
Sean Yesmunt
d2a1852a8d Revert "add open in app link"
This reverts commit d980a01303.
2019-12-06 16:05:10 -05:00
Sean Yesmunt
d7d8b2f39a Revert "move upgrade prompt to a <Nag />"
This reverts commit 0c125ed2b9.
2019-12-06 16:05:10 -05:00
Sean Yesmunt
dcee3720b7 Revert "consistent casing"
This reverts commit c7425c8d1d.
2019-12-06 16:05:10 -05:00
Sean Yesmunt
c7425c8d1d consistent casing 2019-12-06 15:59:05 -05:00
Sean Yesmunt
0c125ed2b9 move upgrade prompt to a <Nag /> 2019-12-06 15:59:05 -05:00
Sean Yesmunt
d980a01303 add open in app link 2019-12-06 15:59:05 -05:00
Sean Yesmunt
ebd5ccaeb7 update copy and only show welcome for unverified users 2019-12-06 11:42:10 -05:00
Josh Finer
eb3e2848de Update view.jsx
*Promised
2019-12-06 11:42:10 -05:00
Sean Yesmunt
e9700f24af add youtube welcome message 2019-12-06 11:42:10 -05:00
Sean Yesmunt
26499e06a3 fix typo 2019-12-06 10:42:05 -05:00
Sean Yesmunt
d4256feabd im an idiot 2019-12-06 10:31:17 -05:00
Thomas Zarebczan
92e04bcf4f fix: check loadedlanguages exists 2019-12-06 08:58:17 -05:00
Thomas Zarebczan
d8b580b9f5 Add back en 2019-12-06 08:20:59 -05:00
kodxana
f6e21b0d93 Sort alphabetical + new languages 2019-12-06 00:19:52 -05:00
Sean Yesmunt
733e772952 put back user check I removed for a hotfix 2019-12-05 11:30:48 -05:00
Sean Yesmunt
c1131a374b hopefully stop app crashes because of bad dates
https://github.com/GoogleChrome/lighthouse/issues/1056
2019-12-05 01:09:08 -05:00
Sean Yesmunt
df756b2907 hotfix for lbry.tv 2019-12-05 00:44:28 -05:00
Oleg Silkin
fb868a5810 Fixes the styling for custom-wrapped components 2019-12-04 14:28:39 -05:00
Oleg Silkin
fdb653fa12 Allows for channel thumbnails to be clickable from issue #3119 2019-12-04 14:28:39 -05:00
Oleg Silkin
1e82586fff Allows the UriIndicator to be wrapped around other DOM nodes 2019-12-04 14:28:39 -05:00
Sean Yesmunt
f138199936 fix rebase 2019-12-04 14:23:43 -05:00
Sean Yesmunt
01a45e00bb clean up styles 2019-12-04 13:24:57 -05:00
Oleg Silkin
26ae67702d Uses Expandable only if the message exceeds 300 characters 2019-12-04 13:24:57 -05:00
Oleg Silkin
23ec4beb7c Fixes styling issue 2019-12-04 13:24:57 -05:00
Oleg Silkin
53e4392feb Comments are adjacent to the thumbnail 2019-12-04 13:24:57 -05:00
Oleg Silkin
171cfe31aa Adds comment thumbnails 2019-12-04 13:24:57 -05:00
Oleg Silkin
6018429e68 Adds thumbnail support for default, null-valued thumbnails 2019-12-04 13:24:57 -05:00
Sean Yesmunt
27f1b4fa01 make sure player is paused when unmounting 2019-12-04 12:05:33 -05:00
jessopb
ba84eb07a5
Merge branch 'master' into fix-noMatureSearchPagination 2019-12-03 18:26:52 -05:00
Sean Yesmunt
613c8f7a10 improve autoplay on chrome 2019-12-03 13:56:30 -05:00
Sean Yesmunt
8ae5a76463 fix code styling 2019-12-03 13:54:46 -05:00
Sean Yesmunt
3a9e215357 respond to PR feedback 2019-12-03 13:25:17 -05:00
Sean Yesmunt
6a69ffe0fb remove LBRY_INC_DOMAINS list 2019-12-03 13:25:17 -05:00
Sean Yesmunt
bf512e8338 use same code for handling open links on lbry.tv and desktop 2019-12-03 13:25:17 -05:00
Sean Yesmunt
8839bb08db better open.lbry.com redirect handling for lbry.tv 2019-12-03 13:25:17 -05:00
Jeremy Kauffman
24edbc085c disable link prompts 2019-12-03 11:50:39 -05:00
Sean Yesmunt
e406c2fdf5 use card background for file viewer background 2019-12-03 11:49:52 -05:00
Jeremy Kauffman
b810413bc3 change file viewer background color 2019-12-03 11:49:52 -05:00
Thomas Zarebczan
5c02b7360f feat: add mkv support
I'm going to clean up the redux side of mediaType eventually, this is hacky for now.
2019-12-02 23:25:37 -05:00
Thomas Zarebczan
4e55415763 fix: unused variable 2019-12-02 23:25:37 -05:00
Thomas Zarebczan
722c0b978c feat: additional file types on lbry.tv
Should support markdown, PDF, and anything in the code viewer. Tested that it's working on web and app.
2019-12-02 23:25:37 -05:00
Jeremy Kauffman
66ccbb468b fix auto language support
fix mistake
2019-12-02 23:23:00 -05:00
jessop
ebb7277e40 disables doSetAutoLaunch if not production 2019-12-02 12:36:30 -05:00
jessop
350bab2abc fixes no tags message 2019-12-02 12:36:03 -05:00
Thomas Zarebczan
70eb909e94 revert autoplay setting
This causes issues in firefox, but fixed the bugs on Chrome. Instead, we should control it ourselves eventually: https://lbry.tv/jiggytom?src=open
2019-11-28 13:21:39 -05:00
Thomas Zarebczan
8c5b109e91 player enhancements
Tries more video types
Enables thumbnail with audio files
potentially better autoplay support
2019-11-28 03:14:07 -05:00
Sean Yesmunt
ad33345d64 fix error snack bar color 2019-11-27 13:28:15 -05:00
Sean Yesmunt
befc3f9660 fix: auth_cookie on localhost now being set 2019-11-27 10:18:43 -05:00
Sean Yesmunt
c72fc19fd4
back again 2019-11-26 10:30:07 -05:00
jessop
29ab7fe4e7 fixes hidden claims notification 2019-11-25 15:13:19 -05:00
Sean Yesmunt
9a9d3e4d16
gaa 2019-11-25 14:56:05 -05:00
jessop
41ff13b0d6 loading state for publish and channel list pages 2019-11-25 14:12:17 -05:00
Thomas Zarebczan
2832880d45 Fix: balance / bid issues
Balance checking on publish was not working. Channel create didn't have minimum bid check.
2019-11-25 12:44:22 -05:00
Sean Yesmunt
23355e6b21 redesign fixes 2019-11-25 12:43:45 -05:00
Sean Yesmunt
b896b9c5af additional pending claim style fixes 2019-11-25 11:55:35 -05:00
Jeremy Kauffman
4316f7b913 preview styling fix yolo'd from github UI 2019-11-25 11:55:35 -05:00
btzr-io
ef7d5394dc update comicbook-reader to last version 2019-11-25 11:40:19 -05:00
Sean Yesmunt
af50406fed fix text color on unsupported files 2019-11-23 13:19:24 -05:00
Sean Yesmunt
9d0a7ce20e fix reward link 2019-11-23 13:19:24 -05:00
Sean Yesmunt
85608bbd23 fix text selection style 2019-11-22 18:51:41 -05:00
Sean Yesmunt
15815e5071 remove [data-mode='dark'] 2019-11-22 16:45:33 -05:00
Sean Yesmunt
4fcef383e5
Revert hot fix since it's working again 2019-11-22 15:58:15 -05:00
Sean Yesmunt
2326391897
hot fix for thumbnails on lbry.tv 2019-11-22 15:52:40 -05:00
Sean Yesmunt
600792884e try to delete old cookies too 2019-11-22 10:32:25 -05:00
Sean Yesmunt
1fb7229aa1 add domain to deleteCookie function 2019-11-22 10:06:23 -05:00
jessop
f21925beab paginates over search count rather than channel claim count 2019-11-21 21:27:39 -05:00
Sean
ed1f8e75cb include rest of edge fixes for lbry.tv 2019-11-21 17:04:21 -05:00
Thomas Zarebczan
31c6ce6426 fix: adjust trending
Use trending group instead of trending global. Mixed already takes into account global. This index is now available on the wallet servers.
huh
2019-11-21 10:15:01 -05:00
Sean Yesmunt
166c7c49cc fix: use i18n on image text 2019-11-21 09:58:39 -05:00
Sean Yesmunt
b76a09753c update copy 2019-11-21 09:50:45 -05:00
Thomas Zarebczan
1bee7367ec fix: minor copy edits
To support https://lbry.com/faq/thumbnails-and-covers (should we hyperlink this on these 2 pages?)
And help: https://github.com/lbryio/lbry-desktop/issues/3113
2019-11-21 09:50:45 -05:00
jessop
26235ee39a simplify 2019-11-20 23:55:43 -05:00
jessop
6e511fd85c update first subscription modal 2019-11-20 23:55:43 -05:00
Sean Yesmunt
1a3eb38e0b fix unlock reward button on rewards page 2019-11-20 18:03:43 -05:00
Sean Yesmunt
0ad01e2444 update help text for clear cache button 2019-11-20 18:03:43 -05:00
Sean Yesmunt
a87470126a use SameSite=Lax instead of Strict so cookies aren't lost when opening links 2019-11-20 16:01:50 -05:00
Sean Yesmunt
d498c14603 temp fix for select width 2019-11-19 22:22:24 -05:00
Sean Yesmunt
b089a9a953 fix pagination on channel pages 2019-11-19 22:22:24 -05:00
Sean Yesmunt
d7b8d6b82c don't use autolauncher at all on mac to fix security warning on macOS 2019-11-19 22:22:24 -05:00
Sean Yesmunt
e51f31f015 dont re-resolve on empty claims 2019-11-19 22:22:24 -05:00
Sean Yesmunt
56eeca76a5 show refresh message if the captcha hasn't loaded after 2 seconds 2019-11-19 22:22:24 -05:00
Sean Yesmunt
8e89a144cf disable captcha for returning users 2019-11-19 22:22:24 -05:00
Thomas Zarebczan
6f572420f9
fix: missing words on file delete screen 2019-11-19 17:47:19 -05:00
kodxana
d8a267cf67 Added Malayalam (ml) and Serbian (sr) language 2019-11-19 16:31:36 -05:00
jessop
aeb0d7acd1 no refs in NavLink 2019-11-19 16:28:59 -05:00
jessop
fe50dc7bb7 fixes button hover 2019-11-19 16:28:59 -05:00
Sean Yesmunt
17ca93ab30 use ifdef comments for file-delete text 2019-11-19 16:28:18 -05:00
Thomas Zarebczan
8257004316 Update view.jsx 2019-11-19 16:28:18 -05:00
Jessop
8cb4208282 autoLaunch on startup 2019-11-18 15:00:00 -05:00
Sean Yesmunt
30270f2df9 simpler email regex 2019-11-18 14:50:29 -05:00
Sean Yesmunt
f7c00dd070 fix: don't re-resolve on file page if we don't need to 2019-11-18 14:20:32 -05:00
jessop
c01a3a069a fix channel thumb uploads on lbrytv 2019-11-18 11:27:59 -05:00
jessop
04181c8a4a passes apicall for lbrytv updates 2019-11-18 11:26:50 -05:00
Sean Yesmunt
0bcb3f7b68 don't re-resolve for claims that don't exist 2019-11-15 12:07:32 -05:00
Sean Yesmunt
fc0a0ed6bc rc-fixes 2019-11-15 10:14:03 -05:00
Jeremy Kauffman
18cc6a7c48 i18n fixes, remove channel tags from file/show 2019-11-14 15:31:38 -05:00
Sean Yesmunt
46a85bec6b add .section class on channel comments 2019-11-14 15:22:45 -05:00
Jeremy Kauffman
e02f021b73 refactored comment flow 2019-11-14 15:22:45 -05:00
Thomas Zarebczan
67ea0dc9b6 Fix: don't show empty state when loading 2019-11-14 14:00:47 -05:00
Jeremy Kauffman
f445ee8b9c always fit video player 2019-11-14 13:05:01 -05:00
Sean Yesmunt
7f37d370dd update lbry-redux 2019-11-14 13:04:23 -05:00
Sean Yesmunt
97cb4ff3bc hide embed area for channel share modal 2019-11-14 13:04:23 -05:00
zxawry
66c6ec1626 fix pressing enter on channel edit page for adding tags 2019-11-14 13:02:22 -05:00
zxawry
aa69b227bd fix tags selection on channel edit page 2019-11-14 13:02:22 -05:00
Sean Yesmunt
d0a9dc526b allow desktop app to be run if internal-apis fails 2019-11-14 12:06:59 -05:00
Sean Yesmunt
6b3e535100 fix typo 2019-11-14 11:30:29 -05:00
Jeremy Kauffman
c565d43c67
clarify text 2019-11-14 10:16:53 -05:00
Sean Yesmunt
4dde9cb5dc fix typo 2019-11-14 09:36:48 -05:00
Sean Yesmunt
07a8971b47 make sure 'en' is always included in list of languages 2019-11-14 09:36:48 -05:00
Sean Yesmunt
1b62fe8a5a format code 2019-11-14 09:35:31 -05:00
Jeremy Kauffman
7ae4c3301d restore redirection 2019-11-14 09:35:31 -05:00
Jeremy Kauffman
a1f0e485b5 add sign in flow to lbry.tv 2019-11-14 09:35:31 -05:00
Sean Yesmunt
3c08913d1c remove old style 2019-11-13 19:29:32 -05:00
Sean Yesmunt
da10296132 lbry.tv account copy changes 2019-11-13 19:09:30 -05:00
Sean Yesmunt
486f15eba1 redirect to publishes page after publish immediately on web 2019-11-13 19:09:30 -05:00
Thomas Zarebczan
de3d379b80 fix: SDK bump + small fixes
- improve claim search failure
2019-11-13 16:31:14 -05:00
Sean Yesmunt
5ba871cd21 only use compression proxy on lbry.tv 2019-11-13 12:50:45 -05:00
Sean Yesmunt
6f9c9d2052 remove double slash so the image server doesn't redirect when we don't want to 2019-11-13 12:36:41 -05:00
Sean Yesmunt
4a74ee681c test with niko - pass all claim preview urls through optimization site 2019-11-13 12:26:23 -05:00
Sean Yesmunt
73bd46e7d8 fire analytics event after file has started downloading 2019-11-13 10:43:21 -05:00
jessop
1427ad2a76 triggers analytic before completed for downloads 2019-11-13 10:43:21 -05:00
jessop
ba4d6afde0 triggers analytic on download click + completed 2019-11-13 10:43:21 -05:00
jessop
723d1fabbb adds anaytics to download button 2019-11-13 10:43:21 -05:00
Jeremy Kauffman
5da78c9553 one more optimization/fix 2019-11-13 09:53:01 -05:00
Jeremy Kauffman
7e2fb22836 no more js to load js 2019-11-13 09:53:01 -05:00
Jeremy Kauffman
751b86d05d finished?! 2019-11-13 09:53:01 -05:00
Jeremy Kauffman
d10ec54a5e this also doesnt work 2019-11-13 09:53:01 -05:00
Jeremy Kauffman
8a2393cb67 proper default languages 2019-11-13 09:53:01 -05:00
Jeremy Kauffman
de5c5a9626 fix languages.js after rebase 2019-11-13 09:53:01 -05:00
peterjgrainger
1d053c5302 load translations before the application starts 2019-11-13 09:53:01 -05:00
peterjgrainger
ef1f6e9836 put supported languages in one constants file 2019-11-13 09:53:01 -05:00
peterjgrainger
4a0855e074 Used OS language to default localization 2019-11-13 09:53:01 -05:00
Jeremy Kauffman
d5745db757 do not block text rendering while loading fonts
see https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display
2019-11-12 15:23:22 -05:00
Sean Yesmunt
3f2de50368 bring publish overrides into ui/index.jsx to fix api url being set properly 2019-11-11 13:27:29 -05:00
Sean Yesmunt
ab2ee079e2 fix scripts 2019-11-11 13:27:29 -05:00
Sean Yesmunt
6ad31a3ce9 refactor lbrytv web server 2019-11-11 13:27:29 -05:00
Igor Gassmann
1d9a5d90cf Fix merge conflicts 2017-11-27 21:01:33 -03:00
Igor Gassmann
3032736026 attempt to fix restructuring branch 2017-11-27 18:48:45 -05:00
Sean Yesmunt
6fdc5b7c7d add handleActions redux util 2017-11-27 12:07:57 -05:00
Jeremy Kauffman
caa8cd6755 change header balance to 2 decimal places 2017-11-26 14:56:02 -05:00
Jeremy Kauffman
3a0ffb312a
Revert "Update file structure to follow electron-webpack guidelines" 2017-11-24 16:36:10 -05:00
Igor Gassmann
dbf0fae552 Update file structure to follow electron-webpack guidelines 2017-11-24 11:31:05 -03:00
Sean Yesmunt
3f2c871e42 add comment 2017-11-22 15:33:45 -05:00
Sean Yesmunt
6f96ea10a9 fix channel name alignment 2017-11-22 15:28:56 -05:00
hackrush
5d3fc936b8 Changes 2017-11-22 22:30:08 +05:30
hackrush
0052349ddc Use balance_delta in txn list 2017-11-22 22:28:23 +05:30
Jeremy Kauffman
aa42b76b79
Merge pull request #770 from lbryio/issue/614
Fixed sorting by title for published files (#614)
2017-11-21 18:05:20 -05:00
Sean Yesmunt
97469b0e3a add yarn back to /ui 2017-11-21 17:37:12 -05:00
Igor Gassmann
812a5d1d7c Delete gitignored file 2017-11-21 19:17:36 -03:00
Igor Gassmann
d489aad4ee Fixed sorting by title for published files (#614) 2017-11-21 19:00:53 -03:00
Igor Gassmann
cf94212e8e HOTFIX: fix import paths 2017-11-21 17:09:20 -03:00
Igor Gassmann
b8333db3bc Merge branch 'issue/708' 2017-11-21 16:51:55 -03:00
Igor Gassmann
96d70feb7d Merge master branch's changes 2017-11-21 16:51:12 -03:00
Liam Cardenas
3d8524d287
Merge pull request #758 from lbryio/issue/752
Integrate React and Redux devtools into Electron
2017-11-21 13:28:09 -05:00
Sean Yesmunt
61dac01de6 fix menu bar icon for macOS 2017-11-21 01:12:09 -05:00
Jeremy Kauffman
3c9410439b fix empty claims breaking transaction screens #755 2017-11-20 17:16:57 -05:00
Sean Yesmunt
d78112658f refactor scroll navigation/restore 2017-11-17 16:27:35 -05:00
Igor Gassmann
6d01122967 Integrate React and Redux devtools into Electron 2017-11-17 17:40:56 -03:00
Igor Gassmann
a578a6b31d Update code according to code review. 2017-11-16 18:41:08 -03:00
Igor Gassmann
e0aa6e3646 Remove unused code 2017-11-16 17:26:00 -03:00
Liam Cardenas
1f20995e99
Merge pull request #737 from seanyesmunt/redux-cleanup
Move all redux code into /redux folder
2017-11-16 12:39:50 -05:00
Jeremy Kauffman
857414238e
Merge pull request #744 from lbryio/issue721
Issue #721 fix - Inconsistent thumbnail sizes
2017-11-15 16:57:47 -05:00
Liam Cardenas
654edc9885 Bump version: 0.18.2rc1 → 0.18.2 2017-11-15 14:39:09 -05:00
Liam Cardenas
d8a20a5cba Bump version: 0.18.1rc1 → 0.18.2rc1 2017-11-15 13:25:20 -05:00
Liam Cardenas
06b2a94c80 Bump version: 0.18.0 → 0.18.1rc1 2017-11-15 11:46:40 -05:00
Liam Cardenas
4ffbf05400 Added currentBalance to props in modal credit intro 2017-11-15 10:40:48 -05:00
Igor Gassmann
09be36e367 Show Upgrade App button if an upgrade is available 2017-11-14 22:51:06 -03:00
Igor Gassmann
03c9a14c71 Add timer for checking for app upgrades 2017-11-14 22:50:21 -03:00
Akinwale Ariwodola
ff133a03df Issue #721 fix - Inconsistent thumbnail sizes 2017-11-14 12:56:24 -05:00
Jeremy Kauffman
8733f3a590 state transaction failure in transaction modal 2017-11-13 16:06:09 -05:00
Sean Yesmunt
a131bcf198 update app import 2017-11-13 16:04:09 -05:00
Sean Yesmunt
8993c9524e update imports 2017-11-13 16:02:23 -05:00
Sean Yesmunt
6d39d22ac7 move redux code into /redux 2017-11-13 15:47:10 -05:00
Jeremy Kauffman
cdbfd73893 Bump version: 0.18.0rc5 → 0.18.0 2017-11-13 13:42:04 -05:00
Jeremy Kauffman
b7b81b080c Bump version: 0.18.0rc4 → 0.18.0rc5 2017-11-13 10:29:13 -05:00
Jeremy Kauffman
85f391e8a1 Bump version: 0.18.0rc3 → 0.18.0rc4 2017-11-10 10:41:58 -05:00
Jeremy Kauffman
3209d813f2 placeholder value should match default value on publish #701 2017-11-10 10:41:22 -05:00
Jeremy Kauffman
c2a18d6f1b Bump version: 0.18.0rc2 → 0.18.0rc3 2017-11-10 09:56:24 -05:00
Igor Gassmann
9e0f8adb58 Add prominent upgrade button when upgrade is pending 2017-11-10 11:55:34 -03:00
Jeremy Kauffman
7a9aaf377b fix API error propegation 2017-11-10 09:55:30 -05:00
Igor Gassmann
2012fc17d4 Merge branch 'master' of https://github.com/lbryio/lbry-app into issue/708
Retrieve webpack changes from master
2017-11-10 11:40:38 -03:00
Sean Yesmunt
1eeff2dadc fix dev build path and update webpack file names in build.sh/watch.bat 2017-11-09 18:46:33 -08:00
Igor Gassmann
feb19bdea9 Add App upgrade button to the header 2017-11-09 21:07:02 -03:00
Jeremy Kauffman
c219cf9709 Bump version: 0.18.0rc1 → 0.18.0rc2 2017-11-09 17:05:17 -05:00
Jeremy Kauffman
e811b3a613 remove console statements 2017-11-09 17:01:22 -05:00
Jeremy Kauffman
8acb7bd85a actually fix api.lbry.io errors getting swallowed 2017-11-09 17:00:48 -05:00
Jeremy Kauffman
6300370046 fix api.lbry.io errors getting swallowed 2017-11-09 16:59:41 -05:00
Jeremy Kauffman
3b1f63d98f enlarge snack bar, fixes #714 2017-11-09 16:55:34 -05:00
Jeremy Kauffman
a678570665 Bump version: 0.17.1 → 0.18.0rc1 2017-11-08 18:20:50 -05:00
Jeremy Kauffman
d9f65aaff3 add help link for transaction types 2017-11-08 18:14:32 -05:00
Jeremy Kauffman
a6946b4930 Merge remote-tracking branch 'origin/master' into revoke_claims 2017-11-08 17:42:51 -05:00
Jeremy Kauffman
77774e6fbc update daemon to 0.18 2017-11-08 17:37:16 -05:00
Jeremy Kauffman
350c4dc98c minor changes to tray functionality 2017-11-08 17:27:20 -05:00
hackrush
7a0a0c468e Rudimentary implementation of tray minimization(WIP)
Minimize app to tray

@kauffj I was not sure about which icon to use so I used a 96x96 png as
a placeholder. The feature is working well.

Fixes #374

3 small changes

Broken Minimization

Fixed App-minization finally

Bug fix and compatibility check

Added Alt+F4 accelerator to quit the app

Small features and fixes

Homerun: Added Quit to Menu

Fixes and changes
2017-11-08 17:27:17 -05:00
Sean Yesmunt
b858614902
Merge pull request #713 from seanyesmunt/webpack
Simplify webpack
2017-11-08 11:02:24 -08:00
Sean Yesmunt
f877ac39f8 merge common webpack configs 2017-11-07 19:54:22 -08:00
Alex Grintsvayg
f14884d8a0 categories are in order these days 2017-11-07 12:43:31 -05:00