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
24236862e6 Merge branch 'master' into plugins 2014-01-25 01:40:23 +00:00
James Booth
17f40b76ee Added valgrind.out.old to gitignore 2014-01-25 01:10:04 +00:00
James Booth
5ea9dd8043 Merge branch 'master' into plugins
Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/commands.c
	src/profanity.c
	src/server_events.c
2014-01-12 19:32:08 +00:00
James Booth
49deb932e6 Merge branch 'master' into otr 2014-01-08 20:50:00 +00:00
James Booth
bd79b97101 Merge branch 'master' into plugins
Conflicts:
	src/ui/core.c
2014-01-08 20:47:17 +00:00
James Booth
71356967ab Added clean.sh to gitignore 2014-01-08 19:54:28 +00:00
James Booth
f569845b40 Merge branch 'master' into otr
Conflicts:
	.gitignore
2014-01-05 01:20:42 +00:00
James Booth
fae89c47c2 Merge branch 'master' into plugins 2014-01-05 01:18:08 +00:00
James Booth
d95ceeb394 Updated .gitignore 2014-01-03 18:25:14 +00:00
James Booth
48a5ea26ca Merge branch 'otr' of github.com:boothj5/profanity into otr 2013-11-08 00:18:31 +00:00
James Booth
599bee2ce8 Create fingerprints file, callbacks, and message send 2013-11-08 00:17:27 +00:00
James Booth
922289d01f Merge branch 'master' into plugins
Conflicts:
	src/ui/console.c
2013-10-06 02:30:01 +01:00
James Booth
cd816b94c2 Merge branch 'master' into plugins
Conflicts:
	.gitignore
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
2013-09-17 02:06:43 +01:00
James Booth
cab2e3cfe4 Merge branch 'master' into otr
Conflicts:
	.gitignore
	Makefile.am
2013-09-17 01:34:57 +01:00
James Booth
90d5df9ef7 Added gitversion.c to gitignore 2013-09-17 01:12:43 +01:00
James Booth
b8621befc9 Pop Lua stack when hooks not found 2013-09-16 23:16:50 +01:00
James Booth
308e412ea3 Build libprofanity and link with c plugin 2013-09-01 03:26:17 +01:00
James Booth
a1a01b8cd4 Started adding ruby api 2013-08-18 16:20:52 +01:00
James Booth
73eb4baf27 Create fingerprints file, callbacks, and message send 2013-08-17 18:45:51 +01:00
James Booth
3db9fb75ee Added TODO and plugins/ to .gitignore 2013-08-06 20:24:14 +01:00
James Booth
4b416ba58e Experimenting with python integration for plugins 2013-07-21 23:31:09 +01:00
James Booth
9874470c8f Fixed input win printing of '%' char 2013-02-09 20:39:52 +00:00
James Booth
523e4be1b8 SHA1 now generated correctly when data form included in caps
fixes #149
2013-02-05 20:36:21 +00:00
James Booth
059f3e2478 Added error.txt to .gitignore 2013-02-03 18:29:25 +00:00
James Booth
376804be3a Added libxss-dev to ubuntu install, removed configure from .gitignore 2012-12-31 00:25:47 +00:00
James Booth
402a54772e Added configure script 2012-12-19 21:08:21 +00:00
James Booth
37f9142769 Added coredump to .gitignore 2012-09-12 23:18:25 +01:00
James Booth
0a42be57a3 Cleaning up memory allocated by ncurses pads 2012-07-31 23:01:15 +01:00
James Booth
fe12352b57 Fixed bug in tinyurl 2012-07-29 21:32:04 +01:00
James Booth
3134a7b68e Added subdir-objects option to configure.ac 2012-07-03 01:59:32 +01:00
James Booth
cf6da8a44c Added build-aux folder to configure.ac 2012-07-03 00:36:04 +01:00
James Booth
28f5cdf786 Added libnotify headers to configure.ac 2012-07-01 16:18:57 +01:00
James Booth
2655d9e8fa Moved config.h to source folder 2012-07-01 14:52:45 +01:00
James Booth
30ca6cac3d Added autobuild tools 2012-07-01 14:47:09 +01:00
James Booth
b6c5fef45e Started work on bash style history 2012-04-30 01:09:42 +01:00
James Booth
fe5554bb68 Removed old files from .gitignore 2012-04-23 23:11:54 +01:00
James Booth
a05a65febe Added head_unit tests 2012-03-02 01:51:40 +00:00
James Booth
400a099edd Change to use local libstrophe
Added roster for testing libstrophe changes
2012-02-25 20:51:05 +00:00
James Booth
4d190a9c43 Added app module 2012-02-07 00:08:59 +00:00
James Booth
ebdfd00296 Removed libstrophe examples 2012-02-03 01:35:20 +00:00
James Booth
3dd4817906 Simple bot, echos response with appended string 2012-02-03 01:27:45 +00:00
James Booth
9f5e8e7d1e Added libstrophe examples 2012-02-03 00:00:15 +00:00
James Booth
6f2b57168d Initial commit 2012-02-02 01:12:50 +00:00