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,001 Commits 32 Branches 59 Tags 24 MiB
360956cca0
Commit Graph

138 Commits

Author SHA1 Message Date
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
264fc55aa2 Added conditionals to makefile for otr support 2014-01-12 02:15:16 +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
4cc4461c0f Removed handle error message function from ProfWin 2014-01-08 20:27:18 +00:00
James Booth
f1596e2957 Added --enable-c-plugins to configure.ac 2014-01-07 23:58:47 +00:00
James Booth
1a85e6cf24 Merge branch 'master' into plugins 
Conflicts:
	src/profanity.c
	src/profanity.h
	src/xmpp/connection.c
 2014-01-06 00:08:06 +00:00
James Booth
0776c574b6 Merge branch 'master' into otr 2014-01-05 23:58:10 +00:00
James Booth
87cdbe015a Added server_events.c 2014-01-05 20:52:45 +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
d15751649c Added tests for contact type 2014-01-05 00:35:48 +00:00
James Booth
c10c9286d1 Merge branch 'master' into plugins 
Conflicts:
	src/ui/notifier.c
	src/ui/ui.h
	src/xmpp/roster.c
 2014-01-02 02:19:06 +00:00
James Booth
170af88c0d Merge branch 'master' into otr 
Conflicts:
	Makefile.am
 2014-01-02 01:57:05 +00:00
James Booth
976f3e303a Added /sub command test 2013-12-27 17:25:30 +00:00
James Booth
8685e78c86 Added mock_accounts and fixed tests 2013-12-26 13:37:22 +00:00
James Booth
d56f6dc39b Added mocks and stubs for cons_show 2013-12-19 21:05:39 +00:00
James Booth
b27c5d0f5b Replaced old mock_xmpp 2013-12-18 23:06:43 +00:00
James Booth
00a475cf55 Added common mock functions and fixed tests 2013-12-18 22:49:43 +00:00
James Booth
ed079236aa Merge branch 'master' into plugins 
Conflicts:
	src/command/commands.c
 2013-12-18 00:41:57 +00:00
James Booth
95d08db292 Merge branch 'master' into otr 
Conflicts:
	src/command/commands.c
 2013-12-16 01:11:36 +00:00
James Booth
683da12c3a Added cmd_account test 2013-12-15 22:28:22 +00:00
James Booth
7842b0d1fc Added mock log module 2013-12-15 19:56:48 +00:00
James Booth
bf347ab9e0 Added cmd_connect tests 2013-12-15 18:08:26 +00:00
James Booth
2470f642c7 Merge branch 'master' into otr 
Conflicts:
	src/command/command.c
 2013-12-15 17:19:01 +00:00
James Booth
5891ee0cc2 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	configure.ac
	src/command/command.c
	src/ui/console.c
	src/ui/core.c
	src/ui/muc_window.c
 2013-12-15 17:14:00 +00:00
James Booth
2490f5b417 Seperated command functions into module 2013-12-15 16:10:32 +00:00
James Booth
447d235868 Mocked account preferences and tested cmd_rooms 2013-12-14 18:43:19 +00:00
James Booth
7955bc52ab Removed commented setion from Makefile.am 2013-12-14 18:11:15 +00:00
James Booth
b9119b4306 Tidied Makefile.am 2013-12-14 18:06:09 +00:00
James Booth
0b3a9f5785 Added roster_list tests to cmocka 2013-12-14 17:03:39 +00:00
James Booth
4bb38ac011 Added parser tests to cmocka 2013-12-14 16:48:27 +00:00
James Booth
0730867326 Added history and jid tests to cmocka 2013-12-14 16:35:56 +00:00
James Booth
3a403046ff Moved autocomplete tests to cmocka 2013-12-14 16:16:46 +00:00
James Booth
7f7973f9a7 Moved common tests to cmocka 2013-12-14 16:07:57 +00:00
James Booth
107fdd355e Added simple mock test, refactored roster 2013-12-14 15:34:17 +00:00
James Booth
bd1c139429 Added libotr 2013-11-08 00:17:02 +00:00
James Booth
fc8982e761 Added muc_window 2013-10-06 17:46:22 +01:00
James Booth
d38e2e73c2 Merge branch 'master' into plugins 2013-09-17 02:09:45 +01:00
James Booth
892a9953b4 Removed FORCE target from Makefile.am 2013-09-17 02:08:33 +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
a15dbdf7ff Force git revision update on make 2013-09-17 01:11:38 +01:00
James Booth
6b852a2f0f Include git revision with -v output 2013-09-17 01:08:12 +01:00
James Booth
d782b00711 Added git branch and revision to development builds 2013-09-17 00:59:37 +01:00
James Booth
5da3026546 Added basic empty lua api and hooks 2013-09-15 13:51:23 +01:00
James Booth
228f9b4293 Use AX_PYTHON_DEVEL and AX_RUBY_DEVEL 2013-09-14 02:38:40 +01:00
James Booth
77a2deeda2 Fixed indents in Makefile.am 2013-09-14 01:33:13 +01:00
James Booth
0f011439fa Allow compile without python plugin support 2013-09-14 01:28:35 +01:00
James Booth
81518d110a Fixed broken test build 2013-09-04 22:49:46 +01:00
James Booth
308e412ea3 Build libprofanity and link with c plugin 2013-09-01 03:26:17 +01:00