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 |
|
James Booth
|
d02b364b3c
|
Tidy help
|
2015-02-11 23:58:11 +00:00 |
|
James Booth
|
0ce2edf5d8
|
Merge branch 'master' into readline
|
2015-02-11 00:18:32 +00:00 |
|
James Booth
|
9951da0c8f
|
Free jid on caps response handler
|
2015-02-11 00:17:07 +00:00 |
|
James Booth
|
b24510c776
|
Merge branch 'master' into readline
Conflicts:
src/tools/history.c
src/tools/history.h
|
2015-02-11 00:09:58 +00:00 |
|
James Booth
|
421ce2876a
|
Changed default inpblock delay to 1 second
|
2015-02-10 23:40:23 +00:00 |
|
James Booth
|
b3be26a214
|
Updated copyright
|
2015-02-10 23:16:09 +00:00 |
|
James Booth
|
831be52366
|
Merge branch 'master' into readline
|
2015-02-10 21:32:44 +00:00 |
|
James Booth
|
1e2ef97334
|
Fixed parameter order for /tiny in private and group chat
fixes #502
|
2015-02-10 21:27:27 +00:00 |
|
James Booth
|
13297a151f
|
Merge branch 'master' into readline
Conflicts:
src/ui/inputwin.c
|
2015-02-10 20:47:22 +00:00 |
|
James Booth
|
6ab937c3e3
|
Copy list when sorting windows for /wins
|
2015-02-10 20:39:57 +00:00 |
|
James Booth
|
e565812d09
|
Free roster list
|
2015-02-10 20:30:50 +00:00 |
|
James Booth
|
22b92c7514
|
Used g_hash_table_destroy to free logs
|
2015-02-10 19:53:34 +00:00 |
|
James Booth
|
75d7663876
|
Free wins summary list
|
2015-02-10 19:42:13 +00:00 |
|
James Booth
|
30739ed157
|
Free contact list
|
2015-02-10 19:39:18 +00:00 |
|
James Booth
|
6bee6cb0fb
|
Free string on backspace
|
2015-02-10 19:30:18 +00:00 |
|
Olivier LE MOAL
|
48f9f3b3b0
|
Add XEP-0280 support
|
2015-02-10 11:32:22 +01:00 |
|
James Booth
|
64774a947e
|
Merge branch 'master' into readline
|
2015-02-09 22:11:25 +00:00 |
|
James Booth
|
5c9dd2802a
|
Free lists on get muc and private windows
|
2015-02-09 22:08:47 +00:00 |
|
James Booth
|
a9c69670fa
|
Free filtered lists for who command
|
2015-02-09 22:03:17 +00:00 |
|
James Booth
|
38e6dc0e85
|
Free expected_node for legacy caps
|
2015-02-09 21:59:17 +00:00 |
|
James Booth
|
75f791da8f
|
Free hash table keys before modifying hash table
|
2015-02-09 21:53:55 +00:00 |
|
James Booth
|
1a98f1404b
|
Free resource lists
|
2015-02-09 21:46:54 +00:00 |
|
James Booth
|
50601d4db3
|
Removed strdup calls when creating capabilities
|
2015-02-09 21:36:04 +00:00 |
|
James Booth
|
51ccb69580
|
Merge branch 'master' into readline
Conflicts:
src/ui/inputwin.c
|
2015-02-09 21:28:08 +00:00 |
|
James Booth
|
6682f243ce
|
Free theme list after use
|
2015-02-09 21:21:22 +00:00 |
|
James Booth
|
aad7b3ed8a
|
Free GTimer on switch to console
|
2015-02-09 20:15:24 +00:00 |
|
James Booth
|
893b58bf4e
|
Use chat_state_free to free chat states
|
2015-02-09 20:11:51 +00:00 |
|