138 Commits

Author SHA1 Message Date
empathetic-alligator
dd65f7faf2 Added note about make debug to README 2014-12-14 22:19:29 -05:00
empathetic-alligator
e2c5b569a9 Added travis build status icon to README 2014-12-14 21:51:51 -05:00
Andrey Petrov
9a00714632 Merge pull request #53 from empathetic-alligator/master
Added flag for pprof and debug make target.
2014-12-14 18:24:15 -08:00
empathetic-alligator
e94838dbe8 Should pass golint now 2014-12-14 21:11:20 -05:00
empathetic-alligator
165a517982 Merge branch 'master' of https://github.com/shazow/ssh-chat 2014-12-14 21:10:13 -05:00
Andrey Petrov
4844df6391 Add example header. 2014-12-14 17:47:55 -08:00
Andrey Petrov
2eb29e8376 Docker phrasing. 2014-12-14 17:46:05 -08:00
Andrey Petrov
ea52bf7b38 Remove TODO, move Dockerfile notes. 2014-12-14 17:45:33 -08:00
empathetic-alligator
3dac036edf Added flag for pprof and debug make target. 2014-12-14 20:37:20 -05:00
Andrey Petrov
c53d11e523 Merge pull request #52 from peterhellberg/master
Run golint via fgt before the tests.
2014-12-14 17:35:39 -08:00
Peter Hellberg
50f1dc811c Run golint via fgt before the tests 2014-12-15 02:32:13 +01:00
Andrey Petrov
b81324a5b4 Merge pull request #51 from peterhellberg/lint-fix
Fix all lint issues (mainly ALL_CAPS and comments)
2014-12-14 17:14:07 -08:00
Peter Hellberg
ca979b9e72 Changed BannedPk to BannedPK, removed bannedIP 2014-12-15 01:38:26 +01:00
Peter Hellberg
86ee6f12c5 Removed type from declaration
(it will be inferred from the right-hand side)
2014-12-15 01:37:58 +01:00
Peter Hellberg
9c20251e9d Merge remote-tracking branch 'upstream/master' into lint-fix
Conflicts:
	client.go
	colors.go
2014-12-15 01:30:38 +01:00
Andrey Petrov
f611516b16 Merge pull request #50 from empathetic-alligator/master
Fixed memory leak.
2014-12-14 16:24:52 -08:00
Peter Hellberg
ef2d54ebc8 Fix all lint issues (mainly ALL_CAPS and comments) 2014-12-15 01:12:19 +01:00
empathetic-alligator
49accaa785 Fixed memory leak.
c.Msg was never getting closed on client exit. This should fix issue #48
2014-12-14 18:49:44 -05:00
Andrey Petrov
a24aa73430 Merge pull request #41 from empathetic-alligator/master
Added /color command and fixed lock bug.
2014-12-14 15:28:46 -08:00
empathetic-alligator
95ccbe2922 Added /shutdown and /theme to help text. 2014-12-14 18:05:39 -05:00
empathetic-alligator
2f5dbc9391 Fixed formatting and made color default. 2014-12-14 17:39:08 -05:00
Andrey Petrov
df37ad9a1e Add chat.shazow.net fingerprint to readme. 2014-12-14 14:25:01 -08:00
Andrey Petrov
56bdce68b9 Merge pull request #45 from pborreli/patch-1
Fixed typo
2014-12-14 14:00:03 -08:00
empathetic-alligator
6bf5348b4e Resolved merge conflict. 2014-12-14 12:44:16 -05:00
Pascal Borreli
84b0b5ab16 Fixed typo 2014-12-14 18:25:12 +01:00
empathetic-alligator
d0ea3f2ca6 Added comments and /shutdown command. 2014-12-14 11:04:29 -05:00
empathetic-alligator
0fd74cb163 Changed /color to /theme and made mono theme default. 2014-12-14 04:39:20 -05:00
Andrey Petrov
f79ada5d63 Merge pull request #39 from jazzychad/whitelist_cmd
adds /whitelist command for ops
2014-12-14 01:17:35 -08:00
Andrey Petrov
3e3f965e62 Merge pull request #34 from jazzychad/motd_file
add ability to load motd from file - closes #25
2014-12-14 00:52:55 -08:00
empathetic-alligator
c88c30391d Added /colors command to toggle coloring. 2014-12-14 03:11:59 -05:00
empathetic-alligator
21bf1ad147 Updated locks to work with next embedded mutex. 2014-12-14 02:44:39 -05:00
Chad Etzel
271c0aa082 adds /whitelist command for ops 2014-12-13 22:56:08 -08:00
Chad Etzel
b5636dba9d add ability to load motd from file - closes #25 2014-12-13 22:42:43 -08:00
Andrey Petrov
e3e46f9b8c Merge pull request #33 from voldyman/master
Embedded lock in to server struct
2014-12-13 22:28:08 -08:00
Andrey Petrov
a960e1a41f Merge pull request #36 from jazzychad/clean_op_cmds
clean up duplicate commands in OP_HELP_TEXT
2014-12-13 22:26:43 -08:00
Andrey Petrov
3a655ba397 Merge pull request #32 from jazzychad/whitelist
add optional whitelisting of fingerprints for connecting
2014-12-13 22:24:50 -08:00
Chad Etzel
b909710b59 clean up duplicate commands in OP_HELP_TEXT 2014-12-13 21:00:43 -08:00
Chad Etzel
171f0da9aa add optional whitelisting of fingerprints for connecting 2014-12-13 20:48:15 -08:00
Akshay Shekher
79eb6b4388 Embedded lock in to server struct 2014-12-14 09:29:34 +05:30
Andrey Petrov
356e89c241 Merge pull request #26 from IQAndreas/minor-color-fixes
Minor color fixes
2014-12-13 15:55:39 -08:00
Andreas Renberg (IQAndreas)
928f9ca4ef Typo
When did that get there?
2014-12-13 17:50:12 -06:00
Andreas Renberg (IQAndreas)
0632204304 Use different formatting for private messages 2014-12-13 17:48:08 -06:00
Andrey Petrov
f25bbe9581 Merge pull request #18 from Kealper/master
Make highlights stand out, re-fix empty message check, make colors seed only get set once
2014-12-13 15:38:02 -08:00
Ken Piper
13043e9a60 Removed escaped messages 2014-12-13 18:36:41 -05:00
Ken Piper
8c690d0676 Merge https://github.com/shazow/ssh-chat 2014-12-13 18:35:06 -05:00
Andrey Petrov
23bb605eb6 Merge pull request #21 from jazzychad/motd
add MOTD output and command
2014-12-13 15:33:28 -08:00
Chad Etzel
0ece568c4f add MOTD output and command 2014-12-13 15:24:55 -08:00
Andrey Petrov
45484a3ca5 Merge pull request #16 from alvinlai/master
Upgrade to go 1.4, since travis.yml says so
2014-12-13 15:20:19 -08:00
Ken Piper
f57de43d73 Allow escaping for messages beginning with / 2014-12-13 18:08:40 -05:00
Ken Piper
3e9214a893 Merged 2014-12-13 17:44:00 -05:00