Commit Graph

1522 Commits

Author SHA1 Message Date
Zack Scholl 628043b228 fix: do not use part of secret as room name 2021-04-16 08:13:43 -07:00
Zack Scholl 362a30e5e7 Merge branch 'master' of github.com:schollz/croc 2021-04-15 22:05:04 +00:00
Zack 828de41d6c
Merge pull request #361 from tdussa/BrokenSymlink
Transfer symlinks without touching their targets.
2021-04-15 15:01:49 -07:00
Tobias Dussa 876ce5764b Transfer symlinks without touching their targets. 2021-04-15 17:07:23 +02:00
Zack Scholl 59b287df7f Merge branch 'master' of github.com:schollz/croc 2021-04-13 22:40:03 +00:00
Zack 3fd125178f
Merge pull request #341 from MatejKafka/master
Added CROC_CONFIG_DIR env var to support custom config dir path
2021-04-13 15:38:38 -07:00
Zack 136faac448
Merge pull request #355 from stingalleman/patch-1
Remove dollar icons from commands without output
2021-04-13 15:37:22 -07:00
Zack 85a0bfb898
Merge pull request #359 from mizzunet/patch-1
Enhancements to bug_report.md
2021-04-13 15:36:39 -07:00
Missu 4718f3897c
Commented, added bug label
Commented lines need to be manually removed by the user, so no need to remove those anymore
Added "big" label for this, so easily discoverable from the Issues list
2021-04-08 11:42:19 +05:30
Sting Alleman 068d5c1031
Remove dollar icons from commands without output 2021-04-04 22:57:14 +02:00
Zack Scholl 4dfa1a9236 Merge branch 'master' of github.com:schollz/croc 2021-03-26 23:05:01 +00:00
Zack Scholl 6ba6ec9d32 bump 8.6.12 2021-03-26 16:03:51 -07:00
Zack Scholl c373b38b59 bump 8.6.12 2021-03-26 16:03:31 -07:00
Zack Scholl f2af5b7256 don't know why , but won't compile for freebsd/arm
⨯ release failed after 348.00s error=failed to build for freebsd_arm_7: # golang.org/x/net/ipv4
../../../../pkg/mod/golang.org/x/net@v0.0.0-20210326220855-61e056675ecf/ipv4/sys_freebsd.go:37:79: undefined: unix.MCAST_JOIN_GROUP
../../../../pkg/mod/golang.org/x/net@v0.0.0-20210326220855-61e056675ecf/ipv4/sys_freebsd.go:38:79: undefined: unix.MCAST_LEAVE_GROUP
../../../../pkg/mod/golang.org/x/net@v0.0.0-20210326220855-61e056675ecf/ipv4/sys_freebsd.go:39:79: undefined: unix.MCAST_JOIN_SOURCE_GROUP
../../../../pkg/mod/golang.org/x/net@v0.0.0-20210326220855-61e056675ecf/ipv4/sys_freebsd.go:40:79: undefined: unix.MCAST_LEAVE_SOURCE_GROUP
../../../../pkg/mod/golang.org/x/net@v0.0.0-20210326220855-61e056675ecf/ipv4/sys_freebsd.go:41:79: undefined: unix.MCAST_BLOCK_SOURCE
../../../../pkg/mod/golang.org/x/net@v0.0.0-20210326220855-61e056675ecf/ipv4/sys_freebsd.go:42:79: undefined: unix.MCAST_UNBLOCK_SOURCE
2021-03-26 16:02:39 -07:00
Zack Scholl 483f840401 Merge branch 'master' of github.com:schollz/croc 2021-03-26 22:45:03 +00:00
Zack Scholl ff12c33e7f bump 8.6.12 2021-03-26 15:41:45 -07:00
Zack Scholl e4cecf670b update deps 2021-03-26 15:41:13 -07:00
Zack Scholl 94e0e3ca67 Merge branch 'master' of github.com:schollz/croc 2021-03-26 22:40:03 +00:00
Zack Scholl a9d582cc6a lookup using standard dns 2021-03-26 15:39:33 -07:00
k3b ab9396937c
Added reference to croc android-version to README.md
See https://f-droid.org/en/packages/com.github.howeyc.crocgui/ for details
2021-03-25 12:32:17 +01:00
Matej Kafka c1e546ede6
Added CROC_CONFIG_DIR env var to support custom config dir path 2021-03-20 00:50:50 +01:00
Zack Scholl 63ba28c9b0 Merge branch 'master' of github.com:schollz/croc 2021-03-17 17:20:04 +00:00
Zack 6caf72df82
Merge pull request #340 from jfaltis/xdg-basedir-spec-compliance
Add compliance with XDG Base Directory Specification (XDG_CONFIG_HOME)
2021-03-17 10:17:52 -07:00
Jona 2273438373 add compliance with xdg base directory specification in regards to XDG_CONFIG_HOME 2021-03-17 17:45:07 +01:00
Zack Scholl 50a0d86e3d Merge branch 'master' of github.com:schollz/croc 2021-03-15 19:40:02 +00:00
Zack Scholl 50aa24d86d bump 8.6.11 2021-03-15 12:39:04 -07:00
Zack Scholl 674bff7a13 Merge branch 'master' of github.com:schollz/croc 2021-03-15 19:35:03 +00:00
Zack Scholl 757ed180fb update deps 2021-03-15 12:31:07 -07:00
Zack Scholl 76648a2926 Merge branch 'master' of github.com:schollz/croc 2021-03-15 19:05:04 +00:00
Zack Scholl 0b76edc362 update deps 2021-03-15 12:04:48 -07:00
Zack Scholl c39061c7fc Merge branch 'master' of github.com:schollz/croc 2021-03-15 18:55:03 +00:00
Zack Scholl fb2723d80b don't show description if only sending one file 2021-03-15 11:50:30 -07:00
Zack Scholl f84341a197 Merge branch 'master' of github.com:schollz/croc 2021-03-10 16:20:03 +00:00
Zack 6e9156d49c
Merge pull request #337 from alrs/alrs-fix-server-nil-salt-and-keys
src/tcp: fix dropped errors
2021-03-10 08:16:19 -08:00
Zack cd6d9a5aa0
Merge pull request #338 from alrs/alrs-fix-client-swallowed-errs
src/croc: fix dropped errors
2021-03-10 08:16:06 -08:00
Lars Lehtonen 3e5b876a32
src/croc: fix dropped errors 2021-03-09 16:55:42 -08:00
Lars Lehtonen a9487a332c
src/tcp: fix dropped errors 2021-03-09 16:48:38 -08:00
Zack Scholl de924f6a4f Merge branch 'master' of github.com:schollz/croc 2021-03-08 16:45:04 +00:00
Zack Scholl 03a27b6683 bump 8.6.10 2021-03-08 08:41:54 -08:00
Zack Scholl 0b719b9b77 update deps 2021-03-08 08:41:17 -08:00
Zack Scholl fc34d21cb8 thanks 2021-03-08 08:41:00 -08:00
Zack Scholl bb05d48fe9 Merge branch 'master' of github.com:schollz/croc 2021-03-08 16:40:02 +00:00
Zack 949480517f
Merge pull request #336 from hreese/master
Added support for SOCKS5 authentication (fixes #333)
2021-03-08 08:38:27 -08:00
Heiko Reese a20ebd7120 Added support for SOCKS5 authentication (fixes #333) 2021-03-06 11:55:16 +01:00
Zack Scholl d49bb8632b Merge branch 'master' of github.com:schollz/croc 2021-03-05 19:05:02 +00:00
Zack Scholl 10e57c3f97 bump 8.6.9 2021-03-05 11:02:51 -08:00
Zack Scholl be95662e35 update deps 2021-03-05 11:01:51 -08:00
Zack Scholl 105fb9a3ce Merge branch 'master' of github.com:schollz/croc 2021-03-05 17:05:02 +00:00
Zack Scholl 30783ce79c overwrite symlinks on transfer, like files, fixes #334 2021-03-05 09:00:15 -08:00
Zack Scholl a46f09ee1c Merge branch 'master' of github.com:schollz/croc 2021-02-23 20:15:02 +00:00