1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

2589 Commits

Author SHA1 Message Date
James Booth
d0647e3582 Merge branch 'master' into plugins 2014-05-26 20:08:02 +01:00
James Booth
355cd27f6c Added character codes for alt-left, alt-right 2014-05-26 19:53:44 +01:00
James Booth
52f66fde10 Fixed tests to work with cmocka 0.4.1 2014-05-26 01:05:19 +01:00
James Booth
75c762bbfa Fixed merge issue 2014-05-24 22:46:14 +01:00
James Booth
87aa4e9678 Merge branch 'master' into plugins
Conflicts:
	src/ui/notifier.c
2014-05-24 22:36:19 +01:00
James Booth
60b59d984a Escape strings passed to terminal-notifier 2014-05-24 22:31:42 +01:00
James Booth
b36fbe413a Added settings to show message text in notifications 2014-05-24 22:14:26 +01:00
James Booth
b25b3f3180 Added notification setting for typing in current window 2014-05-24 21:13:33 +01:00
James Booth
eb0f0dd96b Added settings for message notifications in current window 2014-05-24 20:46:03 +01:00
James Booth
8e14946aad Ignore case for chat room mention notification 2014-05-24 16:59:45 +01:00
James Booth
866d87af79 Added /notify room mention setting 2014-05-24 16:46:05 +01:00
James Booth
7d90d218c0 Split regular and chat room notify settings 2014-05-24 15:54:10 +01:00
James Booth
9d942fd841 Merge branch 'master' into plugins 2014-05-23 23:32:32 +01:00
James Booth
663a22fb7e Changed input text to green boothj5 theme 2014-05-23 23:31:26 +01:00
James Booth
bd321bc3c4 Removed -module from libprofanity build
Removing this flag ensures a .dylib extension is used on OSX since
libprofanity is a shared library rather than a dynamically loadable module
2014-05-23 22:39:45 +01:00
James Booth
ab096db181 Merge branch 'master' into plugins 2014-05-23 00:56:50 +01:00
James Booth
b85fd5e78c Use account muc_nick when no nick for bookmark 2014-05-23 00:55:30 +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
ff37b44a62 Added common.h to parser.c 2014-05-22 20:07:43 +01:00
James Booth
40299882e8 Fixed define for g_hash_table_contains (glib < 2.32) 2014-05-22 20:03:47 +01:00
James Booth
6dbcc03543 Added g_hash_table_contains for glib < 2.32 2014-05-22 20:02:19 +01:00
James Booth
ce8f574444 Check for key on p_hash_table_add 2014-05-22 19:47:50 +01:00
James Booth
b1da6d1bc4 Added glib g_hash_table_add for glib < 2.32 2014-05-22 19:39:48 +01:00
James Booth
86c3dcc2e1 Fixed fedora libgcrypt arch 2014-05-21 23:20:01 +01:00
James Booth
d74f551805 Removed gnutls from cygwin dependencies in install-all.sh 2014-05-21 22:11:33 +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
e1f4465dc7 Added libgcypt dependencies to install-all for fedora, debian and opensuse 2014-05-21 21:22:18 +01:00
James Booth
cc20e91303 Added libgcrypt dependencies to travis build 2014-05-21 21:03:07 +01:00
James Booth
3c5a73d29e Use libgcrypt instead of libgnutls for SHA1 hashing 2014-05-21 20:35:01 +01:00
James Booth
4995c8fa43 Merge remote-tracking branch 'origin/plugins' into plugins 2014-05-20 20:42:37 +01:00
James Booth
96c6e6a184 Moved -export-dynamic to AM_LDFLAGS, for clang compatibility 2014-05-20 20:41:34 +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
1f88ca5032 Set version to 0.5.0 development 2014-05-19 21:48:18 +01:00
James Booth
6e23004196 Set status to release 2014-05-19 21:46:42 +01:00
James Booth
0166454794 Added config.h to files checking for OTR support 2014-05-19 21:25:21 +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
5419a50cfe Merge branch 'master' into plugins 2014-05-18 16:50:23 +01:00
James Booth
3fb5649ccc Set version to 0.5.0 development 2014-05-18 16:29:58 +01:00
James Booth
f5a1cb717d Set status to 0.4.1 release 2014-05-18 16:28:37 +01:00
James Booth
aa7eeabe12 Merge pull request #350 from cara-bones/master
spelling corrections
2014-05-18 16:25:12 +01:00
James Booth
8551ce87ea Merge branch 'master' into plugins
Conflicts:
	configure.ac
2014-05-18 02:40:09 +01:00
cara marie
058ce13aec spelling corrections 2014-05-17 18:19:30 -07:00
James Booth
7adf345358 Set status to 0.5.0 dev 2014-05-18 02:11:39 +01:00
James Booth
e467e91302 Set status to release 2014-05-18 02:09:02 +01:00
James Booth
47d0014107 Updated spec file 2014-05-18 02:08:28 +01:00
James Booth
ccb96257b4 Merge branch 'master' into plugins 2014-05-18 00:43:55 +01:00
James Booth
10a8798973 Corrected bookmark help 2014-05-17 23:20:23 +01:00
James Booth
ccd68b6403 Merge branch 'master' into plugins 2014-05-17 23:04:20 +01:00
James Booth
cb614ec36f Free autocomplete hash table 2014-05-17 22:49:24 +01:00