aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code
2,386 Commits 32 Branches 59 Tags 24 MiB
48922fb7a9
Commit Graph

2386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Booth
22e330c3f2 Merge branch 'master' into plugins 2014-02-23 03:32:53 +00:00
James Booth
e4120e144c Revert "Fail test for travis" 
This reverts commit 4c1634610c.
 2014-02-23 03:22:56 +00:00
James Booth
4c1634610c Fail test for travis 2014-02-23 03:20:12 +00:00
James Booth
c9a45d4d9d Added cmocka to travis build 2014-02-23 03:17:25 +00:00
James Booth
9489c4f0fa Added custom script to travis build 2014-02-23 03:08:02 +00:00
James Booth
d292cd014e Changed travis libotr dependency 2014-02-23 03:05:05 +00:00
James Booth
e5787b9504 Added dependencies to travis build 2014-02-23 03:03:29 +00:00
James Booth
24784d9ea6 Added bootstrap.sh to travis build 2014-02-23 02:56:14 +00:00
James Booth
9d707fe0a6 Added travis config 2014-02-23 02:53:18 +00:00
James Booth
b86164d70b Merge branch 'master' into plugins 2014-02-23 01:19:33 +00:00
James Booth
66424565dd Show OTR status on /msg usr when usr has already started an OTR session 
fixes #308
 2014-02-23 01:17:03 +00:00
James Booth
b529dffaaf Merge branch 'master' into plugins 2014-02-23 00:55:41 +00:00
James Booth
23281d6741 Merge branch 'master' into otr-query 2014-02-23 00:53:22 +00:00
James Booth
e9b6e277fa Merge branch 'master' into plugins 2014-02-23 00:49:19 +00:00
James Booth
118909b07f Removed debug on error messages 2014-02-23 00:48:10 +00:00
william
b2cb466227 Added opensuse support for the install. Now getting an error relating 
ncurses wget_wch after the libstrophe compile
 2014-02-21 10:33:58 +00:00
James Booth
09472e43c4 Added OTR supported versions in initial start query message 2014-02-18 22:31:27 +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
4a26c4dd0a Merge branch 'master' into plugins 2014-02-16 23:13:09 +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
6ef1174bf4 Refactor test setup and teardown functions 2014-02-16 18:07:41 +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
40ff1a1dee Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
 2014-02-16 02:24:14 +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
James Booth
0a49fc32c7 Fixed /tiny OTR messages 2014-02-15 21:53:38 +00:00
James Booth
34e4c1c3b2 Merge branch 'master' into plugins 2014-02-15 21:25:47 +00:00
James Booth
f010dfb004 Show message on /alias list when no aliases 2014-02-15 21:25:13 +00:00
James Booth
b981f92c92 Merge branch 'master' into plugins 2014-02-15 21:18:27 +00:00
James Booth
17d3751306 Fixed /alias add, when alias already exists 2014-02-15 21:17:31 +00:00
James Booth
b1290ebe1a Merge branch 'master' into plugins 2014-02-15 19:49:08 +00:00
James Booth
bdfcc81b07 Only show error message when err != 0 
fixes #307
 2014-02-15 19:47:36 +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
9ff7a2a1fe Removed free message function from otrlibv3 2014-02-13 23:09:52 +00:00
James Booth
450c01ecb4 Refactored common otr library code 2014-02-13 23:07:09 +00:00
James Booth
4e81707b27 Renamed otr implementations 2014-02-12 23:29:08 +00:00