1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Commit Graph

307 Commits

Author SHA1 Message Date
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
d96e68ea53 Save trusted certificates to tlscerts file with more information 2015-09-24 00:18:18 +01:00
James Booth
0c4f7f0311 Merge branch 'master' into plugins 2015-08-04 23:44:19 +01:00
James Booth
de747e3d46 Added software version request tests 2015-08-04 23:43:19 +01:00
James Booth
e5dec6abe8 Merge branch 'master' into plugins
Conflicts:
	src/command/commands.c
	src/command/commands.h
	src/ui/console.c
	tests/unittests/test_cmd_otr.c
	tests/unittests/test_cmd_pgp.c
2015-08-02 00:19:52 +01:00
James Booth
8119025120 Fixed tests for new command format 2015-07-27 00:04:48 +01:00
James Booth
194e2bf932 Merge branch 'master' into plugins 2015-07-22 22:53:25 +01:00
James Booth
f9a7e35001 Added id attributes to roster queries
fixes #596
2015-07-22 22:48:37 +01:00
James Booth
d618b3d2ed Merge branch 'master' into plugins 2015-07-20 23:28:58 +01:00
James Booth
c5a04de9fb Added libexpect check for functional tests 2015-07-20 23:28:23 +01:00
James Booth
d7a398b6f6 Merge branch 'master' into plugins 2015-07-20 22:35:32 +01:00
James Booth
d54cbf126a Added receipt request functional test 2015-07-20 22:21:29 +01:00
James Booth
82ab1e5121 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
2015-07-08 20:54:53 +01:00
James Booth
5e324e407f Added carbons command functional test 2015-07-05 17:29:33 +01:00
James Booth
252c7c2e06 Only run functional tests when libstabber available 2015-07-03 15:14:34 +01:00
James Booth
1b6368e671 Merge branch 'master' into plugins 2015-07-02 19:21:15 +01:00
James Booth
1329fe14ec Suppress all compile warning when building unit tests 2015-07-02 19:20:50 +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
85cc5ab50d Added cmd_pgp tests 2015-06-18 00:12:01 +01:00
James Booth
8fde14879a Merge branch 'master' into openpgp
Conflicts:
	src/command/commands.c
	src/command/commands.h
2015-06-17 00:40:06 +01:00
James Booth
5adf77d367 Merge branch 'master' into plugins
Conflicts:
	src/command/command.h
	src/command/commands.c
	src/command/commands.h
	src/ui/ui.h
2015-06-17 00:35:02 +01:00
James Booth
2215a3791f Added current window reference to command functions 2015-06-17 00:15:28 +01:00
James Booth
637b8bee9f Merge branch 'master' into openpgp 2015-06-15 23:17:11 +01:00
James Booth
768a0c4e23 Merge branch 'master' into plugins 2015-06-15 23:16:56 +01:00
James Booth
fb0e065902 Tidied cmd_otr, added check-unit target to Makefile 2015-06-15 23:16:22 +01:00
James Booth
db9d44bc28 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	src/config/preferences.c
	src/config/preferences.h
	src/config/theme.h
	src/ui/ui.h
	src/ui/window.h
	src/window_list.c
2015-06-15 21:00:49 +01:00
James Booth
c76692516a Merge branch 'master' into openpgp 2015-06-15 20:39:17 +01:00
James Booth
5cdd69f478 Moved UI interfaces to ui.h 2015-06-15 20:11:34 +01:00
James Booth
38ed9188d3 Moved ui/windows -> window_list 2015-06-15 19:26:28 +01:00
James Booth
329af44f75 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
2015-06-13 00:01:34 +01:00
James Booth
c2c2cee6c9 Moved stub_gpg.c 2015-06-12 23:58:44 +01:00
James Booth
efb07f8187 Merge branch 'master' into openpgp 2015-06-12 23:55:28 +01:00
James Booth
68ed20f10d Moved all tests to tests folder 2015-06-12 23:53:30 +01:00
James Booth
1cd23e0efc Moved gpg stub 2015-06-12 23:27:39 +01:00
James Booth
91767e6090 Merge branch 'master' into openpgp 2015-06-06 01:03:19 +01:00
James Booth
7ee71cd9f5 Merge branch 'master' into plugins 2015-06-06 01:03:02 +01:00
James Booth
c6ff761a95 Added chat session functional tests 2015-06-06 01:02:27 +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
373f47c711 Added simple message tests 2015-05-31 00:12:13 +01:00
James Booth
a522d0225d Added regex output matcher, presence test 2015-05-29 01:01:34 +01:00
James Booth
f17afcf5d4 Split functional tests 2015-05-28 20:02:16 +01:00
James Booth
e919445231 Renamed stabbertests -> functionaltests 2015-05-28 18:56:16 +01:00
James Booth
6d6bb64588 Moved tests -> unittests 2015-05-28 18:50:55 +01:00
James Booth
fabd0cf9e8 Expect header check 2015-05-26 23:47:36 +01:00
James Booth
e2fa67faff Use libexpect in stabber test 2015-05-26 23:22:05 +01:00
James Booth
06b18be851 Added custom resource checker 2015-05-25 02:18:31 +01:00
James Booth
e295a474dc Added more connect tests 2015-05-24 20:31:18 +01:00
James Booth
2c5b44421e Added initial stabber test 2015-05-17 22:05:43 +01:00
James Booth
97c5072f56 Added stabber testsuite 2015-05-17 01:11:03 +01:00