aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-23 21:45:30 +00:00
Code
5,977 Commits 31 Branches 59 Tags 30 MiB
37efed3e4e
Commit Graph

281 Commits

Author SHA1 Message Date
James Booth
a6cc0ae322 Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
 2017-03-25 20:54:11 +00:00
James Booth
97edebadcb Update Glib dependency to 2.40 2017-03-25 02:07:27 +00:00
James Booth
0756e98854 Merge branch 'master' into plugins 2016-09-25 22:59:51 +01:00
James Booth
f683a704ad Update version to 0.6.0 development 2016-09-22 21:02:34 +01:00
James Booth
2a583c52d7 Merge branch 'master' into plugins 2016-09-19 23:44:17 +01:00
James Booth
751d9624c3 Set to development version 0.5.1 2016-09-16 00:03:23 +01:00
James Booth
6d274ba846 Release 0.5.0 2016-09-15 22:53:43 +01:00
Dmitry Podgorny
af53ca8f6c configure.ac: remove outdated xml parser info 2016-09-08 11:44:06 +03:00
James Booth
56c0c533e3 Disable C plugins on Cygwin 2016-09-08 00:36:11 +01:00
James Booth
6a8f78303f Merge branch 'master' into plugins 2016-09-05 23:31:14 +01:00
James Booth
c908f37a23 Fail configure when no pthread support 2016-09-05 22:00:16 +01:00
James Booth
9ba74c9c54 Merge branch 'master' into plugins 2016-07-24 02:54:04 +01:00
James Booth
27a842d1cf Include python plugins by default in build 2016-07-24 01:34:02 +01:00
James Booth
7d742f704f Fix prof module init for python3 2016-07-18 01:27:23 +01:00
James Booth
ace2715cf7 Added PYTHON3 define 2016-07-14 00:00:46 +01:00
James Booth
2fb8d62706 Merge branch 'master' into plugins 2016-05-22 22:58:33 +01:00
Dmytro Podgornyi
7d857fc30e Fix libcurl check in configure.ac for OS X 
OS X contains libcurl without a pkg-config file and ./configure
reports error. Add AC_CHECK_LIB in order to find libcurl properly.

Also remove manual adding -lncurses and -lcurl to LIBS, because
AC_CHECK_LIB does this job.
 2016-05-21 16:07:40 +03:00
James Booth
24616b7c4d Merge branch 'master' into plugins 2016-04-30 23:31:29 +01:00
James Booth
559b1608cf Only set CC to PTHREAD_CC when value present 2016-04-27 23:02:22 +01:00
James Booth
94f0550c51 Allow --disable-icons 2016-04-27 22:49:20 +01:00
James Booth
f5656138c6 Merge branch 'master' into plugins 
Conflicts:
	configure.ac
 2016-04-26 23:43:58 +01:00
James Booth
4ca6296fb7 Fix OSX compile 2016-04-26 23:50:56 +02:00
James Booth
9d263d7c83 Fixed cygwin compile 2016-04-26 23:50:55 +02:00
James Booth
261bbd3fc0 Removed only add -lgio-2.0 manually on OSX 2016-04-26 23:50:55 +02: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
c90a23799f Merge branch 'master' into plugins 2016-03-31 21:20:05 +01:00
James Booth
31369e2e55 Added comment for AX_PREFIX_CONFIG_H 2016-03-31 21:19:34 +01:00
James Booth
17175bb672 Merge branch 'master' into plugins 
Conflicts:
	src/plugins/plugins.c
 2016-03-31 21:16:19 +01:00
James Booth
9b177a9e01 Removed #AX_PREFIX_CONFIG_H 2016-03-31 21:05:02 +01:00
David
1e60d17d7c libgtk is now optional 
Having the lib is no more needed.
 2016-03-30 23:21:41 +02:00
James Booth
5cc149c811 Merge branch 'master' into plugins 2016-03-23 23:41:36 +00:00
Dmitry Podgorny
5278572fec autotools: Disable python-plugins by default 
Profanity doesn't build with Python-3.5. This patch temporary disables
python api unless user enable it explicitly.
 2016-03-24 00:36:07 +02: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
5b2390e20f Merge branch 'master' into plugins 
Conflicts:
	.travis.yml
	Makefile.am
	configure-plugins
	configure.ac
	src/plugins/plugins.c
	src/plugins/plugins.h
	src/plugins/python_api.c
	src/plugins/python_plugins.c
 2016-03-11 00:15:26 +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
2c7a4e4843 Added workaround for http://bugs.python.org/issue3588 2016-03-02 23:00:47 +00:00
James Booth
7cf8f47fa6 Moved python flags to LIBS in configure.ac 2016-02-28 21:14:10 +00:00
James Booth
0fc0b3eeec Added python plugins code 2016-02-24 00:31:55 +00:00
James Booth
41fe8c22b1 Added C plugin code from plugins branch 2016-02-14 22:28:55 +00:00
James Booth
e8ae73c71e Updated version to 0.5.0 dev 2015-12-02 00:27:29 +00:00
James Booth
c68985bae0 Merge branch 'master' into plugins 2015-10-12 23:38:04 +01:00
James Booth
6e28df66e8 Use libstrophe/libmesode uuid generator 2015-10-12 23:37:11 +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
2b88e2f1bf Check for libmesode, fall back to libstrophe 2015-09-21 21:40:04 +01:00
James Booth
14edbe1770 Set development version 2015-09-20 18:48:43 +01:00
James Booth
60acf6f05b Release 0.4.7 2015-09-20 16:46:29 +01:00
James Booth
d618b3d2ed Merge branch 'master' into plugins 2015-07-20 23:28:58 +01:00