1
1
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00

230 Commits

Author SHA1 Message Date
James Booth
d97a7dc670 Merge branch 'master' into plugins 2014-03-16 18:12:56 +00:00
James Booth
22ab268618 Change 'passwd' option to 'password' for /join command 2014-03-16 18:12:16 +00:00
James Booth
38e1ff22fc Merge branch 'master' into plugins 2014-03-16 18:03:15 +00:00
James Booth
89f306ceb2 Updated /roster help 2014-03-16 17:59:01 +00:00
James Booth
11c04d9fcd Added /roster clearnick command 2014-03-16 17:53:41 +00:00
James Booth
80f2a5c8bc Merge branch 'master' into plugins 2014-03-16 01:47:04 +00:00
James Booth
05952e8337 Small changes to help 2014-03-16 00:53:46 +00:00
James Booth
f7a7277e40 Merge branch 'master' into plugins 2014-03-15 22:28:21 +00:00
James Booth
2af418fd8d Command '/statuses muc' now allows 'all', 'online' and 'none' settings 2014-03-15 22:25:15 +00:00
James Booth
2c7f6c16aa Merge branch 'master' into plugins
Conflicts:
	src/main.c
	src/ui/console.c
2014-03-09 01:22:13 +00:00
James Booth
26726b207a Updated copyright 2014-03-09 01:18:19 +00:00
James Booth
917a0c7867 Merge remote-tracking branch 'origin/master' into plugins
Conflicts:
	.gitignore
	.travis.yml
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
2014-03-06 19:46:53 +00:00
James Booth
a9e2028981 Added autocompeleter for /join options 2014-03-05 20:57:59 +00:00
Kristofer M White
28425060bc Parsing optional args for cmd_join 2014-03-05 17:13:42 +00:00
Kristofer M White
79d55a4668 Updating cmd description 2014-02-25 18:45:45 +00:00
James Booth
f5dd30c4c6 Merge branch 'master' into plugins
Conflicts:
	src/command/command.c
	src/profanity.c
	src/server_events.c
2014-02-13 23:32:11 +00:00
James Booth
b30155a10e Moved otr sources into folder 2014-02-12 22:19:21 +00:00
James Booth
819e3f1a8b Merge branch 'master' into plugins 2014-02-11 23:52:08 +00:00
James Booth
25131e3f36 Added command to show libotr version 2014-02-11 23:19:09 +00:00
James Booth
24236862e6 Merge branch 'master' into plugins 2014-01-25 01:40:23 +00:00
James Booth
4bd06a5d87 Don't allow /alias to overwrite standard command 2014-01-25 01:39:12 +00:00
James Booth
96bd213823 Merge branch 'master' into plugins
Conflicts:
	src/command/command.h
2014-01-25 01:03:15 +00:00
James Booth
b05e17db3e Added autocomplete for /alias remove 2014-01-25 01:00:51 +00:00
James Booth
cb590dd82c Added help for /alias command 2014-01-25 00:50:07 +00:00
James Booth
6fb0ea91a5 Merge branch 'master' into plugins
Conflicts:
	src/config/preferences.c
	src/profanity.c
2014-01-24 00:16:25 +00:00
James Booth
5d85974bc0 Added aliases to autocomplete 2014-01-23 23:53:20 +00:00
James Booth
66631308a5 Implemented basic running of alias commands 2014-01-23 23:04:00 +00:00
James Booth
8dbe300d72 Added /alias command, writing aliases to [alias] group in profrc 2014-01-23 22:29:53 +00:00
James Booth
8ba2d26947 Added skeleton /alias command 2014-01-23 19:56:33 +00:00
James Booth
b6c52007ee Removed debug 2014-01-23 19:27:39 +00:00
James Booth
3f31c1a4e7 Encrypt /tiny command when in OTR session
fixes #292
2014-01-23 19:25:53 +00:00
James Booth
74898961d4 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	src/server_events.c
2014-01-21 00:36:47 +00:00
James Booth
7e9c8c02a3 Implemented autocomplete for new /statuses options 2014-01-21 00:28:56 +00:00
James Booth
9549cf431e Tidied /statuses help 2014-01-21 00:20:31 +00:00
James Booth
c7325de073 Added cmd_statuses validation tests 2014-01-19 01:25:04 +00:00
James Booth
692af0e9a0 Merge branch 'master' into plugins 2014-01-19 00:13:42 +00:00
James Booth
0edfef5612 Added /account set <account> port <port> 2014-01-19 00:05:04 +00:00
James Booth
47fe146a22 Added to and tidied /connect help 2014-01-18 23:49:15 +00:00
James Booth
b32ba75db5 Implemented autocomplete for /connect properties 2014-01-18 23:43:13 +00:00
James Booth
168cb0e557 Moved /connect autocomplete to function 2014-01-18 23:05:35 +00:00
James Booth
e7013408e5 WIP - Adding port to account options 2014-01-18 01:45:05 +00:00
James Booth
4a97ec9293 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	src/command/command.c
	src/command/commands.c
	src/server_events.c
2014-01-18 00:23:56 +00:00
James Booth
4f98bc8c25 Show OTR coloured status
Customisable within theme files e.g.:
titlebar.unencrypted=red
titlebar.encrypted=green
titlebar.trusted=red
titlebar.untrusted=green

Shows [unencrypted] for all non-OTR chat

Disable with '/otr warn off'
2014-01-16 22:44:23 +00:00
James Booth
ecf323de31 Implemented chat logging options for OTR messages
on - Log OTR messages as plaintext
off - Do not log OTR messages
redact - Log, but replace the text with '[redacted]'

Defaults to redact
2014-01-13 20:38:19 +00:00
James Booth
60820007ee Added setting /otr log on|off|redact 2014-01-13 20:17:45 +00:00
James Booth
671fa839e8 Added contact autocompletion to /otr start <contact> 2014-01-13 19:00:34 +00:00
James Booth
aa4dede30a Moved otr autocompletion to function 2014-01-13 18:56:04 +00:00
James Booth
360956cca0 Call plugins on /msg command 2014-01-12 21:42:18 +00:00
James Booth
5ea9dd8043 Merge branch 'master' into plugins
Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/commands.c
	src/profanity.c
	src/server_events.c
2014-01-12 19:32:08 +00:00
James Booth
462e84ea82 Added /otr trust|untrust commands 2014-01-12 01:20:22 +00:00