1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-29 19:56:07 -04:00
Commit Graph

355 Commits

Author SHA1 Message Date
James Booth
786ea6107d Merge branch 'master' into plugins 2016-05-31 23:29:07 +01:00
James Booth
383e601f25 Move /statuses options to /presence command 2016-05-31 23:21:19 +01:00
James Booth
23e271b57b Merge branch 'master' into plugins
Conflicts:
	src/plugins/callbacks.c
2016-05-23 22:42:32 +01:00
James Booth
fb34785566 Rename command sources 2016-05-22 23:59:52 +01:00
James Booth
eaf2901b01 Add cmd_autocomplete.c 2016-05-20 00:19:03 +01:00
James Booth
808902b903 Merge branch 'master' into plugins 2016-05-11 22:23:50 +01:00
James Booth
3bb1f12410 Add session.c 2016-05-05 23:51:49 +01:00
James Booth
f6fa63b374 Renamed connection.c -> session.c 2016-05-05 22:10:10 +01:00
James Booth
bebb259f08 Merge branch 'master' into plugins 2016-05-01 20:25:18 +01:00
James Booth
b8c94376aa Add /blocked command 2016-05-01 19:39:39 +01:00
James Booth
24616b7c4d Merge branch 'master' into plugins 2016-04-30 23:31:29 +01:00
James Booth
623fbe9e47 Plugins: Added prof_disco_add_feature() 2016-04-30 23:00:07 +01:00
James Booth
f5656138c6 Merge branch 'master' into plugins
Conflicts:
	configure.ac
2016-04-26 23:43:58 +01:00
Dominik Heidler
1b0ce852bb Implement XEP-0363: HTTP File Upload 2016-04-26 23:50:55 +02:00
James Booth
247276146c Merge branch 'master' into plugins
Conflicts:
	configure.ac
2016-04-11 00:30:19 +01:00
James Booth
697db019d5 Merge remote-tracking branch 'Dav1d23/master'
Conflicts:
	Makefile.am
	install-all.sh
2016-04-11 00:23:36 +01:00
James Booth
98a6df8d81 Merge branch 'master' into plugins
Conflicts:
	src/plugins/profapi.h
2016-03-26 02:21:16 +00:00
James Booth
a4e6d50a40 Added boolean settings for plugins 2016-03-25 22:06:24 +00:00
David
24c5d3882c fix tests 2016-03-13 17:37:40 +01:00
David
098d84ef73 Merge branch 'tray_icon' into HEAD
Let's thanks Aline <linuxine@gmail.com> for the icons.

Enjoy!
2016-03-12 17:37:46 +01:00
David
718a708b93 Use a folder to add icons
NOTE: it is not working in this release, I have to get how to retrieve
icons from folder.
2016-03-07 22:26:48 +01:00
David
dc0c3cc699 Introduce Tray Icon for Profanity
Add tray icon for profanity based on Gtk StatusIcon.
Different icon is displayed in case the user has unread messages.
2016-03-06 19:10:46 +01:00
James Booth
25c9b19562 Merge branch 'master' into plugins-python 2016-02-28 19:06:13 +00:00
James Booth
ef804eda21 Merge branch 'master' into plugins 2016-02-28 19:05:54 +00:00
James Booth
accde2a61c Fixed cygwin compile 2016-02-28 19:05:26 +00:00
James Booth
0fc0b3eeec Added python plugins code 2016-02-24 00:31:55 +00:00
James Booth
41d88b0581 Merge branch 'master' into plugins
Conflicts:
	.travis.yml
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/command.h
	src/config/preferences.c
	src/config/preferences.h
	src/event/client_events.c
	src/plugins/api.c
	src/plugins/api.h
	src/plugins/c_api.c
	src/plugins/c_plugins.c
	src/plugins/callbacks.c
	src/plugins/callbacks.h
	src/plugins/plugins.c
	src/plugins/plugins.h
	src/plugins/profapi.c
	src/plugins/profapi.h
2016-02-24 00:07:18 +00:00
James Booth
ac91e7ef85 Added theme support to plugins 2016-02-21 23:58:13 +00:00
James Booth
41fe8c22b1 Added C plugin code from plugins branch 2016-02-14 22:28:55 +00:00
James Booth
ba57b270db Merge branch 'master' into plugins
Conflicts:
	src/event/client_events.c
2016-01-05 01:32:16 +00:00
James Booth
e1e0fda8b3 Call UI disconnect functions before disconnecting with /disconnect
fixes #703
2016-01-05 01:30:32 +00:00
James Booth
05ea0e6f5a Merge branch 'master' into plugins
Conflicts:
	src/event/server_events.c
2015-12-20 02:49:15 +00:00
James Booth
87b4d7cbab Added muc functional tests 2015-12-20 02:13:01 +00:00
James Booth
19dfdb409d Merge branch 'master' into plugins
Conflicts:
	Makefile.am
2015-11-24 00:07:23 +00:00
James Booth
97d1b964c3 Created config/conflists.c for shared config list handling 2015-11-23 23:54:14 +00:00
James Booth
404af3c4b8 Merge branch 'master' into plugins 2015-11-05 23:36:00 +00:00
James Booth
f1daec663d Added privwin module 2015-11-05 23:20:19 +00:00
James Booth
cc33584880 Merge branch 'master' into plugins 2015-11-02 21:53:02 +00:00
James Booth
a761ea7176 Added mucconfwin module 2015-11-02 21:52:43 +00:00
James Booth
df6f2733ae Merge branch 'master' into plugins 2015-11-01 20:06:01 +00:00
James Booth
bb5150b062 Added mucwin module 2015-11-01 20:05:43 +00:00
James Booth
d046877b5f Merge branch 'master' into plugins 2015-11-01 19:45:52 +00:00
James Booth
db4bcd3e6d Added xmlwin module 2015-11-01 19:39:36 +00:00
James Booth
d2a30b1263 Merge branch 'master' into plugins
Conflicts:
	src/event/client_events.c
	src/ui/core.c
2015-10-28 00:06:13 +00:00
James Booth
0fd616167e Removed ui_events module 2015-10-27 20:49:06 +00:00
James Booth
c99ff8d941 Extracted chatwin.c 2015-10-26 22:35:30 +00:00
James Booth
df7e0cca00 Merge branch 'master' into plugins
Conflicts:
	Makefile.am
	src/profanity.c
2015-10-15 01:23:03 +01:00
James Booth
904a5a81cf Add ability to script commands after connect 2015-10-15 01:19:24 +01:00
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