112 Commits

Author SHA1 Message Date
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
Pascal Borreli
84b0b5ab16 Fixed typo 2014-12-14 18:25:12 +01: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
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
Ken Piper
fb5c2152cb Make highlights stand out
Also re-fixed empty message check
No longer re-seeding the RNG on each call for colors
2014-12-13 17:42:43 -05:00
Andrey Petrov
7e8e72ce2b beep newline fix. 2014-12-13 14:16:55 -08:00
Andreas Renberg (IQAndreas)
0c7c53eee1 Use 'sysmsg' for private message system messages
That way it gets nice and pretty colors
2014-12-13 16:16:08 -06:00
Alvin Lai
798e361980 upgrade to go 1.4, since travis.yml says so 2014-12-13 14:15:50 -08:00
Andrey Petrov
cc01deb4bb OOops merge conflict. 2014-12-13 13:47:28 -08:00
Andrey Petrov
f2f5fa12cf Merge. 2014-12-13 13:43:12 -08:00
Andrey Petrov
832b455762 Merge pull request #15 from Kealper/master
Colors in /list, fancier tab completion, more /help fixes.
2014-12-13 13:40:59 -08:00
Ken Piper
72ab7fade2 More /help fixes 2014-12-13 16:37:59 -05:00
Ken Piper
45c40b35c7 Yay conflicts 2014-12-13 16:36:19 -05:00
Ken Piper
b058fb4e40 Colors in /list and fancier tab completion 2014-12-13 16:31:35 -05:00
Andrey Petrov
a8725277d7 missing reset. 2014-12-13 13:26:31 -08:00
Andrey Petrov
63bf2c3fce Merge pull request #13 from Sxw1212/master
Add .gitignore for easier local development
2014-12-13 13:21:47 -08:00
Andrey Petrov
35569887c0 Hopefully fix hanging? 2014-12-13 13:05:42 -08:00
Sam Mauldin
c28e5b38b1 Merge pull request #1 from shazow/master
Merge to latest
2014-12-13 14:37:58 -06:00
Andrey Petrov
820372a975 A kick in the pants. 2014-12-13 11:25:54 -08:00
Andrey Petrov
8b4f05b344 Beep command. 2014-12-13 11:22:43 -08:00
Sam Mauldin
11bbf1b30a Add .gitignore for easier local development 2014-12-13 13:18:58 -06:00
Andrey Petrov
460b81be2e Removing beeps for now. 2014-12-13 11:16:47 -08:00
Andrey Petrov
cd50bf5caa Less beeps! 2014-12-13 11:13:06 -08:00
Andrey Petrov
fa224c8935 Only go v1.4, to save travis some resources. 2014-12-13 11:01:11 -08:00
Andrey Petrov
eefd7bdb8d Merge pull request #12 from brendanashworth/travis-ci
Adds Travis-CI testing.
2014-12-13 10:59:51 -08:00
Brendan Ashworth
4227e0d8d4 Adds Travis-CI testing
This commit adds Travis-CI testing, which allows
free and easy continuous integration for pull requests
and new commits. It also adds a `make deps` target
in the Makefile for easily adding the dependencies.

It can be enabled here:
http://docs.travis-ci.com/user/getting-started/#Step-one%3A-Sign-in

Just follow instructions 1-2, three is already done. Thanks.
2014-12-13 10:53:14 -08:00
Andrey Petrov
9f005ad18d Merge remote-tracking branch 'origin/pr/6' 2014-12-13 10:52:18 -08:00
Andrey Petrov
2b0f12df70 Merge remote-tracking branch 'origin/pr/4' 2014-12-13 10:47:41 -08:00
Andrey Petrov
c5c6a6558f Merge branch 'help' 2014-12-13 10:45:11 -08:00
Andrey Petrov
90b7ad2995 Merge pull request #7 from aquilax/add-uptime-command
Added /uptime command support
2014-12-13 10:39:49 -08:00