aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code
5,791 Commits 31 Branches 59 Tags 24 MiB
c225d24b42
Commit Graph

78 Commits

Author SHA1 Message Date
James Booth
c225d24b42 Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
 2016-09-03 23:11:42 +01:00
James Booth
22e53c9fdc Add travis build script 2016-09-03 22:25:26 +01:00
James Booth
5b2390e20f Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
	Makefile.am
	configure-plugins
	configure.ac
	src/plugins/plugins.c
	src/plugins/plugins.h
	src/plugins/python_api.c
	src/plugins/python_plugins.c
 2016-03-11 00:15:26 +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
41fe8c22b1 Added C plugin code from plugins branch 2016-02-14 22:28:55 +00:00
James Booth
008c40d1c1 Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
 2015-10-13 00:50:26 +01: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
79d3aae50e Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
	configure.ac
	src/profanity.c
	src/xmpp/connection.c
 2015-09-24 22:37:18 +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
1087041dcf Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
	src/command/commands.c
	src/event/client_events.c
	src/event/server_events.c
	src/ui/core.c
	src/ui/titlebar.c
 2015-06-21 23:22:09 +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
05a9b8f698 Merge remote-tracking branch 'origin/master' into plugins 
Conflicts:
	.travis.yml
	Makefile.am
	src/event/client_events.c
 2015-06-05 23:09:58 +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
b64a5aca10 Merge branch 'master' into plugins 
Conflicts:
	src/event/client_events.c
 2015-05-04 01:10:20 +01:00
James Booth
7ba7e098fe Merge branch 'master' into pgp 
Conflicts:
	.travis.yml
 2015-04-12 00:04:37 +01:00
James Booth
d9d6f6fc09 Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
 2015-04-12 00:03:15 +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
ce28bfad37 Merge branch 'master' into plugins 2015-02-23 00:27:12 +00:00
James Booth
ba22baba90 Updated .travis.yml to use cmocka-1.0.0 2015-02-23 00:24:24 +00:00
James Booth
94dbb1dae2 Merge branch 'master' into plugins 2014-09-30 21:10:18 +01: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
1193e70432 Merge branch 'master' into plugins 2014-09-17 23:43:17 +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
6a5552b128 Removed ruby debug from travis build 2014-06-04 19:40:10 +01:00
James Booth
9112b0003d Added libtool check in configure.ac 2014-06-03 23:50:47 +01:00
James Booth
16650b0dea Disable ruby plugins in travis build 2014-06-03 22:15:02 +01:00
James Booth
6a30e5a5e1 Added debug output to travis build 2014-06-01 23:24:09 +01:00
James Booth
71c4e1c890 Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
	configure.ac
 2014-06-01 22:48:47 +01:00
James Booth
575b6acdd2 Use public domain SHA1 code, remove libgcrypt dependency 2014-06-01 22:42:10 +01:00
James Booth
13fb67ddf5 Removed lua from travis build 2014-05-28 23:33:24 +01:00
James Booth
99bfd719bb Updated travis build to force all plugin langs 2014-05-28 23:15:29 +01:00
James Booth
ef6734beed Change liblua-dev version in travis build 2014-05-27 00:06:08 +01:00