James Booth
|
d2dc6b8ad4
|
Merge branch 'master' into plugins
|
2014-05-11 19:49:59 +01:00 |
|
James Booth
|
9dda7036a9
|
Implemented per contact OTR policy setting
|
2014-05-11 19:32:07 +01:00 |
|
James Booth
|
69916c2cc5
|
Merge branch 'master' into plugins
Conflicts:
src/command/command.c
|
2014-05-11 15:36:07 +01:00 |
|
James Booth
|
95ff13136b
|
Added OTR policy account preference
|
2014-05-11 14:13:15 +01:00 |
|
James Booth
|
5929d8450c
|
Merge branch 'master' into plugins
Conflicts:
src/profanity.c
src/server_events.c
|
2014-04-02 00:01:43 +01:00 |
|
James Booth
|
404dde2810
|
Renamed refresh functions to update_virtual
|
2014-04-01 21:52:04 +01: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
|
c00376087f
|
Test /otr start sends OTR query message to current recipient
|
2014-02-23 21:20:41 +00:00 |
|
James Booth
|
da058359ac
|
Added test for /otr start when no key loaded
|
2014-02-23 21:02:02 +00:00 |
|
James Booth
|
18e0884f5f
|
Fixed issue with /otr myfp when no key loaded
|
2014-02-23 20:34:27 +00:00 |
|
James Booth
|
d25245a286
|
Added test for /otr start when already in OTR session
|
2014-02-23 20:17:45 +00:00 |
|
James Booth
|
1f78d5b582
|
Added tests for /otr start from non chat windows
|
2014-02-23 20:09:00 +00:00 |
|
James Booth
|
f4f1167188
|
Merge branch 'master' into plugins
|
2014-02-17 23:10:36 +00:00 |
|
James Booth
|
037ca81821
|
Test /otr theirfp
|
2014-02-17 23:10:00 +00:00 |
|
James Booth
|
b4b463998b
|
Test for /otr theirfp in non OTR window
|
2014-02-17 22:57:36 +00:00 |
|
James Booth
|
a25714b6dc
|
Added test for /otr theirfp when in other non chat windows
|
2014-02-17 22:44:27 +00:00 |
|
James Booth
|
4afec6ab5e
|
Added test for /otr theirfp when in console
|
2014-02-17 22:14:33 +00:00 |
|
James Booth
|
82ad0cd306
|
Added /otr myfp test
|
2014-02-17 21:52:42 +00:00 |
|
James Booth
|
83e9bef487
|
Fixed config includes
|
2014-02-16 23:26:40 +00:00 |
|
James Booth
|
396991c191
|
Fixed merge
|
2014-02-16 23:15:51 +00:00 |
|
James Booth
|
6e58d95469
|
Added connection status tests for /otr myfp
|
2014-02-16 20:15:10 +00:00 |
|
James Booth
|
880d5c6263
|
Fixed previous tests
|
2014-02-16 20:10:48 +00:00 |
|
James Booth
|
d1d80fc26b
|
Added connection status tests for /otr gen
|
2014-02-16 20:09:12 +00:00 |
|
James Booth
|
4eac5c0d43
|
Test /otr gen
|
2014-02-16 19:35:40 +00:00 |
|
James Booth
|
e048b3196e
|
Added test for message when no connected /otr gen
|
2014-02-16 19:20:55 +00:00 |
|
James Booth
|
a21ab6d4c8
|
Mock otr module for cmd_otr tests
|
2014-02-16 19:14:15 +00:00 |
|
James Booth
|
e1fe7783c0
|
Added conditional include in cmd_otr tests
|
2014-02-16 17:48:51 +00:00 |
|
James Booth
|
60e03094c3
|
Added test for /otr libver
|
2014-02-16 14:44:40 +00:00 |
|
James Booth
|
7e956fb347
|
Added tests for /otr warn
|
2014-02-16 02:22:29 +00:00 |
|
James Booth
|
c6220e01a0
|
Added tests for /otr log
|
2014-02-16 01:32:37 +00:00 |
|
James Booth
|
6295336284
|
Added cmd_otr tests
|
2014-02-16 00:04:53 +00:00 |
|