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
4,676 Commits 32 Branches 59 Tags 24 MiB
aa9104644a
Commit Graph

267 Commits

Author SHA1 Message Date
James Booth
aa9104644a Merge branch 'master' into osx-functional 2016-04-27 00:41:15 +01:00
Dominik Heidler
1b0ce852bb Implement XEP-0363: HTTP File Upload 2016-04-26 23:50:55 +02:00
James Booth
88a1655bb1 Merge branch 'master' into osx-functional 2016-04-11 00:30:26 +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
71950f9c53 Merge branch 'master' into osx-functional 2016-03-26 02:20:42 +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
James Booth
2231bff424 Merge branch 'master' into osx-functional 
Conflicts:
	.travis.yml
 2016-03-10 23:58:06 +00: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
f6f972b185 Merge branch 'master' into osx-functional 2016-02-28 19:06:38 +00:00
James Booth
25c9b19562 Merge branch 'master' into plugins-python 2016-02-28 19:06:13 +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
8e15527079 Merge branch 'master' into osx-functional 
Conflicts:
	.travis.yml
 2016-02-24 00:10:37 +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
79674fd16c Merge branch 'master' into osx-functional 2016-01-05 01:35:07 +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
fabfeed6da Merge branch 'master' into osx-functional 2015-12-20 02:52:42 +00:00
James Booth
87b4d7cbab Added muc functional tests 2015-12-20 02:13:01 +00:00
James Booth
479eaa5280 Merge branch 'master' into osx-functional 2015-11-24 00:07:37 +00:00
James Booth
97d1b964c3 Created config/conflists.c for shared config list handling 2015-11-23 23:54:14 +00:00
James Booth
def3ab0bed Merge branch 'master' into osx-functional 2015-11-05 23:36:33 +00:00
James Booth
f1daec663d Added privwin module 2015-11-05 23:20:19 +00:00
James Booth
171e9fbc71 Merge branch 'master' into osx-functional 2015-11-02 21:53:07 +00:00
James Booth
a761ea7176 Added mucconfwin module 2015-11-02 21:52:43 +00:00
James Booth
f931d969ff Merge branch 'master' into osx-functional 2015-11-01 20:06:09 +00:00
James Booth
bb5150b062 Added mucwin module 2015-11-01 20:05:43 +00:00
James Booth
6667a37571 Merge branch 'master' into osx-functional 2015-11-01 19:46:04 +00:00
James Booth
db4bcd3e6d Added xmlwin module 2015-11-01 19:39:36 +00:00
James Booth
5963155b8a Merge branch 'master' into osx-functional 2015-10-27 23:47:46 +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
e60b4d1946 Merge branch 'master' into osx-functional 2015-10-15 01:23:14 +01:00
James Booth
904a5a81cf Add ability to script commands after connect 2015-10-15 01:19:24 +01:00
James Booth
966da3b45f Merge branch 'master' into osx-functional 2015-09-24 20:20:59 +01:00
James Booth
d96e68ea53 Save trusted certificates to tlscerts file with more information 2015-09-24 00:18:18 +01:00
James Booth
67a8ee2026 Merge branch 'master' into osx-functional 2015-08-04 23:43:46 +01:00
James Booth
de747e3d46 Added software version request tests 2015-08-04 23:43:19 +01:00
James Booth
cf48b124a6 Merge branch 'master' into osx-functional 2015-08-02 00:25:48 +01:00
James Booth
8119025120 Fixed tests for new command format 2015-07-27 00:04:48 +01:00
James Booth
b583290907 Merge branch 'master' into osx-functional 2015-07-22 22:55:39 +01:00
James Booth
f9a7e35001 Added id attributes to roster queries 
fixes #596
 2015-07-22 22:48:37 +01:00
James Booth
3c48f07e52 Merge branch 'master' into osx-functional 2015-07-20 23:28:51 +01:00
James Booth
c5a04de9fb Added libexpect check for functional tests 2015-07-20 23:28:23 +01:00
James Booth
b11fd81b0d Merge branch 'master' into osx-functional 
Conflicts:
	tests/functionaltests/functionaltests.c
 2015-07-20 22:36:34 +01:00
James Booth
d54cbf126a Added receipt request functional test 2015-07-20 22:21:29 +01:00
James Booth
0400a5237f WIP getting functional tests working on osx 2015-07-13 20:06:48 +01:00