1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

2416 Commits

Author SHA1 Message Date
James Booth
57a1182eb0 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
2014-02-25 20:34:54 +00:00
James Booth
a9980621dc Merge pull request #309 from mrshu/install-fix
Install fix
2014-02-25 20:12:44 +00:00
Kristofer M White
79d55a4668 Updating cmd description 2014-02-25 18:45:45 +00:00
mr.Shu
0d15c7108d fixed indent in Makefile.am 2014-02-25 16:51:24 +01:00
mr.Shu
611d544531 added error tracing 2014-02-25 16:47:45 +01:00
mr.Shu
ea681c7f52 cleaned whitespace 2014-02-25 16:36:19 +01:00
James Booth
56bbc7e664 Merge branch 'master' into plugins 2014-02-23 21:22:01 +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
793e9acfcb Attempt to fix lua build on travis 2014-02-23 15:10:39 +00:00
James Booth
2c385d9c13 Merge branch 'master' into plugins
Conflicts:
	.travis.yml
2014-02-23 04:41:28 +00:00
James Booth
5307b92821 Merge branch 'master' of github.com:boothj5/profanity 2014-02-23 04:40:12 +00:00
James Booth
04fee7f723 Removed redundant bootstrap call for travis build 2014-02-23 04:39:48 +00:00
James Booth
1a1daa525e Removed lua plugins from travis build 2014-02-23 04:37:17 +00:00
James Booth
e3d788ac95 Removed lua deps from travis build 2014-02-23 04:33:26 +00:00
James Booth
6b69ad578f Update README.md 2014-02-23 04:27:14 +00:00
James Booth
a66eacfb61 Removed first lua debug 2014-02-23 04:25:59 +00:00
James Booth
0315eabc1e Added lua debug to travis build 2014-02-23 04:23:52 +00:00
James Booth
6e3c18624b Added lua dependencies to travis build 2014-02-23 04:19:24 +00:00
James Booth
67ec44f6d7 Removed ruby from CI build 2014-02-23 04:11:58 +00:00
James Booth
7ec99f7288 Remove ruby from travis build 2014-02-23 04:03:32 +00:00
James Booth
452ea8a4bf Added debug to build 2014-02-23 04:00:23 +00:00
James Booth
83c1668cc8 Remove libruby1.9.1 from travis build 2014-02-23 03:54:06 +00:00
James Booth
584161fcb1 Removed ruby1.9.3 in travis build 2014-02-23 03:50:27 +00:00
James Booth
ce89a1a2b7 Remove ruby 1.9 from travis build 2014-02-23 03:44:51 +00:00
James Booth
5003668074 Added libruby to travis build 2014-02-23 03:40:03 +00:00
James Booth
9e57625609 Added autoconf-archive to travis build 2014-02-23 03:35:20 +00:00
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