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

43 Commits

Author SHA1 Message Date
James Booth
2231bff424 Merge branch 'master' into osx-functional
Conflicts:
	.travis.yml
2016-03-10 23:58:06 +00:00
James Booth
06523f9474 Removed lua and ruby from .travis.yml 2016-03-10 23:50:19 +00:00
James Booth
0fc0b3eeec Added python plugins code 2016-02-24 00:31:55 +00:00
James Booth
8e15527079 Merge branch 'master' into osx-functional
Conflicts:
	.travis.yml
2016-02-24 00:10:37 +00:00
James Booth
41fe8c22b1 Added C plugin code from plugins branch 2016-02-14 22:28:55 +00:00
James Booth
e301bc5e93 Only run unit tests in osx-functional branch to avoid travis failures 2015-10-26 20:59:59 +00:00
James Booth
e7b4f0bd78 Doubled expect timeout for connect in tests, removed libuuid from travis build 2015-10-13 00:10:28 +01:00
James Booth
5c2e802bd7 Fixed travis build 2015-09-24 01:24:19 +01:00
James Booth
3d44541069 Fix travis build 2015-09-22 22:54:40 +01:00
James Booth
b24529171f Fix travis build 2015-09-21 21:48:14 +01:00
James Booth
2b88e2f1bf Check for libmesode, fall back to libstrophe 2015-09-21 21:40:04 +01:00
James Booth
0cf0b2c37e Disable travis build in osx-functional branch 2015-08-26 21:52:34 +01:00
James Booth
b52de6869a Merge branch 'master' into openpgp 2015-06-14 00:04:11 +01:00
James Booth
0623ed71dd Removed test output from travis build 2015-06-14 00:03:37 +01:00
James Booth
10a5f29023 Merge branch 'master' into openpgp 2015-06-14 00:02:00 +01:00
James Booth
eb676262f9 Travis build fix 2015-06-13 22:02:10 +01:00
James Booth
6e04ce8e13 Output test log in travis build 2015-06-13 21:37:18 +01:00
James Booth
9aff8abd2e Merge branch 'master' into openpgp
Conflicts:
	.travis.yml
2015-06-05 23:02:56 +01:00
James Booth
e372ff9c87 Added microhttpd dependency for stabber 2015-05-31 23:35:52 +01:00
James Booth
fabd0cf9e8 Expect header check 2015-05-26 23:47:36 +01:00
James Booth
8a1b079c24 Attempt to fix expect travis build 2015-05-26 23:32:56 +01:00
James Booth
0f115e5ed4 Updated travis build for libexpect 2015-05-26 23:24:07 +01:00
James Booth
641eadd02f Updated travis build, make stabber dependency 2015-05-17 22:35:17 +01:00
James Booth
7ba7e098fe Merge branch 'master' into pgp
Conflicts:
	.travis.yml
2015-04-12 00:04:37 +01:00
James Booth
a8669bb2bd Updated travis build to include uuid-dev dependency 2015-04-12 00:01:59 +01:00
James Booth
2490c3ed20 Added pgp key list command 2015-03-22 00:12:14 +00:00
James Booth
ba22baba90 Updated .travis.yml to use cmocka-1.0.0 2015-02-23 00:24:24 +00:00
James Booth
3dc14a8342 travis: added m4 dir for libstrophe 2014-09-30 21:06:09 +01:00
James Booth
38b58b7a61 Revert "Fix travis build by adding m4 dir"
This reverts commit 5d9a7ec36c.
2014-09-30 21:03:29 +01:00
James Booth
5d9a7ec36c Fix travis build by adding m4 dir 2014-09-30 20:57:32 +01:00
James Booth
2a555157c3 Added prefix to travis libstrophe configure 2014-09-17 00:56:21 +01:00
James Booth
6ee8f8e4b5 Revert "Added --prefix=/usr to libstrophe build in travis config"
This reverts commit 72a364b65c.
2014-09-07 14:06:14 +01:00
James Booth
72a364b65c Added --prefix=/usr to libstrophe build in travis config 2014-09-06 23:07:40 +01:00
James Booth
575b6acdd2 Use public domain SHA1 code, remove libgcrypt dependency 2014-06-01 22:42:10 +01:00
James Booth
52f66fde10 Fixed tests to work with cmocka 0.4.1 2014-05-26 01:05:19 +01:00
James Booth
cc20e91303 Added libgcrypt dependencies to travis build 2014-05-21 21:03:07 +01:00
James Booth
04fee7f723 Removed redundant bootstrap call for travis build 2014-02-23 04:39:48 +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