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,220 Commits 32 Branches 59 Tags 24 MiB
a00095c8a9
Commit Graph

3096 Commits

Author SHA1 Message Date
James Booth
3e38d64397 Added HAVE_LIBMESODE check before setting cert path 2015-09-24 01:13:45 +01:00
James Booth
bd42185389 Added /tls revoke 2015-09-24 01:06:53 +01:00
James Booth
8d2c7f1ac0 Show trusted certificate fingerprint first 2015-09-24 00:44:48 +01:00
James Booth
6f8ad6b8e8 Added /tls trusted command 2015-09-24 00:43:41 +01:00
James Booth
d96e68ea53 Save trusted certificates to tlscerts file with more information 2015-09-24 00:18:18 +01:00
James Booth
40ce5cb0e0 Parse TLS cert subject 2015-09-23 23:01:59 +01:00
James Booth
1eab57bd13 Perform directory exists check before setting TLS cert path 2015-09-23 20:42:47 +01:00
James Booth
0321adde3e Fixed spelling 2015-09-23 20:38:52 +01:00
James Booth
a37d55e1a9 Added TLS trusted certificate path preference 2015-09-23 20:37:41 +01:00
James Booth
bd9c28c100 Tidied output for cert callback 2015-09-23 00:17:10 +01:00
James Booth
a964050b87 Use subject name in cert callback 2015-09-22 23:56:22 +01:00
James Booth
b88885aaae Store trusted TLS cert fingerprints 2015-09-22 22:44:18 +01:00
James Booth
9a53854a1d Added conditionals for libmesode cert verification 2015-09-22 21:55:46 +01:00
James Booth
9414ad268d Prompt user to allow or deny untrusted TLS certificates 2015-09-22 21:42:05 +01:00
James Booth
74151e6419 Added TLS cert fail callback 2015-09-22 20:55:41 +01:00
James Booth
2b88e2f1bf Check for libmesode, fall back to libstrophe 2015-09-21 21:40:04 +01:00
James Booth
d7bba74091 Moved /winstidy command to /wins autotidy 2015-09-19 23:31:04 +01:00
James Booth
232cc7601d Added otr and pgp to /prefs command help 2015-09-09 22:59:47 +01:00
James Booth
03ee1d56e6 Added conference and receipts features to caps query response 2015-09-09 22:36:07 +01:00
James Booth
fed6128bbc Spelling fix 2015-09-09 19:31:11 +01:00
James Booth
b266e4d035 Pass delay timestamp to all incoming chat events 2015-09-08 20:18:31 +01:00
James Booth
e44688306b Removed duplicate help entry for /roster show empty 2015-09-02 00:07:25 +01:00
James Booth
8a90e1acf1 PGP: Use old gpgme_io_write 2015-09-01 21:52:11 +01:00
James Booth
aee832f7c1 PGP: Use old gpgme_io_write 2015-09-01 21:40:07 +01:00
James Booth
b468fd7ae4 PGP: UI tweaks for passphrase request 2015-09-01 21:25:58 +01:00
James Booth
4d18c5ff52 PGP: Added null check for passphrase_attempt 2015-09-01 21:08:23 +01:00
James Booth
53035f5e4c Save PGP passphrase when correct 2015-09-01 21:05:17 +01:00
James Booth
7dc1b9d428 Fixed passing from arg in PGP ask passphrase 2015-09-01 20:33:23 +01:00
James Booth
1f4fd0fcb3 Added UI function to get PGP passphrase 2015-09-01 20:16:04 +01:00
James Booth
dd346eefc4 Added PGP passphrase callback 2015-09-01 19:24:56 +01:00
James Booth
688be91c23 PGP: Format fingerprints 2015-08-30 02:12:05 +01:00
James Booth
b4722632b6 Split PGP incoming and outgoing message handling 2015-08-30 01:32:13 +01:00
James Booth
1484e94b35 Fixed OTR decryption check 2015-08-27 00:37:48 +01:00
James Booth
ef52840d91 Added str_contains_str to common 2015-08-26 23:52:40 +01:00
James Booth
55158767cc Renamed enc_message parameter for incoming messages 2015-08-26 23:23:12 +01:00
James Booth
4b90a53566 Tidied sv_ev_incoming_message 2015-08-26 23:15:10 +01:00
James Booth
fc60c9fbf1 Fixed OTR char display 2015-08-26 21:42:16 +01:00
James Booth
5e962fe0f5 Fixed compile when no OTR or PGP support 2015-08-26 01:48:21 +01:00
James Booth
35239ee319 Added otr and pgp char to themes 2015-08-26 01:36:41 +01:00
James Booth
98ea744648 Added /otr char and /pgp char 2015-08-26 01:24:53 +01:00
James Booth
1bf584793f Added preference for encryption char 2015-08-26 01:06:10 +01:00
James Booth
48630d45a4 Added check for libgpgme on account autocomplete 2015-08-26 00:48:01 +01:00
James Booth
f998ab8f3b Display special char for encrypted messages 2015-08-26 00:42:56 +01:00
James Booth
4b0ee89fa3 PGP: Added key ID autocompletion to /account setting 2015-08-25 23:48:21 +01:00
James Booth
cb19be2ffc Added PGP key autocompleter 2015-08-25 23:44:03 +01:00
James Booth
55c2d1cc21 PGP: Display whether contact public key was received or manually set 2015-08-25 23:04:21 +01:00
James Booth
fc1ee79190 PGP: Show key IDs for assigned public keys 2015-08-25 22:45:51 +01:00
James Booth
592a3695a5 PGP: Do not save contact's fingerprint when no key found 2015-08-25 21:58:24 +01:00
James Booth
872ab8e529 Added HAVE_LIBGPGME check for setting account key 2015-08-25 20:35:45 +01:00
James Booth
f6a91145b6 Show public/private indicator when listing PGP keys 2015-08-25 00:21:49 +01:00
James Booth
d6ff72cf48 Show public keys in PGP key list 2015-08-24 22:27:15 +01:00
James Booth
525876770a Removed unused barejid argument from PGP decryption 2015-08-24 00:13:57 +01:00
James Booth
b8b54f91a5 Leave chat rooms before receiving self unavailable presence 
Fixes bug for servers that don't send the self presence
 2015-08-23 23:56:34 +01:00
James Booth
b1ab4b2854 Added JID to log when failing to load PGP fingerprint 
Added PGP stub for tests
 2015-08-23 23:09:44 +01:00
James Booth
8501d1db33 Validate PGP key when chosen for account 2015-08-23 23:05:39 +01:00
James Booth
57ca441f02 Check for valid PGP key on start 2015-08-23 22:54:41 +01:00
James Booth
c07638746a Log recipient used for PGP decryption 2015-08-23 22:18:54 +01:00
James Booth
d791e4dd59 Free OTR TLVS 2015-08-20 22:23:31 +01:00
James Booth
c18b7f4d67 Free id for OTR messages 2015-08-20 22:02:58 +01:00
James Booth
2af5c151a0 Tidied pgp memory allocations 2015-08-11 01:00:23 +01:00
James Booth
e2a528cad4 Free pgp key on connect 2015-08-10 22:18:19 +01:00
James Booth
0410dd90f1 Free timestamp and id for receipts 2015-08-09 23:08:36 +01:00
James Booth
dea10ecfdc Dereference timestamp on chat logging 2015-08-09 01:24:15 +01:00
James Booth
d501576fcf Free gpgme context on verification 2015-08-09 01:20:16 +01:00
James Booth
1422af05fc Free pgp headers 2015-08-09 01:16:41 +01:00
James Booth
131f1788c2 Free software version result properties 2015-08-09 01:10:02 +01:00
James Booth
3b79d5aa63 Dereference pgp key 2015-08-09 00:54:11 +01:00
James Booth
70c0eeed1e Free error message in carbons handlers 2015-08-09 00:43:00 +01:00
James Booth
783342a48c Free timestamps and carbons stanzas 2015-08-09 00:40:37 +01:00
James Booth
8531357e88 Free strings in prefs_load 2015-08-09 00:20:17 +01:00
James Booth
103f80c227 Updated /help help 2015-08-08 22:38:50 +01:00
James Booth
406b821b35 Show software version result in current window 2015-08-06 01:56:52 +01:00
brandenbyers
4e5f197eb4 Fix typo 2015-08-05 13:10:59 -05:00
James Booth
af38ddc9e7 Handle resource not found on sofware version request 2015-08-05 01:14:41 +01:00
James Booth
0b7c79ac13 Use original JID in software version request in MUC 2015-08-05 01:01:46 +01:00
James Booth
ac3e7dd9e8 Handle software version requests for gateways that return from domainpart 2015-08-05 00:48:50 +01:00
James Booth
2a92169351 Use id handler for software version requests, handle errors 2015-08-05 00:26:29 +01:00
James Booth
091a23fc48 Modified /account help 2015-08-03 00:45:14 +01:00
James Booth
5619ba7058 Added account status autocomplete 2015-08-03 00:33:16 +01:00
James Booth
7151792b8c Handle private messages that include muc#user namespace 2015-08-02 01:12:54 +01:00
James Booth
41c93c3350 Handle larger than line words in wrapping 2015-07-30 01:31:11 +01:00
James Booth
8ec931eb84 Added cons_show_padded 2015-07-29 23:48:28 +01:00
James Booth
79f618367d Do not print newline when curs position 0 2015-07-29 23:03:00 +01:00
James Booth
5576b88a04 Added indent padding 2015-07-29 22:48:03 +01:00
James Booth
30c1cdd318 Refactored showing tagged command help 2015-07-28 00:10:18 +01:00
James Booth
08f43bee8e Retagged commands 2015-07-27 23:55:04 +01:00
James Booth
eb550eedb3 Added tags to command definitions 2015-07-27 01:06:10 +01:00
James Booth
8119025120 Fixed tests for new command format 2015-07-27 00:04:48 +01:00
James Booth
59d5dd73a7 Use command definition macros for remaining commands 2015-07-26 20:43:59 +01:00
James Booth
6986a02ff3 Added command definition macros 2015-07-26 19:39:12 +01:00
James Booth
bd32f4dc47 Show command header in help output 2015-07-26 03:01:14 +01:00
James Booth
2b725f9144 Reordered command arguments 2015-07-26 02:28:45 +01:00
James Booth
4f9a848429 Added message for invalid /wins usage 2015-07-26 02:09:01 +01:00
James Booth
34537e2fb1 Removed old command help 2015-07-26 02:05:53 +01:00
James Booth
36ebf0fc17 Updated help category output 2015-07-26 01:27:42 +01:00
James Booth
cb7504e67f Moved remaining help to new format 2015-07-26 00:17:16 +01:00
James Booth
b33f4777d0 Fix formatting for variables in new help 2015-07-25 20:57:21 +01:00
James Booth
19fb907bc5 Generate HTML docs using new help format 2015-07-25 20:43:16 +01:00
James Booth
90dda0e9a0 Added more help to new format 2015-07-25 00:45:20 +01:00
James Booth
b736883ac4 Added roster to new help format 2015-07-24 21:20:55 +01:00
James Booth
a8eb281553 Added msg to new help format 2015-07-24 00:44:56 +01:00
James Booth
44d7a152a4 Added connect to new help format 2015-07-24 00:33:38 +01:00
James Booth
22111bf75b Moved help and about to new format 2015-07-23 23:05:33 +01:00
James Booth
e55ef63f61 Merge branch 'master' into help 2015-07-22 22:59:20 +01:00
James Booth
f9a7e35001 Added id attributes to roster queries 
fixes #596
 2015-07-22 22:48:37 +01:00
James Booth
59dd87d5f8 Fix /help commands spacing 2015-07-21 22:55:39 +01:00
James Booth
b63ede7964 Fixed time preference display 2015-07-19 22:56:22 +01:00
James Booth
46e2f11b93 Removed /mouse command 2015-07-19 22:48:12 +01:00
James Booth
84cc67fa88 Removed 'empty' from roster autocompleter 2015-07-14 20:59:55 +01:00
James Booth
051c6ed50e Check for self jid on /software 
fixed #592
 2015-07-08 21:05:20 +01:00
James Booth
9a5fe29caa Changed /roster empty -> /roster remove_all contacts 
Make it difficult to accidentally use this command.
 2015-07-08 20:51:39 +01:00
Daniel
806afcc014 Allow hiding of empty presence groups: /roster {show,hide} empty (default is show) 2015-07-08 13:11:56 +02:00
James Booth
6c668bce88 Migrate old time display format settings 2015-07-02 16:31:09 +01:00
James Booth
84a8da7741 Default autoping to 1 minute #541 2015-07-02 00:10:31 +01:00
James Booth
fb8b223876 Removed subscribed check when displaying roster panel 2015-07-02 00:01:37 +01:00
James Booth
10eb0bbbf8 Merge remote-tracking branch 'SamWhited/otr_no_store_carbons' 2015-07-01 21:09:45 +01:00
James Booth
d8c410d289 Don't write chars during password input 2015-07-01 21:00:31 +01:00
James Booth
446f5f0aa1 Merge remote-tracking branch 'pasis/ui-ignore-EINTR' 2015-07-01 20:55:22 +01:00
James Booth
106e909fbd Merge remote-tracking branch 'incertia/time' 
Conflicts:
	src/config/preferences.c
 2015-07-01 20:16:09 +01:00
Sam Whited
167ee28ec0 Add no-copy and no-store hints to OTR messages 2015-07-01 09:04:54 -05:00
James Booth
d5f79c7b35 Use reference counts for GDateTimes #516 2015-06-30 16:21:21 +01:00
James Booth
dd206ef637 WIP fix for #516, needs memory cleanup 2015-06-29 23:48:41 +01:00
Dmitry Podgorny
f24019ee4d ui: Ignore EINTR in inp_readline() 
EINTR is usual situation during resizing of terminal window.
 2015-06-25 18:17:10 +00:00
James Booth
fed55b5459 Do not update UI whilst receiving password 2015-06-25 00:33:28 +01:00
James Booth
524c7a8671 Free account on pgp presence send 2015-06-24 22:02:29 +01:00
James Booth
7f17fd2e48 Merge pull request #583 from pasis/jid-memleak 
Fixed memory leak in jid_create()
 2015-06-24 22:00:02 +01:00
Dmitry Podgorny
89b76400c8 jid: Fixed memory leak in jid_create() 2015-06-24 20:42:20 +00:00
James Booth
ae4c2781e1 Added messaage when account resource changed whilst connected 2015-06-24 21:36:39 +01:00
James Booth
583bccf631 Merge remote-tracking branch 'pasis/stderr-log-handler' 2015-06-24 21:02:21 +01:00
James Booth
240f6a3f79 Fixed various jid and account mem leaks 2015-06-24 20:53:04 +01:00
James Booth
626ab51ed4 free account after account connect 2015-06-24 20:24:39 +01:00
James Booth
48a2cad8fd free muc autocompleter result 2015-06-24 20:20:55 +01:00
James Booth
026b0885b5 Merge remote-tracking branch 'pasis/prefs-alloc' 2015-06-24 20:14:00 +01:00
James Booth
2becd9170e Merge remote-tracking branch 'pasis/gpgme-h-check' 2015-06-24 19:34:59 +01:00
James Booth
ac454fb1cc Removed NULL checks when not required 2015-06-24 19:19:44 +01:00
Dmitry Podgorny
6325e4f64d pgp: Added include config.h 
gpgme.h checks _FILE_OFFSET_BITS macro and it's set at config.h
 2015-06-24 14:21:28 +00:00
James Booth
17919298f7 Free prefs strings, check for NULLs when closing pgp module 2015-06-24 14:27:40 +01:00
Dmitry Podgorny
592cf2c69b prefs: Don't mix allocator types 2015-06-24 12:50:04 +00:00
James Booth
8eb921e34a Merge remote-tracking branch 'pasis/ui-log-fix' 2015-06-23 23:37:52 +01:00
James Booth
d89a9862b1 Merge remote-tracking branch 'pasis/pgp-without-otr-fix' 2015-06-23 23:32:41 +01:00
James Booth
358e9d6af0 Added /pgp setkey command 2015-06-23 23:29:10 +01:00
Dmitry Podgorny
6a73ca1b52 pgp: Fixed compilation error when libotr is not supported 2015-06-23 22:13:50 +00:00
Dmitry Podgorny
02cd8d2330 ui: decreased log level of the message on resizing 
Resizing of terminal window can produce many logs "Resizing UI". Also
they are not so informative to be shown without -l DEBUG.
 2015-06-23 22:03:09 +00:00
Dmitry Podgorny
e831410669 log: Introduced stderr log handler 
This handler redirects stderr output to a pipe and gathers logs from the
read end.

The handler is called from main loop, therefore, if a function prints logs
to stderr they will be put to log file only after function returns.
 2015-06-23 20:52:04 +00:00
James Booth
86acd4649b Added PGP prefs 2015-06-22 21:09:14 +01:00
Dmitry Podgorny
c851a48af2 shutdown: Call prefs_close() after log_close() 
log_msg() uses prefs, so prefs_close() should be called after
log_close(). It makes possible to use logs in other finalisation
functions.
 2015-06-22 11:43:12 +00:00
James Booth
918e55becf Fixed pgp help 2015-06-21 22:29:15 +01:00
James Booth
9526f2b7eb Fixed /pgp help formatting 2015-06-21 22:06:27 +01:00
James Booth
3d2f999efb Added PGP logging preferences 2015-06-21 21:42:58 +01:00
James Booth
446027b950 Moved setting otr.warn -> enc.warn 2015-06-21 21:07:57 +01:00
James Booth
e72ddf5488 Show message when contact ends PGP 2015-06-21 20:27:56 +01:00
James Booth
217fcff420 Added /pgp end command 2015-06-21 20:20:28 +01:00
James Booth
f81652e84e Added enc_mode check when starting OTR 2015-06-21 20:13:28 +01:00
James Booth
5669799690 Encryption modes for sv_ev_incoming_message 2015-06-21 20:08:46 +01:00
James Booth
03a4aa4408 Tidied OTR and PGP combinations in client_events.c 2015-06-21 19:29:23 +01:00
James Booth
13a612cbc2 Moved window creation to sv_ev_incoming_message 2015-06-21 18:29:20 +01:00
James Booth
8d2d923603 Moved message display logic to sv_ev_incoming_message 2015-06-21 18:00:57 +01:00
James Booth
9b991ae058 Extracted chat session code from message senders 2015-06-21 17:11:23 +01:00
James Booth
e45afd5c09 Added pgp checks for message sending 2015-06-21 01:48:25 +01:00
James Booth
6617bb5a2b Added window encyption mode for PGP 2015-06-20 23:49:24 +01:00
James Booth
16999a3964 Merge branch 'master' into openpgp 2015-06-20 00:39:08 +01:00
James Booth
d7ec339e3e Added /roster empty command 2015-06-20 00:38:28 +01:00
James Booth
edbb3d938e Merge branch 'master' into openpgp 2015-06-19 00:15:40 +01:00
James Booth
e117c0368f Added missing include client_events.c 2015-06-19 00:14:48 +01:00
James Booth
ea99012d9b Added initial /pgp start checks 2015-06-18 01:34:27 +01:00
James Booth
85cc5ab50d Added cmd_pgp tests 2015-06-18 00:12:01 +01:00
James Booth
97ba9d2692 Merge branch 'master' into openpgp 2015-06-17 20:06:13 +01:00
James Booth
f51a26e6a0 Merge remote-tracking branch 'quite/#513' 2015-06-17 20:05:27 +01:00
James Booth
1af3565cbd Merge branch 'master' into openpgp 2015-06-17 19:55:52 +01:00
James Booth
e00a03f916 Removed wins_get_current_* functions 2015-06-17 19:49:55 +01:00
James Booth
8fde14879a Merge branch 'master' into openpgp 
Conflicts:
	src/command/commands.c
	src/command/commands.h
 2015-06-17 00:40:06 +01:00
James Booth
a798dc5618 Removed unused function prototype 2015-06-17 00:18:59 +01:00
James Booth
2215a3791f Added current window reference to command functions 2015-06-17 00:15:28 +01:00
James Booth
cfef64c767 Pass current window to autocompleters 2015-06-16 22:59:08 +01:00
Daniel
d00d71f245 Let's only strip trailing whitespace when parsing command 
Allows for "quoting" a command--doing nothing but sending the string: SPC/command
As we're used to from for example irc clients. 

Fixes boothj5/profanity#513
 2015-06-16 09:46:02 +02:00
James Booth
637b8bee9f Merge branch 'master' into openpgp 2015-06-15 23:17:11 +01:00
James Booth
fb0e065902 Tidied cmd_otr, added check-unit target to Makefile 2015-06-15 23:16:22 +01:00
James Booth
de47450594 Merge branch 'master' into openpgp 2015-06-15 22:03:25 +01:00
James Booth
6097a5bade Removed ui_get_current_chat() 2015-06-15 22:01:28 +01:00
James Booth
c76692516a Merge branch 'master' into openpgp 2015-06-15 20:39:17 +01:00
James Booth
5cdd69f478 Moved UI interfaces to ui.h 2015-06-15 20:11:34 +01:00
James Booth
38ed9188d3 Moved ui/windows -> window_list 2015-06-15 19:26:28 +01:00
James Booth
6b44b988f4 Moved refresh subwin logic to window.c 2015-06-15 18:59:20 +01:00
James Booth
989dde77cd Added win_resize() function 2015-06-15 18:08:47 +01:00
James Booth
a849b200b3 Added win_clear() function 2015-06-15 17:54:47 +01:00
James Booth
e9aa4ea084 Removed unused variable 2015-06-15 17:40:22 +01:00
James Booth
732533ee5a I removed ncurses header dependencies, removed unused code 2015-06-15 17:11:11 +01:00
James Booth
10a5f29023 Merge branch 'master' into openpgp 2015-06-14 00:02:00 +01:00
James Booth
e50461a897 Set columns when running functional tests 2015-06-13 23:59:33 +01:00
James Booth
0ef00e87ab Merge branch 'master' into openpgp 2015-06-13 16:27:20 +01:00
James Booth
698288ab5c Show message when offline for /pgp fps 2015-06-13 01:19:56 +01:00
James Booth
e0783e20db Renamed otr trusted window property 2015-06-13 01:13:56 +01:00
James Booth
a408ca7326 Removed TODO in gpg.c 2015-06-13 00:35:53 +01:00
James Booth
abcf67044c Merge branch 'master' into openpgp 2015-06-08 20:33:03 +01:00
James Booth
549fceaa7f Set default autoaway mode to off 
fixes #555
 2015-06-08 20:26:23 +01:00
James Booth
9aff8abd2e Merge branch 'master' into openpgp 
Conflicts:
	.travis.yml
 2015-06-05 23:02:56 +01:00
James Booth
78a4446023 Merge branch 'master' into stabber-tests 2015-06-02 20:32:15 +01:00
James Booth
a3693cfbe7 Merge branch 'master' into openpgp 2015-06-02 20:32:07 +01:00
James Booth
f0f3a739f4 Merge remote-tracking branch 'PMaynard/#551' 2015-06-02 20:29:35 +01:00
Pete
a0a7d04a5f Tidy up windows when enabling 2015-06-01 14:47:02 +01:00
Pete
e8eb23c4f0 Merge branch '#551' of github.com:PMaynard/profanity into #551 2015-06-01 11:45:22 +01:00
Pete
2ce35fe61c Added Theme UI option for window auto tidy 2015-06-01 11:44:52 +01:00
Pete Maynard
7bc671e07c Extra underline 2015-06-01 11:33:19 +01:00
Pete
0564976264 Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected underline, removed call to function 'wins_resize_all()'. 2015-06-01 11:27:01 +01:00
Will Song
837f8b1f10
add examples and be more specific about time formatting 2015-05-30 00:42:19 -05:00
Will Song
83bed119e4
remove memory leak from creating a gdatetime string 2015-05-29 20:55:33 -05:00
Will Song
0e7507a1aa
update autocomplete 2015-05-29 20:49:28 -05:00
Will Song
3842daa334
fix indent code 2015-05-29 20:45:10 -05:00
Will Song
f2629aca7b
updated statusbar to use strftime formats 2015-05-29 20:23:09 -05:00
Will Song
9463c67190
fix conflicts 2015-05-29 19:53:37 -05:00
Pete
fbc57765a3 Added window auto tidy. 2015-05-29 14:25:14 +01:00
James Booth
e4ad201324 Merge branch 'master' into stabber-tests 2015-05-25 21:17:06 +01:00
James Booth
06fe9bec37 Merge branch 'master' into openpgp 2015-05-25 21:16:51 +01:00
James Booth
304e08a9c0 Added jid to OTR errors in console 2015-05-25 21:16:10 +01:00
James Booth
e295a474dc Added more connect tests 2015-05-24 20:31:18 +01:00
James Booth
80665ea051 Added rooms iq test 2015-05-24 04:13:28 +01:00
James Booth
2241473ee6 Added bad password test 2015-05-24 00:56:13 +01:00
James Booth
09f01d518c Merge branch 'master' into stabber-tests 2015-05-17 22:28:25 +01:00
James Booth
34d9b2b272 Merge branch 'master' into openpgp 2015-05-17 22:28:12 +01:00
James Booth
2c5b44421e Added initial stabber test 2015-05-17 22:05:43 +01:00
Adam Ehlers Nyholm Thomsen
882ca85aca allow enabling / disabling carbons without being connected. 2015-05-17 13:29:08 +02:00
James Booth
7f861b7743 Removed libgpg include from presence.c 2015-05-10 23:54:48 +01:00
James Booth
58b5e39b95 Merge branch 'master' into openpgp 2015-05-10 01:45:07 +01:00
James Booth
aeffca496c Tidy ui_room_message 2015-05-10 01:44:34 +01:00
James Booth
487f5da17d Merge branch 'master' into openpgp 2015-05-10 01:08:30 +01:00
James Booth
aaad3ff909 Moved logic to notify_message 2015-05-10 01:03:34 +01:00
James Booth
acd2d2309f Moved pgp signature generation to cl_ev_presence_send 2015-05-08 00:07:21 +01:00
James Booth
0db7bcbdcd Merge branch 'master' into openpgp 2015-05-07 23:23:45 +01:00
James Booth
d853284f92 Added cl_ev_presence_send 2015-05-07 23:21:48 +01:00
James Booth
a2281dbccf Merge branch 'master' into openpgp 2015-05-07 23:16:22 +01:00
James Booth
56cbce2ff3 Renamed presence_update -> presence_send 2015-05-07 23:12:49 +01:00
James Booth
beeadd6ae3 Merge branch 'master' into openpgp 2015-05-07 22:51:42 +01:00
James Booth
f69ccbf0cc Tidied _roster_result_handler 2015-05-07 22:51:35 +01:00
James Booth
8ebc1d4ac1 Moved pgp signature verification to sv_ev_contact_online 2015-05-07 22:22:28 +01:00
James Booth
8673488368 Merge branch 'master' into openpgp 2015-05-07 22:06:02 +01:00
James Booth
a2c6211732 Added ui_contact_online 2015-05-07 22:05:36 +01:00
James Booth
8c347de298 Merge branch 'master' into openpgp 2015-05-07 00:26:45 +01:00
James Booth
6fd9b179a0 Optimised occupant comparisons, create utf8 collate key once 2015-05-07 00:26:24 +01:00
James Booth
ca3f7412f5 Optimised contact comparisons, create utf8 collate key once 2015-05-07 00:16:22 +01:00
James Booth
6840f3b599 Merge branch 'master' into openpgp 2015-05-06 22:04:47 +01:00
James Booth
5067e565e3 Set ui nonblocking on presence updates 
Speeds up joining rooms, and connecting.
 2015-05-06 22:02:50 +01:00
James Booth
c9e21a557e Merge branch 'master' into openpgp 2015-05-05 00:51:16 +01:00
James Booth
d52f86ef0f Tidied form field autocompleters 2015-05-05 00:13:41 +01:00
James Booth
44aa2fd1bf Use null check convention in gpg.c 2015-05-04 23:41:22 +01:00
James Booth
3fd9692aec Merge branch 'master' into pgp 2015-05-04 23:40:58 +01:00
James Booth
6f3750c6aa Use null check convention in roster_list.c 2015-05-04 23:31:05 +01:00
James Booth
59788752c7 Use null check convention in resource.c 2015-05-04 23:29:53 +01:00
James Booth
0930f0f688 Use null check convention in profanity.c 2015-05-04 23:29:24 +01:00
James Booth
41724218c0 Use null check convention in log.c 2015-05-04 23:28:34 +01:00
James Booth
4c78534be0 Use null check convention in jid.c 2015-05-04 23:27:41 +01:00
James Booth
1bfaa49fb3 Use null check convention in contact.c 2015-05-04 23:26:57 +01:00
James Booth
1d002e5bdc Use null check convention in common.c 2015-05-04 23:26:08 +01:00
James Booth
49e450767d Use null check convention in chat_session.c 2015-05-04 23:24:37 +01:00
James Booth
c487fe5f77 Use null check convention in stanza.c 2015-05-04 23:23:55 +01:00
James Booth
defa955ae0 Use null check convention in roster.c 2015-05-04 23:22:06 +01:00
James Booth
8e64323503 Use null check convention in presence.c 2015-05-04 23:21:06 +01:00
James Booth
8e2578459e Use null check convention in iq.c 2015-05-04 23:19:10 +01:00
James Booth
cbcf476a7c Use null check convention in form.c 2015-05-04 23:17:18 +01:00
James Booth
af75bc4be6 Use null check convention in connection.c 2015-05-04 23:16:44 +01:00
James Booth
067ad7fa2c Use null check convention in capabilities.c 2015-05-04 23:15:15 +01:00
James Booth
398eac4ed6 Use null check convention in bookmark.c 2015-05-04 23:14:18 +01:00
James Booth
a71d1dab6a Use null check convention in windows.c 2015-05-04 23:12:55 +01:00
James Booth
c19a05ca09 Use null check convention in window.c 2015-05-04 23:11:32 +01:00
James Booth
dd386b4a4e Use null check convention in titlebar.c 2015-05-04 23:08:09 +01:00
James Booth
bf5646aee3 Use null check convention in statusbar.c 2015-05-04 23:07:36 +01:00
James Booth
dda812cd3e Use null check convention in notifier.c 2015-05-04 23:06:35 +01:00
James Booth
aefe458b60 Use null check convention in core.c 2015-05-04 23:05:52 +01:00
James Booth
2e2b3f9403 Use null check convention in console.c 2015-05-04 23:02:57 +01:00
James Booth
09e1e7618e Use null check convention in tinyurl.c 2015-05-04 22:57:49 +01:00
James Booth
fe216b4e97 Use null check convention in parser.c 2015-05-04 22:57:19 +01:00
James Booth
fa2e33e11d Use null check convention in otrlibv4.c 2015-05-04 22:55:28 +01:00
James Booth
2426a7fcfc Use null check convention in otrlibv3.c 2015-05-04 22:55:04 +01:00
James Booth
a979d23e10 Use null check convention in otr.c 2015-05-04 22:52:48 +01:00
James Booth
4dc9033472 Use null check convention in server_events.c 2015-05-04 22:51:15 +01:00
James Booth
4ba33005d0 Use null check convention in theme.c 2015-05-04 22:33:55 +01:00
James Booth
b093b99c15 Use null check convention in preferences.c 2015-05-04 22:33:19 +01:00
James Booth
a293045d85 Use null check convention in accounts.c 2015-05-04 22:32:42 +01:00
James Booth
47549452f1 Use null check convention in account.c 2015-05-04 22:29:51 +01:00
James Booth
4acf853b1c Use null check convention in commands.c 2015-05-04 22:23:59 +01:00
James Booth
2b3cc65b52 Use null check convention in command.c 2015-05-04 22:16:39 +01:00
James Booth
176fba84a0 Merge branch 'master' into pgp 2015-05-04 21:39:56 +01:00
James Booth
8ccbeade44 Added enc_mode to ProfChatWin 2015-05-04 21:38:19 +01:00
James Booth
65ea572dae Merge branch 'master' into pgp 2015-05-04 21:31:22 +01:00
James Booth
a0c872edf8 Extracted carbons handling 2015-05-04 21:31:05 +01:00
James Booth
a5677206e9 Merge branch 'master' into pgp 2015-05-04 21:20:40 +01:00
James Booth
ac940c2c8a Revert "Added carbons handler" 
This reverts commit ff867e7f2b.
 2015-05-04 21:18:53 +01:00
James Booth
aca102f542 Merge branch 'master' into pgp 2015-05-04 01:34:18 +01:00
James Booth
c8eaaa0ce9 Added ui_ev_new_private_win to ui events 2015-05-04 01:31:27 +01:00
James Booth
3dace733d9 Merge branch 'master' into pgp 2015-05-04 01:10:30 +01:00
James Booth
b1dd1e2726 cl_ev_send_muc_msg takes ProfMucWin as arg 2015-05-04 01:06:12 +01:00
James Booth
bb2b5d20d5 Merge branch 'master' into pgp 2015-05-04 00:57:17 +01:00
James Booth
ef54ff305e ui_outgoing_chat_msg now takes ProfChatWin as argument 2015-05-04 00:55:43 +01:00
James Booth
bab4da039a Merge branch 'master' into pgp 2015-05-04 00:43:36 +01:00
James Booth
c3d2a7e937 Added roster list function to get display name for messages 2015-05-03 23:38:46 +01:00
James Booth
0f3bece9e2 Merge branch 'master' into pgp 2015-05-03 02:35:15 +01:00
James Booth
ff867e7f2b Added carbons handler 2015-05-03 02:34:58 +01:00
James Booth
bec9b53f10 Merge branch 'master' into pgp 2015-05-03 02:04:21 +01:00
James Booth
4e1c2a4f64 Show resource in status bar 2015-05-03 02:04:04 +01:00
James Booth
f65c82e112 Merge branch 'master' into pgp 2015-05-03 01:48:32 +01:00
James Booth
f25f90b38b Extracted receipt request processing in message.c 2015-05-03 01:48:12 +01:00
James Booth
d3f4347513 Merge branch 'master' into pgp 
Conflicts:
	src/xmpp/message.c
 2015-05-03 01:30:14 +01:00
James Booth
530c060d2a Extract private message hanlding in message.c 2015-05-03 01:25:33 +01:00
James Booth
79d21d4cd2 Merge branch 'master' into pgp 2015-05-03 00:35:47 +01:00
James Booth
236c854419 Tidy message.c 2015-05-03 00:35:31 +01:00
James Booth
03ef791401 Merge branch 'master' into pgp 2015-05-03 00:06:12 +01:00
James Booth
5a90e2862e Extracted receipt received handler 2015-05-03 00:05:47 +01:00
James Booth
0bc4377ad7 Merge branch 'master' into pgp 2015-05-02 23:40:34 +01:00
James Booth
ddc64755a0 Tidy message.c 2015-05-02 23:40:14 +01:00
James Booth
8c72f0deb5 Merge branch 'master' into pgp 2015-05-02 23:24:50 +01:00
James Booth
be4ee40ed4 Pass ProfChatWin to otr_on_message_send 2015-05-02 23:23:12 +01:00
James Booth
cade9e7c4c Merge branch 'master' into pgp 2015-05-01 00:55:58 +01:00
James Booth
0118178080 Removed server event delegation functions 2015-05-01 00:55:40 +01:00
James Booth
0bd642edf8 Merge branch 'master' into pgp 2015-04-30 23:38:28 +01:00
James Booth
e11e55e31a Move current win check to event, removed next and prev win functions 2015-04-30 22:43:08 +01:00
James Booth
a3a4b6267b Merge branch 'master' into pgp 2015-04-30 22:10:03 +01:00
James Booth
d68fb25dde Removed ui_win_switch_num 2015-04-30 22:09:39 +01:00
James Booth
20555fcb36 Added assert to ui_switch_win 2015-04-30 21:27:44 +01:00
James Booth
7730674f45 Merge branch 'master' into pgp 2015-04-30 21:24:06 +01:00
James Booth
0a6b76d6d3 Removed some ui functions, inlined 2015-04-30 21:23:43 +01:00
James Booth
d5188a160e Merge branch 'master' into pgp 2015-04-29 23:16:43 +01:00
James Booth
2e75e54460 Added ui_win_error_line() 2015-04-29 23:16:28 +01:00
James Booth
0fece78dfe Merge branch 'master' into pgp 2015-04-29 23:08:23 +01:00
James Booth
665c34414d Return result on OTR message sending 2015-04-29 22:59:44 +01:00
James Booth
0df8b8beff Return new window on new chat win event 2015-04-29 22:10:32 +01:00
James Booth
8de308c96a Changed message when sending non encrypted message with OTR policy always 2015-04-29 21:55:09 +01:00
James Booth
15b34692fd Reuse ui_new_chat_win 2015-04-29 21:42:29 +01:00
James Booth
0296a60390 _win_show_history takes ProfChatWin as first arg 2015-04-29 21:19:20 +01:00
James Booth
5d827cafec Merge branch 'master' into pgp 
Conflicts:
	src/xmpp/message.c
 2015-04-28 23:57:28 +01:00
James Booth
d3698e6bee Added ui events module 2015-04-28 23:53:37 +01:00
James Booth
8aba52f4fe Renamed event functions 2015-04-28 23:38:56 +01:00
James Booth
403e9b47fe Removed commented code 2015-04-28 23:00:06 +01:00
James Booth
43189b1ab4 Merge branch 'master' into pgp 2015-04-27 23:45:51 +01:00
James Booth
70d1756a1c Moved otr message send event to otr module 2015-04-27 23:30:33 +01:00
James Booth
eb177ccbef Removed server_events dependency on libotr headers 2015-04-27 23:17:38 +01:00
James Booth
f219302f06 Renamed incoming otr message 2015-04-27 22:34:06 +01:00
James Booth
7a44e17141 Merge branch 'master' into pgp 
Conflicts:
	src/config/account.h
 2015-04-23 23:48:43 +01:00
James Booth
bc9e6b79cd Tidied account login 2015-04-23 21:56:48 +01:00
James Booth
5f2c6cbd28 Merge branch 'master' into pgp 2015-04-22 00:30:00 +01:00
James Booth
ba286c54ef Moved login events to client events module 2015-04-22 00:29:37 +01:00
James Booth
1c47b57e19 Tidy execute alias code 2015-04-21 23:45:03 +01:00
James Booth
bc445ccdfb Merge branch 'master' into pgp 2015-04-21 23:35:37 +01:00
James Booth
88739d5c59 Moved new chat win events to client events module 2015-04-21 23:28:52 +01:00
James Booth
ebca38e224 Merge branch 'master' into pgp 2015-04-21 22:08:00 +01:00
James Booth
53f2a4a35c Moved all message sending to client events module 2015-04-21 21:57:39 +01:00
James Booth
65c0a87f97 Merge branch 'master' into pgp 2015-04-21 20:56:47 +01:00
James Booth
a4f9661da2 Removed unused otr check 2015-04-19 21:03:20 +01:00
James Booth
9be265591a Merge branch 'master' into pgp 2015-04-19 19:50:19 +01:00
James Booth
32da6548da Added client_events module, reuse message sending code for all commands 2015-04-19 19:40:15 +01:00
James Booth
d612b9695a Merge branch 'master' into pgp 
Conflicts:
	src/xmpp/message.c
 2015-04-19 17:33:35 +01:00
James Booth
e688dd7d28 Renamed server event functions 2015-04-19 17:29:54 +01:00
James Booth
60f94722d4 Merge branch 'master' into pgp 2015-04-19 16:56:11 +01:00
James Booth
424f52c3fa Moved server_events to event/ 2015-04-19 16:54:16 +01:00
James Booth
bcfbbac49a Merge branch 'master' into pgp 2015-04-12 02:16:13 +01:00
James Booth
57dc5f14ef Added option to show jids in occupants panel 2015-04-12 02:14:37 +01:00
James Booth
7e4b756e44 Merge branch 'master' into pgp 2015-04-11 23:38:44 +01:00
James Booth
a2ccd89646 Autogenerate room name with UUID for /join with no args 2015-04-11 23:37:52 +01:00
James Booth
5305a3e3a6 Fixed message sending when not PGP key found 2015-04-05 16:03:50 +01:00
James Booth
c8c12a8f7a Merge branch 'master' into pgp 2015-03-29 03:17:41 +01:00
James Booth
71c2be599b Use password for chat room invites 2015-03-29 03:16:41 +01:00
James Booth
c36d4b3643 Merge branch 'master' into pgp 2015-03-29 02:51:05 +01:00
James Booth
1917d4c095 Added password to direct invites 2015-03-29 02:46:59 +01:00
James Booth
c1eceebcba Merge branch 'master' into pgp 2015-03-29 00:59:42 +00:00
James Booth
714faeb2e6 Add callback data to room disco info response handler 2015-03-29 00:55:33 +00:00
James Booth
24a45e5292 Set members only property when getting room features 2015-03-29 00:21:18 +00:00
James Booth
fac2b2cf66 Added check members only room to send mediated invites 2015-03-28 22:51:41 +00:00
James Booth
0f6bc9b55d Decrypt incoming messages 2015-03-25 00:05:32 +00:00
James Booth
eb5cb7b2f8 Send encrypted messages 2015-03-24 23:34:24 +00:00
James Booth
551f7df1f7 Added signature verification, /pgp fps command 2015-03-24 00:47:13 +00:00
James Booth
b87130b601 Added check for HAVE_LIBGPGME in presence.c 2015-03-23 23:51:35 +00:00
James Booth
027fa2a700 Fixed tabs 2015-03-23 23:42:04 +00:00
James Booth
73e1654f28 Fixed tabs 2015-03-23 23:41:09 +00:00
James Booth
475dfebd97 Added pgpkeyid account setting, send signed presence 2015-03-23 23:38:06 +00:00
James Booth
8a5d1fef29 Added Id and fingerprint to pgp key list 2015-03-22 01:03:06 +00:00
James Booth
fd86615549 Added /pgp libver command 2015-03-22 00:29:57 +00:00
James Booth
1d90cc7894 Fixed whitespace 2015-03-22 00:15:23 +00:00
James Booth
2490c3ed20 Added pgp key list command 2015-03-22 00:12:14 +00:00
James Booth
f1f047889e Added individual options to send and request delivery receipts 2015-03-19 22:57:51 +00:00
James Booth
8e80a8ccf7 Merge remote-tracking branch 'origin/master' 2015-03-18 21:31:58 +00:00
James Booth
e7e94eed7f Added keybindings for rxvt 2015-03-18 21:30:43 +00:00
James Booth
d6977e31cd Fix buffer entry free 2015-03-17 20:42:21 +00:00
James Booth
311b64a379 Tidy cmd_tiny 2015-03-16 23:03:31 +00:00
James Booth
848baa95a2 Added static function for sending otr tagged messages 2015-03-16 21:59:11 +00:00
James Booth
11966d39b0 Added otr_tag_message, removed commands.c dependency on libotr 2015-03-16 21:41:35 +00:00
James Booth
ec57c72fb4 Use static functions in cmd_msg 2015-03-16 01:48:12 +00:00
James Booth
d50754aac6 Removed window checks before logging in cmd_msg 2015-03-16 01:39:43 +00:00
James Booth
981618b7da Added static functions to commands.c for sending messages 2015-03-16 01:29:03 +00:00
James Booth
e7e1688d8a Moved _strtoi to common, strtoi_range 2015-03-16 01:06:40 +00:00
James Booth
23ef3498b5 Removed console dependency from strtoi 2015-03-16 01:03:37 +00:00
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
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
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
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
2e493112bb Merge branch 'master' into readline 2015-03-08 18:12:50 +00:00
James Booth
6be4b400b8 Fixed swapping windows when in source win 2015-03-03 22:10:01 +00:00
James Booth
2112ddea65 Merge branch 'master' into readline 2015-02-26 00:50:49 +00:00
James Booth
cbdfc09a84 Renamed /theme set -> /theme load 2015-02-26 00:49:21 +00:00
James Booth
a809dc9131 Merge branch 'master' into readline 2015-02-25 00:04:35 +00:00
James Booth
22daac5fe9 Upgrade otr warn preference, added UI theme settings 2015-02-25 00:01:41 +00:00
James Booth
7ae71391de Merge branch 'master' into readline 2015-02-24 22:58:19 +00:00
James Booth
68a8ab3401 Updated default preferences 2015-02-24 22:53:57 +00:00
James Booth
84c02ffb72 Added /roster by preference to UI preferences summary 2015-02-24 22:24:20 +00:00
James Booth
9a408024d3 Merge branch 'master' into readline 2015-02-24 21:47:49 +00:00
James Booth
434fb1878b Fixed /resource preference display 2015-02-24 21:42:43 +00:00
James Booth
2cba6798de Merge branch 'master' into readline 2015-02-23 23:54:01 +00:00
James Booth
f5686cab1e Fixed create_fulljid 2015-02-23 23:52:53 +00:00
James Booth
93b5ca7a1f Merge branch 'master' into readline 2015-02-23 23:46:40 +00:00
James Booth
70b923a7fc Lowercase barejid in Jid 2015-02-23 23:44:34 +00:00
James Booth
b0176d050f Lowercase barejid before searching roster 2015-02-23 23:30:13 +00:00
James Booth
e22547fb19 Merge branch 'master' into readline 2015-02-23 23:14:55 +00:00
James Booth
a2a187892b Lowercase barejid before adding to roster 2015-02-23 23:12:44 +00:00
Olivier LE MOAL
ced5a8c2e0 merge 2015-02-23 10:47:54 +01:00
James Booth
7454bede8b Merge branch 'master' into readline 2015-02-23 00:50:58 +00:00
James Booth
2f4d66ea6e Merge remote-tracking branch 'stormc/master-spellfixes' 
Conflicts:
	src/command/command.c
 2015-02-23 00:49:56 +00:00
James Booth
6979786ace Merge branch 'master' into readline 2015-02-23 00:17:24 +00:00
James Booth
c249a60cba Finished help tidy 2015-02-23 00:15:33 +00:00
Olivier Le Moal
3eeafa2277 fix segfault on self sent message carbon 2015-02-21 22:22:21 +01:00
Christian Storm
a1d14c4526 Fixed spelling. 2015-02-17 10:52:37 +01:00
James Booth
475ec97f99 Merge branch 'master' into readline 2015-02-16 22:53:15 +00:00
James Booth
0997bafeb9 Removed comment 2015-02-16 22:52:18 +00:00
James Booth
1a59c6e745 Merge branch 'master' into readline 2015-02-16 22:38:45 +00:00
James Booth
2605b84a70 Tidy help 2015-02-16 22:37:17 +00:00
James Booth
32b8ead198 Merge branch 'master' into readline 2015-02-14 20:46:11 +00:00
James Booth
965187edef Merge remote-tracking branch 'origin/master' 2015-02-14 16:22:45 +00:00
James Booth
c9a6e10c26 Use single quotes for terminal notifier notifications to avoid variable expansion 2015-02-14 16:20:15 +00:00