shortcutme
807dc866e5
Rev3106, Cancel other part downloads when delete optional file
2017-10-16 01:43:51 +02:00
shortcutme
a66b71fb9c
Rev3104, Fix bigfile signing via command line
2017-10-13 11:27:45 +02:00
shortcutme
9484a27801
Sent and Received command statistics
2017-10-13 01:17:27 +02:00
shortcutme
c8eb93db07
Bigfile stats
2017-10-13 01:17:07 +02:00
shortcutme
3c8867bf72
Also display last received command for connection
2017-10-13 01:16:44 +02:00
shortcutme
ef2f1d56d4
Display short encryption for connections to reduce with
2017-10-13 01:16:11 +02:00
shortcutme
046877599e
Don't create empty piecefield for every optional file
2017-10-13 01:15:43 +02:00
shortcutme
b322b750c2
Don't load empty piecefields from sites.json
2017-10-13 01:15:21 +02:00
shortcutme
3030e00b21
Fix bigfile display if no piecemap info present
2017-10-10 14:58:43 +02:00
shortcutme
7ba3d86af4
Ignore invalid updatePiecefields response
2017-10-10 14:58:13 +02:00
shortcutme
7905e12fc3
Rev3097, Add peer info for bigfiles even if it's not downloaded
2017-10-06 00:42:19 +02:00
shortcutme
07caaa6b48
Fix removed is_pinned flag on content.json update
2017-10-05 19:24:39 +02:00
shortcutme
59a04f101d
Remove unnecessary file
2017-10-05 14:05:48 +02:00
shortcutme
4265c4126a
Change Bigfile plugin directory case
2017-10-05 13:26:40 +02:00
shortcutme
b41570b663
Avoid console windows when setting sparse flag on Windows
2017-10-04 17:25:14 +02:00
shortcutme
cf1154f2c5
Initial version of bigfile plugin
2017-10-04 13:28:59 +02:00
shortcutme
aa9e8b067f
Send websocket event on optional file deletion
2017-10-04 13:17:36 +02:00
shortcutme
e5963f8a76
OptionalFileDelete API call only works on downloaded files
2017-10-04 13:17:18 +02:00
shortcutme
e5b851b171
Add progress information to bigfiles
2017-10-04 13:16:02 +02:00
shortcutme
282f06b65e
Filter for OptionalFileList API call that allows to list non-downloaded files and only bigfiles
2017-10-04 13:15:44 +02:00
shortcutme
e8a439cad3
Mark my optional files using directory on signing instead of file path
2017-10-04 13:14:24 +02:00
shortcutme
cd025316db
Auto-pin downloaded bigger files
2017-10-04 13:13:00 +02:00
shortcutme
d6d9e911fe
Load Peer class after it got pluginned
2017-10-03 14:58:47 +02:00
shortcutme
797abdea80
Load config class after it got pluginned
2017-10-03 14:58:24 +02:00
shortcutme
614a18913e
Switch context during newsfeed queries to avoid blocking the client
2017-10-03 14:37:50 +02:00
shortcutme
bfb7392198
Site has optional files if any of the peers has hashfield
2017-10-03 14:37:15 +02:00
shortcutme
7eca3f4bc5
Display other peers optional files if we has not downloaded anything
2017-10-03 14:36:50 +02:00
shortcutme
f4cdc31788
Lock socket during sending data
2017-10-03 14:27:29 +02:00
shortcutme
d3d7489232
Rev2192, Fix incorrect site detection when using async commands with Cors or MergerSite plugin
2017-09-20 17:06:09 +02:00
ZeroNet
99dd5d5f63
Merge pull request #1112 from imachug/merger-0
...
MergerSite: Add actionFileList and actionDirList proxy
2017-09-10 09:29:09 +02:00
Ivanq
38230c62e6
MergerSite: Add actionFileList and actionDirList proxy
2017-09-10 08:53:07 +03:00
shortcutme
ebdb1ed322
Fix permission limiting with uppercase function names
2017-08-19 18:55:39 +02:00
shortcutme
b1989ef02e
Limit optional file commands in multiuser mode
2017-08-19 18:55:21 +02:00
Sergei Bondarenko
d591df39cc
Fix: ui_restrict now working with ui_password
...
https://github.com/HelloZeroNet/ZeroNet/issues/207
2017-08-18 22:42:14 +03:00
shortcutme
a27422a0fb
Bootstrapper SQL query optimizations
2017-08-18 14:46:35 +02:00
shortcutme
2af08c0ba1
Only return 5 peers if more than 500 site queired
2017-08-18 14:46:06 +02:00
shortcutme
b6c0c955c5
Limit bootstrap queries to 1s
2017-08-18 14:45:48 +02:00
shortcutme
32a0f96ecd
Batch onion update
2017-08-18 14:45:06 +02:00
shortcutme
37ef2802de
Log announce times
2017-08-18 14:44:24 +02:00
shortcutme
9f762a0230
Bootstrapper use python date functions instead of sqlite
2017-08-18 14:43:28 +02:00
shortcutme
bdb5e1597c
Sign automatically on sidebar save button if possible
2017-08-09 14:15:44 +02:00
shortcutme
6a1c5d96ac
Disable bz2 support due incompatibility issues
2017-08-09 14:15:10 +02:00
ZeroNet
d2d335314d
Merge pull request #1062 from cclauss/patch-6
...
data_unpack --> data_unpacked
2017-07-31 13:48:41 +02:00
cclauss
e1d3a31c6c
data_unpack --> data_unpacked
...
@shortcutme Is this the right way to fix these two undefined name errors?
2017-07-31 13:08:22 +02:00
cclauss
6cb700b302
import threading and queue.Empty
...
Fixes the undefined name on line 644
2017-07-31 12:26:15 +02:00
cclauss
b35bff4164
from Debug import Debug
...
Solves the unresolved name on lines 164 and 200
2017-07-31 11:55:03 +02:00
shortcutme
a69531c4c9
Emulate short click for mobile
2017-07-29 13:45:57 +02:00
shortcutme
527c2b4f54
Sidebar close button for small screens
2017-07-29 13:44:54 +02:00
shortcutme
cbac57dc88
Plugin to request cross-site resource access
2017-07-19 16:48:24 +02:00
shortcutme
961fcbf660
Rev2160, Fix sidebar typo
2017-07-18 22:39:48 +02:00
cclauss
1f22009360
Update SiteManagerPlugin.py
2017-07-16 22:53:11 +02:00
cclauss
7d7272a266
Update SidebarPlugin.py
2017-07-16 22:51:01 +02:00
cclauss
83e372ce47
Update SidebarPlugin.py
2017-07-16 22:50:03 +02:00
cclauss
8db16a1421
Update PeerDbPlugin.py
2017-07-16 22:48:35 +02:00
cclauss
21d0b829d3
Update UiWebsocketPlugin.py
2017-07-16 22:47:22 +02:00
cclauss
08219a0285
Update ContentDbPlugin.py
2017-07-16 22:46:13 +02:00
cclauss
d426b6bb02
Update NewsfeedPlugin.py
2017-07-16 22:43:57 +02:00
cclauss
688c240b35
Update MutePlugin.py
2017-07-16 22:42:29 +02:00
cclauss
b82cf8d08d
Update FilePackPlugin.py
2017-07-16 22:39:42 +02:00
cclauss
c44cb11800
Update CryptMessagePlugin.py
2017-07-16 22:38:47 +02:00
cclauss
b9e0275417
Update __init__.py
2017-07-16 22:35:14 +02:00
shortcutme
a0d85d7d83
Prompt new site addition in raw mode
2017-07-15 01:32:15 +02:00
shortcutme
2777c4c537
Read max 6MB from archive to protect against tar/zipbombs
2017-07-12 12:28:03 +02:00
shortcutme
e525ea2431
Rev2144, Fix CSP header in FilePack plugin, Allow media-src and font-src from self source
2017-07-11 23:00:33 +02:00
shortcutme
26a250d1df
Media isMediaRequestAllowed no longer required for origin checking
2017-07-09 14:12:53 +02:00
shortcutme
febdea6c64
Serve files without wrapper if requested using /raw/ prefix
2017-07-09 14:10:01 +02:00
shortcutme
d607696a75
Update websocket site_info on own setting change
2017-06-19 15:33:23 +02:00
shortcutme
4088c88a56
Sidebar check siteSign result
2017-06-19 15:32:58 +02:00
Ivanq
f4a040064c
Don't ask user for privatekey if file can be signed with auth_privatekey
2017-06-15 21:18:15 +03:00
shortcutme
bc02de4b18
ZeroName only match .bit domains
2017-06-13 14:19:43 +02:00
ZeroNet
7a996b3c8d
Merge pull request #976 from Pupiloho/patch-1
...
Add Spanish Translation
2017-06-13 13:09:03 +02:00
ZeroNet
2db48b8c22
Merge pull request #977 from Pupiloho/patch-2
...
Add Spanish Translation
2017-06-13 13:08:47 +02:00
ZeroNet
90e7a69926
Merge pull request #978 from Pupiloho/patch-3
...
Add Spanish Translation
2017-06-13 13:08:38 +02:00
Kûipumu
47d585768b
Add Spanish Translation
...
First revision, orthography checked.
2017-06-12 15:49:45 -04:00
Kûipumu
0f65783266
Add Spanish Translation
...
First revision, orthography checked.
2017-06-12 15:44:37 -04:00
Kûipumu
fa3a981c19
Add Spanish Translation
...
First revision, orthography verified.
2017-06-12 15:40:21 -04:00
Kûipumu
868e956c3f
Add Spanish Translation
2017-06-12 15:33:47 -04:00
shortcutme
b0d574dfb0
Rev2089, Close the transaction on failed peer db save
2017-05-24 10:40:10 +02:00
MuxZeroNet
35a18bd0b2
Weak password warning ( #938 )
...
* Weak password warning
* Update UiWebsocket.py
* Don't implement print with an O(n^2) iteration
* Rename method
* Fix logging, uncaught exception in addNotes
and pushes a notification when UI server is bound to the whole Internet.
* Remove memo comments. Remove terminal hue.
2017-05-22 11:13:45 +02:00
shortcutme
442c01eabf
Rev2068, Deny blacklist add/remove in multiuse mode
2017-05-14 22:59:47 +02:00
shortcutme
d467aabd4c
Rev2067, Fix inner_path stripping
2017-05-11 18:18:12 +02:00
shortcutme
ffb67ab23e
No placeholder for privatekey prompt
2017-05-11 18:02:56 +02:00
shortcutme
1a3b48a60d
Sidebar blacklist button on deletion
2017-05-11 18:02:37 +02:00
shortcutme
9ec050341b
Site blacklist to Mute plugin
2017-05-11 17:53:29 +02:00
shortcutme
728e497057
Display database rebuilding progressbar
2017-05-07 18:14:13 +02:00
shortcutme
d346a532ff
Rev2056, Add local client to sidebar peer numbers
2017-05-06 18:08:32 +02:00
lmath
e42631932b
Fix Sidebar button for touch device & CHANGELOG-zh-cn & FreeBSD installation instructions ( #916 )
...
* Disallow change optional limit on public proxy
* Add Chinese for Mute plugins
* add FreeBSD installation instructions to README-zh-cn.md
* Fix Sidebar button for touch device
* Add CHANGELOG-zh-cn.md
* Why merging junk left? Remove it!
2017-05-06 02:13:26 +02:00
shortcutme
c5629adf23
Rev2050, Fix archive benchmark hash calculation and zip homogenization
2017-04-14 11:52:01 +02:00
shortcutme
9b480b41e1
Rev2049, Delete test.tar.bz2 after benchmark
2017-04-14 11:13:29 +02:00
shortcutme
e125895615
Rev2047, Add archive benchmark
2017-04-13 22:54:16 +02:00
shortcutme
46440565dd
Disable siteSetLimit on proxies
2017-04-12 17:37:13 +02:00
shortcutme
49adea1654
siteSetLimit returns with ok on success
2017-04-12 17:36:50 +02:00
shortcutme
169cf2e6ae
Support optional db files
2017-04-12 17:36:03 +02:00
shortcutme
d7db7a8060
Rev2035, Dont sign same onion address multiple time
2017-04-10 01:16:34 +02:00
shortcutme
7e314287d6
Bootstrapper support same onion address for multiple sites
2017-04-09 12:04:23 +02:00
shortcutme
6c8a7e3cfa
Old onion peers less likely working
2017-04-09 11:54:15 +02:00
ZeroNet
409841a3cf
Merge pull request #834 from MuxZeroNet/patch-13
...
[Open for more Tests] StemPort Plugin
2017-04-08 22:20:06 +02:00
shortcutme
de14c55311
Fix invalid referrers parsing
2017-04-07 18:13:09 +02:00
shortcutme
e527dbdf88
Changed signature
2017-04-06 23:46:32 +02:00
shortcutme
8295f9cd6b
Attach tor_manager to request tor addresses
2017-04-06 23:43:27 +02:00
shortcutme
c6c6af1268
Log loaded merger sites on rebuild
2017-04-01 22:32:06 +02:00
Eduardo Elias
2a131f7978
Review Brazilian Portuguese Translation
2017-03-12 16:22:54 +00:00
brunogarciacv
ad826dd846
Brazilian Portuguese Translation
2017-03-11 03:56:45 -03:00
brunogarciacv
fd8742ae3a
Brazilian Portuguese translation
2017-03-11 03:43:39 -03:00
ZeroNet
0e2f742b7e
Merge pull request #842 from mishfit/refactorListAndWalk
...
Rename SiteStorage.list to SiteStorage.walk
2017-03-04 12:39:06 +01:00
shortcutme
e80887d779
Add reputation for old peers
2017-02-27 00:06:13 +01:00
shortcutme
75100c335f
Small cosmetical changes on stats page
2017-02-27 00:00:27 +01:00
shortcutme
b31c928898
Only change cert on merged site if different
2017-02-26 23:59:54 +01:00
mishfit
656c818211
rename SiteStorage.list to SiteStorage.walk
...
also, add SiteStorage.list as non-recursive
directory listing (`os.listdir`)
2017-02-24 21:58:46 -07:00
shortcutme
819f765bce
Rev1940, Fix utf8 archive names on Safari
2017-02-24 14:23:44 +01:00
shortcutme
117d577e82
Disable bz2 support due Win/Android incompatibility issues
2017-02-24 01:16:11 +01:00
MuxZeroNet
048207f70b
Update StemPortPlugin.py
2017-02-23 23:39:05 +00:00
MuxZeroNet
ad900479f6
Important Update - Don't override createSocket
2017-02-23 23:08:56 +00:00
MuxZeroNet
2e4767926c
Update StemPortPlugin.py - check config.tor
2017-02-23 22:47:32 +00:00
shortcutme
8a15bf059d
Support utf8 filenames in zip
2017-02-22 11:29:35 +01:00
shortcutme
b9a5c94923
Newsfeed plugin support date_added in ms
2017-02-22 11:29:35 +01:00
shortcutme
c08b83c299
Newsfeed plugin skip broken feed formats
2017-02-22 11:29:35 +01:00
beigexperience
71ac8ff996
Make the cmd launcher "silent" and not stick around(fix for win10)
2017-02-21 22:14:45 +02:00
MuxZeroNet
92b9397ee2
Update StemPortPlugin.py - Patch conservatively
2017-02-21 01:45:19 +00:00
shortcutme
1897bce814
Send virtual file path done event to remove the loading screen
2017-02-19 12:23:21 +01:00
shortcutme
04492a3262
Let the gc close the file
2017-02-19 12:22:04 +01:00
shortcutme
f857330f47
Remove unnecessary imports, formatting
2017-02-19 12:21:55 +01:00
shortcutme
2854e202e1
Plugin for tar.gz, tar.bz2 and zipped files
2017-02-19 00:53:16 +01:00
MuxZeroNet
ccf2897a65
Update StemPortPlugin.py
2017-02-17 22:25:44 +00:00
MuxZeroNet
8ba684e8c3
Create StemPortPlugin.py
2017-02-17 01:26:11 +00:00
MuxZeroNet
ce4a91b679
Create __init__.py
2017-02-17 01:23:05 +00:00
shortcutme
3d55af2111
Rename feed_following to feed_follow_num
2017-02-14 19:04:25 +01:00
shortcutme
179ee2d2a4
Rev1899, Add followed feed number to site info
2017-02-14 19:03:17 +01:00
shortcutme
9381015d80
Log mute actions
2017-02-13 16:27:42 +01:00
shortcutme
3ff2ec9104
Better calculation of deletable optional files
2017-02-13 16:25:12 +01:00
shortcutme
276b65f0b9
Rev1893, In multiuser mode dont allow users to add or remove mute
2017-02-11 21:57:12 +01:00
shortcutme
ccd2a9f171
Run os.random only 1000 times
2017-02-11 18:26:37 +01:00
shortcutme
9e550849f6
Add version info to Benchmark results
2017-02-11 18:26:37 +01:00
shortcutme
a390c19a20
Sidebar functions restricted in Multiuser plugin
2017-02-11 18:26:37 +01:00
shortcutme
bb57120872
In multiuser mode allow unrestricted access for users defined in users.json
2017-02-11 18:26:37 +01:00
shortcutme
edfe760227
Better way to restrict command in multiuser mode
2017-02-11 18:26:37 +01:00
shortcutme
27d31b3a1e
Option to disable new site adding in multiuser mode
2017-02-11 18:26:37 +01:00
ZeroNet
0490fe9f18
Merge pull request #826 from Th3B3st/patch-4
...
Add/Update Italian translation
2017-02-10 16:52:10 +01:00
Th3B3st
90c90b3cc6
Add/Update Italian translation
2017-02-10 15:19:35 +01:00
Th3B3st
768ae23b09
Add/Update Italian translation
...
A little language correction.
2017-02-10 14:54:52 +01:00
cxgreat2014
2421e387b9
update translate
2017-02-10 09:19:40 +08:00
shortcutme
6b900ab0b1
Rev1884, Fix mute plugin startup error
2017-02-10 00:40:32 +01:00
Th3B3st
fda4aaf10d
Add/Update Italian translation for Tryicon plugin.
2017-02-09 15:21:10 +01:00
Th3B3st
0f0eed4317
Create it.json
2017-02-09 12:54:10 +01:00
cxgreat2014
fc3f102528
translate mute plugin for zh zh-tw
2017-02-09 14:12:36 +08:00
shortcutme
2cea157ecc
Mute plugin
2017-02-09 01:58:08 +01:00
shortcutme
4cb14243be
Fix stats plugin db benchmark
2017-02-09 01:57:59 +01:00
shortcutme
62c31e1fc3
Only set valid optional limit on startup
2017-02-09 01:57:44 +01:00
shortcutme
56efa02820
GetDbFiles return inner path
2017-02-09 01:57:12 +01:00
cxgreat2014
6ec1776f57
Fix BUG in #813 ( #816 )
2017-02-08 09:13:33 +01:00
lmath
4f1fc06984
Disallow change optional limit on public proxy ( #813 )
2017-02-06 18:04:00 +01:00
shortcutme
d411d4d398
Rev1862, Skip optional file delete on invalid limit
2017-02-06 09:57:51 +01:00
ZeroNet
c9fa29c562
Merge pull request #798 from l5h5t7/master
...
Update Chinese translation
2017-02-05 23:19:13 +01:00
MuxZeroNet
f4bb6d24e5
Fix typo in login.html
2017-02-05 06:53:11 +00:00
ysc3839
fcd0ec5996
Fix #807 .
2017-02-04 21:58:58 +08:00
shortcutme
39e3f22d0b
Support limit and day limit parameter in feedQuery
2017-01-29 19:02:26 +01:00
lmath
4559ee0d7f
Update Chinese translation
2017-01-28 06:27:45 +08:00
shortcutme
a0c3d7f8a6
Rev1833, Fix utf8 system paths
2017-01-22 21:22:53 +01:00
shortcutme
e92c861e1c
Skip invalid location on sidebar map
2017-01-21 22:58:44 +01:00
shortcutme
60d58a2d45
Ignore invalid content.json files on merger load
2017-01-16 13:39:59 +01:00
shortcutme
0a3a71f634
Rev1817, Fix windows crash on trayicon shutdown
2017-01-14 21:41:59 +01:00
shortcutme
60fc5fb4d3
Allow transaction errors
2017-01-11 13:14:02 +01:00
shortcutme
819f9fad2c
Sidebar total display fix
2016-12-30 18:53:24 +01:00
shortcutme
fdb12e8eaf
Formatting
2016-12-30 18:53:14 +01:00
shortcutme
61ca9d6374
Only rebuild db on permissionadd if required
2016-12-30 18:53:06 +01:00
shortcutme
dfb5a00c77
Skip invalid onions bootstrap
2016-12-30 18:52:23 +01:00
Derson5
9565335394
Polish translation ( #708 )
...
* Add files via upload
* Update and rename zeronet2.txt to pl.json
* Add files via upload
* Update and rename zeronet.txt to pl.json
2016-12-20 10:36:56 +01:00
shortcutme
e37daabb53
Rev1786, Fix sidebar on FF
2016-12-14 10:28:41 +01:00
ZeroNet
5cf96dbada
Merge pull request #700 from erqan/tr
...
updating tr...
2016-12-14 01:17:50 +01:00
shortcutme
bb99e5c4ac
Only start dragging on left mouse click
2016-12-14 00:44:06 +01:00
shortcutme
9e97f0d318
Always display content.json changer in sidebar to avoid dom merger bug
2016-12-14 00:43:46 +01:00
erqan
afffcd18dd
updating tr...
2016-12-13 13:54:03 +03:00
shortcutme
34e52153a2
Remove BOM and duplicate key
2016-12-12 17:01:59 +01:00
Thibaut Broggi
6198137283
Add french translation for plugins ( #699 )
...
Plugins translated: MergerSite, Trayicon, OptionalManager
2016-12-12 16:44:18 +01:00
Thibaut Broggi
3cd04d03c8
Add spanish translation
2016-12-12 12:22:52 +00:00
shortcutme
c2de26f557
Sidebar saving ignore unfinished files
2016-12-08 17:15:21 +01:00
lmath
61654edbf6
Add/Update Chinese translation ( #692 )
...
* Fix translation commented by ooser
* “Site Control" translation
* Add/Update Chinese (Simplified) translation
* Add/Update Chinese (Traditional) translation
* Correct "limit used" translation by P2P
2016-12-05 17:36:38 +01:00
shortcutme
350b417ccb
Rev1766, Hungarian translation of new files
2016-12-05 02:30:18 +01:00
ZeroNet
383d8a5f33
Merge pull request #691 from ysc3839/master
...
Translations for more plugins.
2016-12-05 02:02:08 +01:00
shortcutme
173a7fc409
Don't save is no peers found
2016-12-04 18:53:50 +01:00
ZeroNet
2a443a29c2
Merge pull request #690 from erqan/tr
...
fixing turkish translation..
2016-12-04 18:31:34 +01:00
ysc3839
d3f44e35ce
OptionalManager translation. (unfinished)
2016-12-03 21:04:32 +08:00
ysc3839
a41078e2d3
MergerSite translation. (unfinished)
2016-12-03 21:03:39 +08:00
ysc3839
83f379a4d1
Trayicon Chinese translation.
2016-12-03 20:42:23 +08:00
ysc3839
4e0fea1d8b
Use plugin_dir variable.
2016-12-03 20:20:26 +08:00
erqan
e5b5f5ba62
fixing turkish translation..
2016-12-03 13:18:40 +03:00
lmath
e919a9bd43
“Site Control" translation ( #679 )
...
* Fix translation commented by ooser
* “Site Control" translation
2016-11-27 10:51:16 +01:00
ZeroNet
e5ebf93bcb
Merge pull request #677 from iShift/patch-4
...
Site control fix
2016-11-27 10:50:54 +01:00
ZeroNet
a21ac77ae3
Merge pull request #678 from erqan/tr
...
adding tr..
2016-11-27 10:50:46 +01:00
frerepoulet
3b74733b3b
Missing sidebar translation (french)
2016-11-26 12:11:06 -05:00
erqan
c6aba41ed1
adding tr..
2016-11-26 15:08:53 +03:00
iShift
4f97444bd5
Site control fix
2016-11-26 14:22:19 +03:00
shortcutme
e2d73637f6
Missing sidebar translation
2016-11-25 17:12:27 +01:00
iShift
9b269dc594
Update ru.json
2016-11-25 11:39:54 +03:00
frerepoulet
df34abfcd9
Corrections to french translation
2016-11-24 15:50:48 -05:00
shortcutme
f083e26cf0
Rev1756, Sidebar button flud fix
2016-11-24 19:50:30 +01:00
iShift
53e7d502c5
Russian translation for sidebar
2016-11-24 13:42:21 +03:00
lmath
77208475b0
Fix translation commented by ooser ( #667 )
2016-11-23 15:51:49 +01:00
HostFat
be2e8ce34a
Italian language
2016-11-22 07:06:56 +01:00
frerepoulet
610938b120
Initial french translation
2016-11-21 17:36:50 -05:00