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,526 Commits 32 Branches 59 Tags 24 MiB
69916c2cc5
Commit Graph

156 Commits

Author SHA1 Message Date
James Booth
204d188e41 Merge branch 'master' into plugins 
Conflicts:
	configure.ac
 2014-05-11 01:37:02 +01:00
James Booth
acdda9a82c Changed version to 0.4.1dev for patch release 2014-05-11 01:35:45 +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
59e9083224 Fixed gnutls dependency for ubuntu 2014-05-01 22:29:06 +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
Dmitry Podgorny
aa6e2284fc config/theme: search for system-wide themes 
Search for system-wide themes (usually /usr/share/profanity/themes) if
not found in user's home directory.

Not tested yet.
 2014-04-09 21:42:14 +03:00
Dmitry Podgorny
3ceb9b0d1d autotools: install themes during 'make install' 
Default path for themes is ${pkgdatadir}/themes that usualy equals to
/usr/share/profanity/themes. This patch also introduces new option
--with-themes[=PATH] that specifies installation path. This option can
be used for cancel of installation at all: --without-themes.

References: issue #323
 2014-04-08 00:51:57 +03:00
James Booth
6909a0a721 Merge branch 'master' into plugins 
Conflicts:
	configure.ac
 2014-03-29 18:57:19 +00:00
James Booth
47632bd3ee Set version to 0.5.0 development 2014-03-29 18:55:35 +00:00
James Booth
45cf45b218 Set status to release 2014-03-29 17:12:12 +00:00
James Booth
2731ef9cd8 Merge branch 'master' into plugins 2014-03-09 00:13:41 +00:00
James Booth
72c35553fd Split ncurses and curl LIB additions 2014-03-09 00:04:39 +00:00
James Booth
7fa9ecc76d Uncomment ncurses check 2014-03-09 00:02:34 +00:00
James Booth
768df4d736 Ncurses include libs before wget_wch check 2014-03-08 23:57:50 +00:00
James Booth
2b3d645147 Added other osx build options 2014-03-08 23:38:30 +00:00
James Booth
2c976d3523 Commented ncurses wget_wch test 2014-03-08 22:32:54 +00:00
James Booth
b9f3799982 Merge branch 'master' into plugins 
Conflicts:
	configure.ac
 2014-03-06 21:43:17 +00:00
James Booth
d683c49b6c Revert "Set package status to brew for osx" 
This reverts commit 8ae6f52f10.
 2014-03-06 21:38:26 +00:00
James Booth
db39450734 Revert "Do not perform AC_FUNC_MALLOC on OSX" 
This reverts commit e7b6d068a0.
 2014-03-06 21:37:47 +00:00
James Booth
bc8a871ad9 Revert "Ncurses fixes for brew" 
This reverts commit ca0a1e4d9d.
 2014-03-06 21:37:46 +00:00
James Booth
1588106e91 Revert "More ncurses fixes for brew" 
This reverts commit 5817b07ee3.
 2014-03-06 21:37:40 +00:00
James Booth
5817b07ee3 More ncurses fixes for brew 2014-03-06 21:32:36 +00:00
James Booth
ca0a1e4d9d Ncurses fixes for brew 2014-03-06 21:21:54 +00:00
James Booth
e7b6d068a0 Do not perform AC_FUNC_MALLOC on OSX 2014-03-06 20:51:22 +00:00
James Booth
8ae6f52f10 Set package status to brew for osx 2014-03-06 20:48:44 +00:00
James Booth
c51cc954d8 Moved platform check in configure.ac 2014-03-06 20:45:35 +00:00
James Booth
1d476c35ff Merge branch 'master' into plugins 2014-03-06 20:08:10 +00:00
James Booth
917a0c7867 Merge remote-tracking branch 'origin/master' into plugins 
Conflicts:
	.gitignore
	.travis.yml
	Makefile.am
	src/main.c
	src/profanity.c
	src/ui/console.c
	src/ui/core.c
	src/xmpp/capabilities.c
	src/xmpp/iq.c
 2014-03-06 19:46:53 +00:00
James Booth
702600d300 Merge branch 'master' into opensuse 2014-03-05 00:15:20 +00:00
James Booth
d68c594150 Merge branch 'osx-notify' 2014-03-05 00:11:50 +00:00
James Booth
4d00f788e9 Fixed spelling mistake in configure.ac 2014-03-05 00:11:18 +00:00
James Booth
b5171cb054 Added configure checks to enable desktop notifications on OSX 2014-03-04 22:59:09 +00:00
James Booth
5b734156a5 Changes to get install-all.sh working on fresh opensuse VM 2014-02-25 22:50:25 +00:00
James Booth
903ad33f18 Fixed -ldl linking error 2014-02-12 21:54:20 +00:00
James Booth
ea2a98cf6e Merge branch 'master' into plugins 
Conflicts:
	configure.ac
 2014-02-12 21:18:59 +00:00
James Booth
4cb302abda Ignore deprecated warnings 
To enable native (non brew) compile on Max OS X
 2014-02-12 20:52:27 +00:00
James Booth
819e3f1a8b Merge branch 'master' into plugins 2014-02-11 23:52:08 +00:00
James Booth
fa89e2aa62 Check for libotr version 2014-02-09 00:32:11 +00:00
James Booth
50afe7366e Use AC_SEARCH_LIBS for otr 2014-02-08 23:29:42 +00:00
James Booth
7e4b1b1dea Added libotr back to configure by default 
Renamed to BUILD_OTR3
 2014-02-08 23:07:51 +00:00
James Booth
8ea8377534 Merge branch 'master' into plugins 2014-02-02 23:15:10 +00:00
James Booth
42300fdc18 Added AC_CHECK_LIB fallback for brew 2014-02-02 17:59:22 +00:00
James Booth
050d996c1c Merge branch 'master' into plugins 2014-01-28 22:44:52 +00:00
James Booth
96af960995 Disable OTR support by default until 4.0.0 is supported. 
enable with: ./configure --enable-otr
 2014-01-28 22:40:01 +00:00
James Booth
4a97ec9293 Merge branch 'master' into plugins 
Conflicts:
	Makefile.am
	src/command/command.c
	src/command/commands.c
	src/server_events.c
 2014-01-18 00:23:56 +00:00
James Booth
3f73cb7732 Fixed configure.ac for --disable-otr 2014-01-16 22:55:30 +00:00
James Booth
5ea9dd8043 Merge branch 'master' into plugins 
Conflicts:
	.gitignore
	Makefile.am
	configure.ac
	src/command/command.c
	src/command/commands.c
	src/profanity.c
	src/server_events.c
 2014-01-12 19:32:08 +00:00
James Booth
264fc55aa2 Added conditionals to makefile for otr support 2014-01-12 02:15:16 +00:00
James Booth
4e97c1e460 Merge branch 'master' into otr 2014-01-12 01:25:35 +00:00