1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Commit Graph

3224 Commits

Author SHA1 Message Date
James Booth
9bf5a68329 Moved default and alias command execution 2015-03-16 00:03:07 +00:00
James Booth
eeabbc9bb3 Fix for chat logging 2015-03-15 23:31:39 +00:00
James Booth
8944a3b5bb Move common chat logging code to log.c 2015-03-15 23:19:00 +00:00
James Booth
6f1119d225 Updated CHANGELOG 2015-03-15 20:28:09 +00:00
James Booth
fae2717f27 Tidied help 2015-03-15 20:04:53 +00:00
James Booth
2762f18a3e Added /receipts command 2015-03-15 19:48:19 +00:00
James Booth
b21edfaa51 Added receipt.sent theme setting 2015-03-15 19:35:25 +00:00
James Booth
48e06c5a68 Merge branch 'master' into xep-0184 2015-03-15 15:31:59 +00:00
James Booth
f0ffceefdd Added freebsd check for libnotify 2015-03-15 15:30:16 +00:00
James Booth
448c91af61 Fixed merge 2015-03-15 01:30:27 +00:00
James Booth
8c552e8a70 Merge branch 'master' into xep-0184 2015-03-15 01:27:09 +00:00
James Booth
49022068ef Added OTR error messages 2015-03-15 01:26:09 +00:00
James Booth
125719673b Return after message receipt 2015-03-14 23:25:20 +00:00
James Booth
ca30ff3910 Merge branch 'master' into xep-0184
Conflicts:
	src/server_events.c
	src/ui/core.c
	src/ui/ui.h
	tests/ui/stub_ui.c
2015-03-14 23:10:51 +00:00
James Booth
385336c10b Don't switch window on sent carbon 2015-03-14 22:59:49 +00:00
James Booth
a79ea3cbe2 Merge branch 'master' into xep-0184 2015-03-14 16:45:44 +00:00
James Booth
ede3368f7a Check for sent and received carbons 2015-03-14 16:44:21 +00:00
James Booth
060dcc24e3 Merge branch 'master' into xep-0184
Conflicts:
	src/xmpp/message.c
2015-03-14 16:41:40 +00:00
James Booth
2fc7937dcd Fixed error with /otr start with carbons enabled 2015-03-14 16:37:33 +00:00
James Booth
1014244408 Use colouring for message receipts 2015-03-14 16:05:13 +00:00
James Booth
bc6e32175d Removed from argument from outgoing message functions 2015-03-14 14:50:45 +00:00
James Booth
6fd5b617ef Renamed win_save_newline -> win_newline 2015-03-14 14:16:50 +00:00
James Booth
b84bddc46b Renamed win_save_println -> win_println 2015-03-14 14:14:46 +00:00
James Booth
e02dbe24da Renamed win_save_print -> win_print 2015-03-14 14:12:32 +00:00
James Booth
f4441ec64f Renamed win_save_vprint -> win_vprint 2015-03-14 14:10:10 +00:00
James Booth
57c7564445 Show message received text for receipts 2015-03-11 23:47:11 +00:00
James Booth
78becceedb Added basic delivery receipts 2015-03-11 23:18:28 +00:00
James Booth
e5bb12a0d6 Added /time statusbar preference 2015-03-10 23:35:08 +00:00
James Booth
0269129d17 Updated changelog 2015-03-10 21:24:38 +00:00
James Booth
2ff6873cf1 Send private carbons element with message when encrypted 2015-03-10 21:16:34 +00:00
James Booth
3c1e8c4e15 Added server error handling when setting /carbons preference 2015-03-09 23:07:51 +00:00
James Booth
2c19fad6d6 Added /carbons autocompletion 2015-03-09 21:53:29 +00:00
James Booth
88af6e3455 Added connection check before sending carbons enable/disable IQ 2015-03-09 21:52:09 +00:00
James Booth
945f29873e Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280 2015-03-08 21:51:50 +00:00
James Booth
232bf9b7fc Added libreadline-devel to install-all.sh for cygwin 2015-03-08 19:45:19 +00:00
James Booth
8d96888405 Added readline-devel to install-all.sh for opensuse 2015-03-08 19:32:03 +00:00
James Booth
84de10e7cd Added readline-devel to instal-all.sh for fedora 2015-03-08 19:21:35 +00:00
James Booth
e632f254d3 Added libreadline-dev to install-all.sh for ubuntu 2015-03-08 19:06:38 +00:00
James Booth
e361ea6922 Added conditional OSX check for readline 2015-03-08 18:47:01 +00:00
James Booth
13c1eb2744 Merge remote-tracking branch 'origin/readline' into readline 2015-03-08 18:13:25 +00:00
James Booth
2e493112bb Merge branch 'master' into readline 2015-03-08 18:12:50 +00:00
James Booth
fe6a54f253 Merge branch 'master' into readline 2015-03-04 23:43:48 +00:00
James Booth
7638f379ca Fixed tests for --disable-otr 2015-03-04 23:32:47 +00:00
James Booth
303f415306 Merge branch 'master' into readline 2015-03-04 22:38:32 +00:00
James Booth
5e1ad0b0d2 Added profanity.sh (OSX helper script for codelite) to .gitignore 2015-03-04 22:37:42 +00:00
James Booth
b01b5d7077 Merge remote-tracking branch 'origin/master' into readline 2015-03-04 18:46:11 +00:00
James Booth
0dee898c01 Set version to 0.4.7 development 2015-03-04 00:45:42 +00:00
James Booth
f80689dd35 Set version to 0.4.6 2015-03-03 22:22:28 +00:00
James Booth
1a493823d4 Merge branch 'master' into readline 2015-03-03 22:12:32 +00:00
James Booth
6be4b400b8 Fixed swapping windows when in source win 2015-03-03 22:10:01 +00:00