Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,859 Commits 29 Branches 153 Tags 32 MiB
Commit Graph

1859 Commits

Author SHA1 Message Date
Zack Scholl 0f5b52ff35 Better error handling 2017-10-21 14:34:59 -06:00
Zack Scholl 4aa255bf16 Merge branch 'master' of github.com:schollz/croc 2017-10-21 14:30:04 -06:00
Zack Scholl c42302d3de More errors 2017-10-21 14:29:48 -06:00
Zack 17d7b76f08 Update README.md 2017-10-21 14:06:00 -06:00
Zack f241334a3e Update README.md 2017-10-21 14:02:09 -06:00
Zack Scholl ebe14faf4c Better help message if server is down 2017-10-21 13:51:19 -06:00
Zack Scholl 0953ea55a5 Update README 2017-10-21 12:47:55 -06:00
Zack Scholl ed82893767 Bug fix: only send file name not file path 
Fixes #32
 2017-10-21 12:45:44 -06:00
Zack 3f34717a61 Merge pull request #30 from marcossegovia/master 
Break from for loop if time exceeds an hour
 2017-10-21 12:25:35 -06:00
Marcos 416e0f110a Break from for loop if time exceeds an hour 2017-10-21 18:02:26 +02:00
Zack 2638d1dd04 Update README.md 2017-10-21 08:25:31 -06:00
Zack Scholl 3b2f0d3fdd Update README 2017-10-21 08:15:06 -06:00
Zack Scholl 522f660f37 Added croc ASCII 2017-10-21 07:43:07 -06:00
Zack 550bd9a8e6 Only print if main thread 2017-10-20 19:51:02 -06:00
Zack d9e5695e71 Update README.md 2017-10-20 19:46:05 -06:00
Zack 00eecf0a2a Update README.md 2017-10-20 19:45:37 -06:00
Zack 4771d68a7d Update README.md 2017-10-20 19:38:10 -06:00
Zack 0109941f6c Thanks @Lunsford94 and @lummie! 2017-10-20 19:31:39 -06:00
Zack ede04d0773 Merge pull request #28 from schollz/encrypt-and-split 
Encrypt and split
 2017-10-20 19:12:03 -06:00
Zack Scholl a43e61b78a Split encrypted bits into chunks to send in parallel 2017-10-20 19:09:40 -06:00
Zack Scholl 5eff228a3d Add catfiles 2017-10-20 18:49:19 -06:00
Zack Scholl 746f1fe193 Add SplitFile func 2017-10-20 17:26:04 -06:00
Zack Scholl 7e6169dc03 Fix error 2017-10-20 16:46:01 -06:00
Zack Scholl da16d6f4d7 Merge branch 'master' of git://github.com/Lunsford94/croc into Lunsford94-master 2017-10-20 16:44:03 -06:00
Brad Lunsford 6bdbdce655 ran 'go fmt *.go' to (hopefully) get rid of commit issues 2017-10-20 15:18:06 -07:00
Zack Scholl 9fbaa4bab2 gofmt 2017-10-20 16:13:34 -06:00
Brad Lunsford 798a0d2c52 Adding sleep time of 1 second if not waiting and code not present 2017-10-20 15:11:29 -07:00
Bradley T Lunsford eb3af56ccf adding wait funtionality: if waiting, will send a different identification to the server 2017-10-20 14:51:30 -07:00
Zack 28ea514725 Merge pull request #26 from lummie/master 
Issue #25
 2017-10-20 15:38:24 -06:00
lummie 88726aeb42 Merge branch 'master' of https://github.com/lummie/croc 2017-10-20 22:05:06 +01:00
lummie 4fe0f3c9d3 Merge branch 'master' of https://github.com/schollz/croc 
# Conflicts:
#	connect.go
 2017-10-20 21:56:15 +01:00
lummie e2faa87b59 Issue #25 
fixed spelling connectionMap.receiver
Added method to detect if sender and receivers are already connected.
Added client code to correctly action "no" returned by the code being in use.
 2017-10-20 21:51:03 +01:00
Zack Scholl 7ad54dced3 Need to add concurrent reading from the file 
Perhaps using this: https://play.golang.org/p/kyusY5Dc0W
 2017-10-20 11:20:45 -06:00
Matt (lummie) 261926e907 Merge pull request #1 from schollz/master 
Update from upstream
 2017-10-20 18:01:24 +01:00
Zack Scholl 9e1d7b4460 Whoops, didn't mean to delete this #25 2017-10-20 10:04:57 -06:00
lummie 17a1f097c3 cleaned up "temp" file created in the test 2017-10-20 14:44:42 +01:00
lummie 42771e51f5 Added a git ignore 2017-10-20 14:44:19 +01:00
Zack Scholl 53ef8a21be Merge branch 'master' of github.com:schollz/croc 2017-10-20 06:33:15 -06:00
Zack Scholl 2492662b99 Update README 2017-10-20 06:33:06 -06:00
Zack Scholl d663ff861b Update dependencies 2017-10-20 06:29:52 -06:00
Zack Scholl c3cd3d6039 Streaming encryption and hashing and update UI 
Fixes #19
Fixes #18
 2017-10-20 06:25:48 -06:00
Zack 1c21c66f6f Update README.md 2017-10-20 05:25:47 -06:00
Zack 9cab363b7c Merge pull request #20 from schollz/add-code-of-conduct-1 
Create CODE_OF_CONDUCT.md
 2017-10-20 05:23:02 -06:00
Zack bf9021c925 Merge pull request #23 from techtide/master 
Quits program if a file already exists.
 2017-10-19 21:24:58 -06:00
Zack 83019f0e3d Merge pull request #24 from heymatthew/master 
Add rate option so sender can restrict outgoing speed
 2017-10-19 21:24:25 -06:00
Matthew B. Gray f1102c0062 Add rate option so sender can restrict outgoing speed 
closes #7
 2017-10-20 14:20:03 +13:00
Zack Scholl a6927a3143 Starting to implement streaming cipher 2017-10-19 19:08:13 -06:00
Zack Scholl 1727a156db Added Encrypt/Decrypt file 2017-10-19 19:01:07 -06:00
Arman Bhalla c5291cb6ad Quits program if a file already exists (issue 22). 2017-10-19 22:29:37 +01:00
Zack ecb7ea8a32 Create CODE_OF_CONDUCT.md 2017-10-19 11:44:22 -06:00