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,628 Commits 32 Branches 59 Tags 24 MiB
f4c02e9875
Commit Graph

251 Commits

Author SHA1 Message Date
James Booth
d0647e3582 Merge branch 'master' into plugins 2014-05-26 20:08:02 +01:00
James Booth
52f66fde10 Fixed tests to work with cmocka 0.4.1 2014-05-26 01:05:19 +01:00
James Booth
e1b53df036 Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
	configure.ac
	src/profanity.c
 2014-05-22 20:20:24 +01:00
James Booth
b3d49f2a3c Added backwards compatible g_list_free_full for glib < 2.28 2014-05-21 21:39:31 +01:00
James Booth
efda72d60c Merge branch 'master' into plugins 
Conflicts:
	src/command/command.c
 2014-05-20 00:12:00 +01:00
James Booth
7b4eaa1c23 Added config.h to mock_otr.c 2014-05-19 21:15:17 +01:00
James Booth
e10ea1be4e Fixed OTR dependency when library not present, changed version to 0.4.2 2014-05-19 20:41:19 +01:00
James Booth
d2dc6b8ad4 Merge branch 'master' into plugins 2014-05-11 19:49:59 +01:00
James Booth
9dda7036a9 Implemented per contact OTR policy setting 2014-05-11 19:32:07 +01:00
James Booth
69916c2cc5 Merge branch 'master' into plugins 
Conflicts:
	src/command/command.c
 2014-05-11 15:36:07 +01:00
James Booth
95ff13136b Added OTR policy account preference 2014-05-11 14:13:15 +01:00
James Booth
e263a9e150 Merge branch 'master' into plugins 2014-05-10 00:51:45 +01:00
James Booth
d2662a6f17 Refactored bookmarks to use option parser, allow bookmarking rooms with passwords 2014-05-10 00:50:43 +01:00
James Booth
0fa43596ba Merge branch 'master' into plugins 
Conflicts:
	configure.ac
	src/profanity.c
 2014-05-02 00:57:15 +01:00
James Booth
524b1f2383 Changed to use gnutls instead of openssl for sha1 hashing 2014-05-01 22:18:04 +01:00
James Booth
94cd4723be Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	configure.ac
	src/ui/titlebar.c
 2014-04-21 00:50:54 +01:00
James Booth
2c15aba92a Chat room windows now created only after successful join 2014-04-21 00:37:04 +01:00
James Booth
9a55d8ad19 Store password with room 2014-04-20 22:02:55 +01:00
James Booth
532e81a301 Merge branch 'master' into plugins 2014-04-15 00:28:59 +01:00
James Booth
40759eddbf Simplified parse_options to take first option as argument 2014-04-15 00:27:55 +01:00
James Booth
4425aba1f2 Simplified parse_options to take gchar** 2014-04-15 00:13:32 +01:00
James Booth
56a9ae6e53 Merge branch 'master' into plugins 2014-04-14 23:44:10 +01:00
James Booth
79088d0150 Clean up keys after using parse_options 2014-04-14 23:41:45 +01:00
James Booth
2419737006 Check for duplicate options in option parser 2014-04-14 23:01:57 +01:00
James Booth
8d77930ece Added parse_options 2014-04-14 22:48:18 +01:00
James Booth
3322401c76 Merge branch 'master' into plugins 2014-04-13 22:32:48 +01:00
James Booth
74c746f852 Fixed broken test, added log mock 2014-04-13 22:31:55 +01:00
James Booth
9a09c1d1a5 Merge branch 'master' into plugins 2014-04-13 22:21:13 +01:00
James Booth
c3418a2909 Added /log shared setting 
Issue #170
 2014-04-13 21:56:51 +01:00
James Booth
6387608c6f Merge branch 'master' into plugins 2014-04-13 03:13:06 +01:00
James Booth
71180f66d7 Added focus param to ui_room_join, not set for bookmark autojoin 
Issue #194
 2014-04-13 02:52:25 +01:00
James Booth
0a90047bf7 Merge branch 'master' into plugins 2014-04-12 15:38:16 +01:00
James Booth
2fafcf0013 Revert "Added ui_already_connected" 
This reverts commit e97ec56fce.
 2014-04-12 15:20:19 +01:00
James Booth
45feaefa71 Merge branch 'master' into plugins 
Conflicts:
	src/command/command.c
 2014-04-09 22:48:01 +01:00
James Booth
e97ec56fce Added ui_already_connected 2014-04-09 22:29:38 +01:00
James Booth
c3e3759256 Command argument parsers set result argument 2014-04-09 21:31:43 +01:00
James Booth
7403353da7 Merge branch 'master' into plugins 2014-04-02 22:53:35 +01:00
James Booth
a720ef2627 Removed strcpy calls 2014-04-02 21:01:20 +01:00
James Booth
5929d8450c Merge branch 'master' into plugins 
Conflicts:
	src/profanity.c
	src/server_events.c
 2014-04-02 00:01:43 +01:00
James Booth
b19b881b97 Added missing files, refactored ui_switch_win to check win exists 2014-04-01 23:54:26 +01:00
James Booth
7113b97952 Added test for valid window switch 2014-04-01 23:33:12 +01:00
James Booth
96e32fe178 Added cmd_win test 2014-04-01 23:14:53 +01:00
James Booth
404dde2810 Renamed refresh functions to update_virtual 2014-04-01 21:52:04 +01:00
James Booth
d97a7dc670 Merge branch 'master' into plugins 2014-03-16 18:12:56 +00:00
James Booth
22ab268618 Change 'passwd' option to 'password' for /join command 2014-03-16 18:12:16 +00:00
James Booth
38e1ff22fc Merge branch 'master' into plugins 2014-03-16 18:03:15 +00:00
James Booth
f4d52f3d40 Use expect_value == NULL for NULL parameters in tests 2014-03-16 18:02:18 +00:00
James Booth
11c04d9fcd Added /roster clearnick command 2014-03-16 17:53:41 +00:00
James Booth
bcafba2de6 Added /roster remove tests 2014-03-16 16:00:10 +00:00
James Booth
80f2a5c8bc Merge branch 'master' into plugins 2014-03-16 01:47:04 +00:00