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
3,706 Commits 32 Branches 59 Tags 24 MiB
5e962fe0f5
Commit Graph

2659 Commits

Author SHA1 Message Date
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
James Booth
23aaa51a2a Free utf8 substrings for delete word (ctrl-w) 2015-02-09 19:59:04 +00:00
James Booth
268c33e1c6 Free resource lists on /account command 2015-02-09 19:50:41 +00:00
James Booth
916ee1dc13 Merge remote-tracking branch 'stormc/readline-clrscr' into readline 2015-02-08 21:35:19 +00:00
James Booth
8cec79faef Merge branch 'master' into readline 2015-02-08 21:03:26 +00:00
James Booth
44c5b34a71 Moved quote stripper to common, added tests 2015-02-08 20:59:51 +00:00
James Booth
236e508cd8 Merge remote-tracking branch 'peterlvilim/quote-chars' 
Conflicts:
	src/command/command.c
 2015-02-08 20:34:20 +00:00
Christian Storm
916a3d9451 Bind ^L to own clear method to retain ui elements 
When using readline's standard ^L binding, the screen
is completely cleared, including status and title bar.
By binding ^L to profanity's clear method, status and
title bar are retained.
 2015-02-08 12:15:01 +01:00
James Booth
129af0eafd Merge branch 'master' into readline 2015-02-08 00:46:55 +00:00
James Booth
e0dfe4832b Added code to generate HTML command reference for website 2015-02-08 00:42:21 +00:00
James Booth
b7a8e7d942 Merge branch 'master' into readline 2015-02-06 22:05:38 +00:00
James Booth
bec95afc8b Removed strdup passed to autocompleter 2015-02-06 22:03:40 +00:00
James Booth
8977c9c721 Removed duplicate time_ac 2015-02-06 21:40:35 +00:00
James Booth
f447ac4189 Free win layout 2015-02-06 21:39:53 +00:00
James Booth
f08657fa9a Handle home scroll 2015-02-06 14:11:21 +00:00
James Booth
2e83d23873 Removed unused function 2015-02-06 00:20:06 +00:00
James Booth
113cb6cf9a Removed debug logging 2015-02-05 01:00:06 +00:00
James Booth
a70aa0255f Moved command processing to main loop, allow resize during password prompt 2015-02-05 00:58:23 +00:00
James Booth
30180ac8bb Move SIGWINCH handling to ui/core.c, ignore signal whilst resizing 2015-02-04 23:35:28 +00:00
James Booth
d64c4a69d7 Removed unused functions from inputwin.c 2015-02-04 22:22:18 +00:00
James Booth
b2536e91c0 Fixed input timout returning EINVAL on OSX 2015-02-04 01:04:56 +00:00
James Booth
7ab301869f Moved readline startup hook 2015-02-03 23:27:06 +00:00
James Booth
8b58eb68d3 Tidied inputwin.c 2015-02-03 23:07:15 +00:00
James Booth
af345b6700 Updated navigation help 2015-02-03 22:24:47 +00:00
James Booth
82ddbf332d Added OSX readline keyseq bindings 2015-02-03 21:38:48 +00:00
James Booth
b76501f0bc Removed mbstate_t use 2015-02-03 21:08:34 +00:00
James Booth
836fdd2eb1 Remove state passed to wide char len check 2015-02-03 21:04:51 +00:00
Olivier LE MOAL
62c1a59f38 Add /carbons in /help settings 2015-02-03 18:19:04 +01:00
Olivier LE MOAL
a89e04b9d5 Fix help for message carbons 2015-02-03 15:48:19 +01:00
Olivier LE MOAL
2a12a4d93b Add preference/commands for carbons message 2015-02-03 15:27:56 +01:00
James Booth
1c157b04df Fixed arrow keys with debug 2015-02-02 23:17:47 +00:00
James Booth
5954c0d2fe Readline osx compatibility 2015-02-02 21:27:58 +00:00
Olivier LE MOAL
e3feacddd6 Add XEP-0280 support 2015-02-02 11:10:05 +01:00
James Booth
51a5426006 Added include for timeval struct 2015-02-01 21:01:00 +00:00
James Booth
372cf822cb Merge branch 'master' into readline 2015-02-01 20:47:28 +00:00
James Booth
702ea0b5f3 Use getc wrapper for autocomplete reset check 2015-02-01 20:14:07 +00:00
James Booth
a9af8785a7 Added more ignore characters to handle activity 2015-02-01 00:35:42 +00:00
James Booth
e8b6c505cb Handle word wrapping wide chars 2015-02-01 00:14:11 +00:00
James Booth
a19c0a5989 Added scroll handler 2015-01-31 22:29:44 +00:00
James Booth
84688c063e Removed commented code, renamed win switch handlers 2015-01-31 22:12:27 +00:00
James Booth
baa122e7dc Added function key bindings 2015-01-31 22:08:00 +00:00
James Booth
28dd545877 Added paging handlers 2015-01-31 22:00:22 +00:00
James Booth
e6f27de552 Added SIGWINCH handler 2015-01-31 18:02:42 +00:00
James Booth
fe10f2b2e3 Clear autocompleters on printable chars 2015-01-31 16:51:09 +00:00
James Booth
2b11baa564 Added readline tab handler 2015-01-31 01:58:15 +00:00
James Booth
b3448eb265 Moved input blocking code to inputwin.c 2015-01-31 01:11:41 +00:00
James Booth
e161337b7f Debug input block 2015-01-31 00:31:08 +00:00
James Booth
f94b6ef0a2 Added idle and activity handlers 2015-01-31 00:20:25 +00:00
James Booth
1cf5592b1f Removed unused variables 2015-01-30 23:46:34 +00:00
James Booth
784a2ea862 Removed commented code 2015-01-30 23:44:17 +00:00
James Booth
a9ed64911d Removed history and various key handlers 2015-01-30 23:42:51 +00:00
James Booth
83bd207316 Moved readline code to inputwin.c 2015-01-30 23:28:02 +00:00
James Booth
5b26879e31 Updated /wrap help 2015-01-28 20:59:25 +00:00
James Booth
351ff752a7 Renamed command group presence->presences to avoid clash 2015-01-28 20:35:00 +00:00
James Booth
ec28888915 Strip only trailing newline from eval_password 2015-01-28 19:50:16 +00:00
Will Song
7f436d614b
use custom format string for time preference 2015-01-27 19:55:16 -06:00
James Booth
6529220351 Strip leading/trailing whitespace from result of eval_password 
fixes #495
 2015-01-28 00:52:10 +00:00
James Booth
9800a46adb Fixed compile error when no OTR support 2015-01-28 00:04:37 +00:00
James Booth
2cdbfc7eb7 Added gnu readline 2015-01-27 22:13:09 +00:00
James Booth
25d31101bf Added key insert tests, extracted key_ctrl_left handler 2015-01-20 23:02:04 +00:00
James Booth
2ed78fe5af Extracted keyhandler for printable characters 2015-01-20 00:09:47 +00:00
James Booth
0e8092afef Inlined static functions in inputwin 2015-01-19 20:51:41 +00:00
James Booth
9ecdb39433 Refactor inputwin.c 2015-01-18 22:55:51 +00:00
James Booth
8954adc620 Handle wide chars for arrow keys and backspace 2015-01-18 19:55:48 +00:00
James Booth
89260280d1 Fix backspace for utf8 wide chars 2015-01-17 22:03:22 +00:00
James Booth
ba89297382 Added utf8_display_len 2015-01-17 21:09:40 +00:00
James Booth
4ac11ddcd6 Merge branch 'master' into inp-utf8 2015-01-16 23:39:34 +00:00
James Booth
036d13b80c Removed debug 2015-01-16 23:38:21 +00:00
James Booth
18f05c59ee Fixed merge 2015-01-16 23:35:31 +00:00
James Booth
8805fd5c38 Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-16 23:34:32 +00:00
James Booth
e1db13ea2b Renamed input variables 2015-01-16 23:32:57 +00:00
James Booth
972d524fdc Merge branch 'master' into inp-utf8 2015-01-16 23:12:00 +00:00
James Booth
4c6cfcdca0 Simplified autocompleters and command history 2015-01-16 22:50:40 +00:00
James Booth
9fad03af74 Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-16 00:41:02 +00:00
James Booth
7a5deca77c Removed static function arguments in inputwin.c 2015-01-16 00:36:42 +00:00
James Booth
f0ffc31cd6 Renamed inp_get_char->inp_read 2015-01-15 23:46:54 +00:00
James Booth
9083bfdb5c Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-15 23:45:18 +00:00
James Booth
51105720ab Moved input line to inputwin 2015-01-15 23:43:22 +00:00
James Booth
bb11dc0973 Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-15 23:31:06 +00:00
James Booth
65fc4bcd9f Pass pointers to inp_get_char 2015-01-15 23:29:48 +00:00
James Booth
22e9be4a5f Renamed input->line 2015-01-15 22:55:54 +00:00
James Booth
e326aaa84f Merge branch 'master' into inp-utf8 
Conflicts:
	src/ui/inputwin.c
 2015-01-15 22:53:50 +00:00
James Booth
ad896ef201 Moved input size to inputwin 2015-01-15 22:51:05 +00:00
James Booth
173a3a82bb Merge branch 'master' into inp-utf8 2015-01-15 22:25:15 +00:00
James Booth
82c986775d Moved input to ui module, renamed ui_readline 2015-01-15 22:21:24 +00:00
James Booth
2efb2fef50 Merge branch 'master' into inp-utf8 2015-01-15 20:49:07 +00:00
James Booth
b43252a6b3 Tidy main loop 2015-01-15 20:46:15 +00:00
James Booth
60c0b9f63d Merge branch 'master' into inp-utf8 2015-01-15 20:39:57 +00:00
James Booth
3656c78217 Moved process_input to cmd_process_input 2015-01-15 20:34:45 +00:00
James Booth
a7dff070a4 Merge branch 'master' into inp-utf8 2015-01-15 13:31:13 +00:00
James Booth
5be47cc5a9 Moved input size variable to ui module 2015-01-15 13:22:54 +00:00
James Booth
6beeec03d4 Merge branch 'master' into inp-utf8 2015-01-15 01:31:23 +00:00
James Booth
40f91de7a3 Moved string termination out of main loop 2015-01-15 01:27:24 +00:00
James Booth
aec1484806 Removed ch from main loop 2015-01-15 01:21:24 +00:00
James Booth
78bfd8da40 Merge branch 'master' into inp-utf8 2015-01-15 01:06:33 +00:00
James Booth
3b69ad7b61 Tidy profanity.c 2015-01-15 00:56:17 +00:00
James Booth
0007e3569e Moved remimder notification code out of main loop 2015-01-15 00:42:40 +00:00
James Booth
a1bbe07b4b Renamed notify remind timer 2015-01-15 00:26:59 +00:00
James Booth
17b966adb4 Merge branch 'master' into inp-utf8 2015-01-15 00:19:22 +00:00
James Booth
97aebb6113 Moved win_handle_page to window module 2015-01-15 00:14:12 +00:00
James Booth
db9a2cf0ab Inlined ui_handle_special_keys 2015-01-15 00:02:42 +00:00
James Booth
3984c660b6 Removed result from main loop 2015-01-14 23:57:45 +00:00
James Booth
a6160d52c6 Pass value rather than address of ch during main loop 2015-01-14 23:54:46 +00:00
Peter Vilim
7e8ab90d39 Strip quote chars from name autocomplete 2015-01-14 17:22:32 -06:00
James Booth
41b2b1c51f Calculate input win display size includes wide characters 2015-01-14 23:17:10 +00:00
James Booth
ee14e8d05e Merge remote-tracking branch 'incertia/fixleak' 2015-01-14 22:02:45 +00:00
James Booth
5cf7ef0b4f Don't free default account name until it has been lowercased 2015-01-14 21:52:13 +00:00
Will Song
dc43cc602c
fix yet another potential leak 2015-01-14 11:10:14 -06:00
Simon Effenberg
6f55d06e2b fix the fix (memory leak) 
the "fix a potential leak" from Will Song is not fully addressing the
issue.. so now the "def" variable should definitely being freed
 2015-01-14 08:18:52 +01:00
James Booth
e19d57779f Fixed segfault on eval_password due to moving popen call 2015-01-14 00:35:31 +00:00
Will Song
1264265691
fix a potential leak 2015-01-12 23:00:03 -06:00
Will Song
b1f79b9d35
add a memory check just in case 2015-01-12 22:51:00 -06:00
Will Song
b6536ddf88
fix tests 2015-01-12 22:39:12 -06:00
Will Song
c2758616d8
eval_password code is now in cmd_connect so that it can be changed 
without clearing it. eval_password errors are also now ignored, along
with pclosing the popened eval_password.
 2015-01-12 22:23:36 -06:00
James Booth
274d6e843e Show eval_password if exists on /account show 2015-01-13 00:51:21 +00:00
James Booth
a932998fb1 Removed unused include, free eval_password 2015-01-13 00:43:17 +00:00
James Booth
21f8b1c4ca Merge remote-tracking branch 'peterlvilim/keyring' 2015-01-13 00:41:56 +00:00
James Booth
a39ac6cd07 Merge remote-tracking branch 'savar/dynamic_input_block' 2015-01-12 23:41:15 +00:00
Simon Effenberg
34148e2101 adding preference option for dynamic input blocking 
/inpblock is now having subcommands 'timeout' and 'dynamic'
with:

/inpblock timeout <milliseconds>

and

/inpblock dynamic <on|off>

Defaults are:

/inpblock timeout 500
/inpblock dynamic on

To get the old behavior specify:

/inpblock timeout 20
/inpblock dynamic off

The dynamic mode will block incrementally after something
should be written to the window or after a key was pressed. So pressing
a key would set the timeout to 0ms and after 10 timeouts to the next
bigger one.

Example (with dynamic mode on):

"/inpblock timeout 50"

timeout series:

10x 0ms
10x 10ms (0ms + 10 times since last keypress)
10x 30ms (10ms + 20 times since last keypress)
*x50ms until next key was pressed or
 2015-01-12 11:32:32 +01:00
Simon Effenberg
c7ff3255b8 trying to block (and save cpu power) more dynamically 
instead of blocking too long if inpblock is set to something like
500ms the input timeout is not set directly to inpblock but is
increasing dynamically from 0 to inpblock by a little algorithm

FIXME: the call from the win_* method to the ui_input_* method looks
wrong.. this causes a cross reference which shouldn't be
 2015-01-12 08:08:07 +01:00
James Booth
0d0ed9b7ca Merge remote-tracking branch 'incertia/exit-title' 
Conflicts:
	src/command/command.c
	src/config/preferences.c
	src/config/preferences.h
 2015-01-12 01:12:42 +00:00
James Booth
c64484c6ed Renamed titlebar preference 2015-01-12 00:43:42 +00:00
James Booth
f2728096ea Use /gone preference 2015-01-11 23:25:50 +00:00
James Booth
13f0166aa0 Only show UI events for chat states when in session 2015-01-11 23:04:22 +00:00
James Booth
c16871d143 Added remaining chat states 2015-01-11 20:20:17 +00:00
James Booth
76bd2ec13f Send active chat state, handle composing and gone from recipients 2015-01-10 22:03:40 +00:00
James Booth
965e82b350 Added resource override for chat sessions 2015-01-10 21:07:40 +00:00
James Booth
7256e49396 Merge branch 'master' into chat-sessions 2015-01-10 19:23:59 +00:00
James Booth
c77a731cf0 Added comments to preferences module 2015-01-10 19:22:38 +00:00
James Booth
31c0f2ba78 Added preferences for showing resource in titlebar and messages 2015-01-10 19:10:10 +00:00
James Booth
c3ad3c0ba6 Show resource in titlebar and on each message 2015-01-10 18:35:59 +00:00
James Booth
3e1832b02e Renamed resource -> resource_override 2015-01-10 18:17:10 +00:00
James Booth
9bd2315d83 Fixed chat session tests 2015-01-10 00:25:27 +00:00
Will Song
e57fa1633a add exit title preference to group and add command for setting the preference 2015-01-08 10:18:29 -06:00
Will Song
22a8d7a8a3
check preferences before printing exit title 2015-01-08 10:06:39 -06:00
Will Song
89aaaddfbb Merge remote-tracking branch 'upstream/master' into exit-title 2015-01-08 10:03:15 -06:00
Will Song
f1641f3cf7
add exit title preference 2015-01-08 10:02:30 -06:00
Peter Vilim
0cb548683c fgets: buffer size 2015-01-07 21:37:35 -06:00
Peter Vilim
b298994ce7 fix for fgets 2015-01-07 21:16:18 -06:00
Peter Vilim
887cc1f419 merge 2015-01-07 21:07:32 -06:00
James Booth
5e7d2f5f91 Removed chat states from chat_session module, WIP 2015-01-08 00:57:25 +00:00
Peter Vilim
492c548aa6 Add support for evaluated password 2015-01-07 02:54:42 -06:00
Peter Vilim
b4f37b9e31 iofixed 2015-01-07 00:17:59 -06:00
Peter Vilim
401835f32a Add support for evaluated password 2015-01-06 23:00:02 -06:00
James Booth
8bbf126e83 Refactored chat sessions in _chat_handler 2015-01-07 00:17:54 +00:00
James Booth
95ad564372 Added offline handler for chat sessions 2015-01-06 23:19:56 +00:00
James Booth
ab963499b5 Log instead of showing error message when chat recipient not found 2015-01-06 21:51:41 +00:00
James Booth
9cb0d52e7d Added removal of chat sessions, only send gone when messages have been exchanged 2015-01-05 23:39:43 +00:00
James Booth
c2dccad818 Create chat session when no resource 2015-01-05 00:48:30 +00:00
James Booth
8326c8b3a2 Refactored chat session handling on sending message 2015-01-04 23:40:10 +00:00
James Booth
42a5c431c7 Use resource in chat sessions 2015-01-04 20:19:42 +00:00
James Booth
4898ed10a4 Fix for receiving regular chat messages with no type attribute 2015-01-04 17:54:56 +00:00
Will Song
30610f7c48 Merge remote-tracking branch 'upstream/master' into exit-title 2015-01-03 12:41:42 -06:00
James Booth
f5e5315125 Updated CHANGELOG and navigation help 2015-01-03 02:35:19 +00:00
Will Song
832074de4a
fix tests (hopefully) and use /bin/echo to avoid use of builtin shell commands 2015-01-02 20:05:55 -06:00
James Booth
ad1460626f Use /bin/echo for terminal window title 2015-01-03 01:35:27 +00:00
James Booth
90b851c848 Merge branch 'master' into title 2015-01-03 01:10:41 +00:00
Will Song
e4e1d5e29b
now using system("echo -ne ...") to print title 2015-01-01 23:02:41 -06:00
Will Song
e21bc7afe0
added more signals to ignore in _init 2015-01-01 22:52:01 -06:00
James Booth
1a61b4faf4 Changed logging for writing to terminal window title 2015-01-01 22:51:52 +00:00
James Booth
0a7277a7f5 Merge branch 'master' into title 2015-01-01 22:47:09 +00:00
James Booth
ab75059703 Added correct Ctrl-U handling back 2015-01-01 22:44:21 +00:00
James Booth
0d25ae6d7e Merge branch 'master' into title 2015-01-01 22:37:47 +00:00
James Booth
e7501e581c Merge remote-tracking branch 'andrewgho/readline-style-keybindings' 2015-01-01 22:36:48 +00:00
Andrew Ho
7fac4bcc14 Add readline-style keybindings 2014-12-30 22:36:54 -08:00
James Booth
d572474fed Default title bar update to false 2014-12-31 01:50:16 +00:00
James Booth
032baa78a1 Use system command to print window title 2014-12-31 01:48:52 +00:00
Will Song
3561ff4d97
set a nice title (instead of empty) on shutdown 2014-12-29 20:05:50 -06:00
James Booth
e7ddff61dc Merge remote-tracking branch 'savar/master' 2014-12-29 16:04:21 +00:00
James Booth
aebee209b2 Merge remote-tracking branch 'incertia/connect-default' 
Conflicts:
	CHANGELOG
 2014-12-29 15:29:28 +00:00
James Booth
1c35321cb3 Fixed cmd_execute_default (resource instead of barejid) 2014-12-29 02:22:01 +00:00
James Booth
254179e128 Removed active and composing static functions 2014-12-29 02:17:20 +00:00
James Booth
e75b8dcfb3 Renamed recipient->barejid in chat sessions 2014-12-29 02:08:06 +00:00
James Booth
894360dc81 Removed static functions from chat_session 2014-12-29 01:54:33 +00:00
James Booth
a50d1ece43 Refactored chat session creation 2014-12-29 01:24:42 +00:00
James Booth
10a3a3a675 Use events for chat sessions 2014-12-29 01:17:59 +00:00
James Booth
4be06c0ae2 Moved chat_session_set_sent from message.c module 2014-12-29 00:31:57 +00:00
James Booth
fe2ef44cac Added chat_session_on_incoming_message 2014-12-29 00:16:40 +00:00
James Booth
671ee0b876 Added chat_session_on_window_open 2014-12-28 23:56:48 +00:00
James Booth
ac4b59eda0 Fixed chat state for non OTR 2014-12-28 22:45:25 +00:00
James Booth
53ecd3b383 Merge branch 'master' into chat-sessions 2014-12-27 00:58:33 +00:00
James Booth
3b95946083 Fixed /info command in rooms 2014-12-27 00:56:39 +00:00
James Booth
e602c2909e Moved chat states out of xmpp module for message send chat 2014-12-27 00:52:34 +00:00
James Booth
676ed1cbae Fixed non OTR compilation 2014-12-25 01:18:45 +00:00
Simon Effenberg
d987897c0b fix idle calculation if not using LIBXSS 
the inp_get_char was never returning ERR even without getting any input
so the idle timeout stuff was wasting CPU and wasn't working if LIBXSS
wasn't used.
 2014-12-23 12:01:31 +01:00
James Booth
9d94ac5c63 Removed function pointers 2014-12-22 22:13:42 +00:00
Will Song
eb2986d531 added warning about options not being used 2014-12-21 20:09:55 -06:00
James Booth
3cbeb7b483 Removed ui_current_set_otr 2014-12-22 00:37:06 +00:00
James Booth
bda98a416e Removed ui_close_current 2014-12-22 00:34:56 +00:00
James Booth
1c71cf0037 Removed functions from windows.c 2014-12-22 00:28:03 +00:00
James Booth
86dc29d8e8 Removed functions from window.c 2014-12-22 00:01:43 +00:00
James Booth
d5dee1632d Moved unread to window subtypes 2014-12-21 23:14:01 +00:00
James Booth
eef7f9cfd4 Show nick for title 2014-12-21 22:39:00 +00:00
James Booth
0c1bbb63c0 Added win_get_title 2014-12-21 22:01:56 +00:00
James Booth
d41ac71d27 Tidy titlebar.c 2014-12-21 20:55:58 +00:00
James Booth
9a322a028f Use class instead of base pointer 2014-12-21 19:40:15 +00:00
James Booth
13f73a30e7 Added /inpblock command 2014-12-21 18:15:29 +00:00
James Booth
79d4cbe967 Fixed /occupants hide 2014-12-20 22:44:01 +00:00
James Booth
39aae7f548 Removed TODOs 2014-12-20 18:48:35 +00:00
James Booth
6800bf1cad Fixed tests 2014-12-20 18:39:39 +00:00
James Booth
ea267e2017 Refactored all window recipients and types 
Tests need fixing
 2014-12-20 00:52:35 +00:00
James Booth
0146e62576 Refactoring window types, removing recipient and from references - wip 2014-12-18 23:57:19 +00:00
James Booth
76c665e986 Tidy occupantswin.c 2014-12-16 23:50:25 +00:00
James Booth
4dc48b4b48 Added occupantswin.c 2014-12-16 23:37:23 +00:00
James Booth
052eee3c3e Refactor rosterwin.c 2014-12-16 23:16:23 +00:00
James Booth
48ec7b3b47 Moved roster functions 2014-12-16 23:00:05 +00:00
James Booth
0e7e931589 Added rosterwin.c 2014-12-16 22:14:15 +00:00
James Booth
0ac789e48c Fixed window resize 2014-12-16 21:18:32 +00:00
James Booth
0880b217cb Tidied subwin paging 2014-12-16 21:08:48 +00:00
James Booth
8f6167b45e Refactor layout creation 2014-12-16 20:53:23 +00:00
James Booth
630fef015d Added new window and layout types 2014-12-16 01:39:47 +00:00
James Booth
070547a7ff Added window specific creation functions 2014-12-15 00:28:28 +00:00
James Booth
3cef4e1db4 Merge remote-tracking branch 'origin/master' 2014-12-14 23:05:27 +00:00
James Booth
65c9c3a7fc Allow params to /bookmark when in a room 2014-12-14 19:57:29 +00:00
James Booth
70f7db0d91 Subscription handler uses wins_new_chat 2014-12-11 00:02:51 +00:00
James Booth
8e46b9e75b Added win create functions for chat and private chat 2014-12-10 22:34:33 +00:00
James Booth
9ba5a576ba Split private message handling to separate functions 2014-12-10 22:23:33 +00:00
James Booth
c8ae55a88c Removed unused argument from _wins_show_history 2014-12-10 21:49:21 +00:00
James Booth
742748b05c Renamed chat_resource -> resource 2014-12-10 21:17:31 +00:00
James Booth
706f31422d Moved chat resource to WIN_CHAT type 2014-12-10 01:44:32 +00:00
James Booth
12d0d22ab3 Moved otr properties to WIN_CHAT type 2014-12-10 01:33:46 +00:00
James Booth
7b44ac97cc Added form to WIN_MUC_CONFIG type 2014-12-10 01:14:11 +00:00
James Booth
0ce924465f Added union for window types 2014-12-10 00:54:46 +00:00
James Booth
0f7519663d Changed ChatSession typedef 2014-12-07 22:59:13 +00:00
James Booth
5314e59703 Added /resource autocompletion 2014-12-04 00:16:42 +00:00
James Booth
eeb6e6b8fc Use selected resource for sending messages 2014-12-03 23:36:39 +00:00
James Booth
d652c3c7ac Show resource presence with /resource command 2014-12-02 21:06:29 +00:00
James Booth
1a8c805319 Added /resource command 2014-12-02 20:50:21 +00:00
James Booth
aae88753a3 Tidied title bar draw 2014-12-02 20:05:52 +00:00
James Booth
e756daf2be Fixed closing window 0 2014-12-01 23:15:22 +00:00
James Booth
4740f84c24 Updated navigation help 2014-12-01 22:16:25 +00:00
James Booth
b704fb1777 Merge remote-tracking branch 'origin/ctrl-w' into ctrl-w 2014-12-01 22:14:09 +00:00
James Booth
bca36bfcbf Removed debug 2014-12-01 22:13:42 +00:00
James Booth
0a3365d297 Added ifdef to _show_privacy() function 2014-12-01 21:54:32 +00:00
James Booth
fe021a226c Added ctrl-w support (with debug) 2014-12-01 21:45:08 +00:00
James Booth
71ed9ac2d1 Fixed /me messages in chat room history 2014-12-01 13:38:17 +00:00
James Booth
8fee155797 Automatically add/remove '/' when adding and removing aliases 2014-11-30 23:34:54 +00:00
James Booth
e70cbd1b61 Colour /me messages correctly 
fixes #457
 2014-11-30 22:50:02 +00:00
James Booth
5875dcfd53 Only overwrite preferences with theme when them loaded, not on startup 2014-11-30 21:25:13 +00:00
James Booth
aec7afd06a Added caching of legacy capabilities 2014-11-30 00:37:36 +00:00
Will Song
6a3285795a removing the account connected to the default account removes the default account as well 2014-11-27 20:26:10 -06:00
Will Song
3b13c00df4 /connect supports default account 2014-11-27 13:18:54 -06:00
Will Song
b23c60953f add some tooltip messages for /account and /connect 2014-11-27 12:28:16 -06:00
Will Song
b5a40f5b04 finish /account default ac 2014-11-27 12:11:47 -06:00
Will Song
48778265e7 add a bit of default account autocomplete 2014-11-27 12:07:18 -06:00
Will Song
de9e621bb7 add default account property and commands associated with them 2014-11-27 11:42:23 -06:00
James Booth
94bd9dbdfe Store capabilities against fulljid when unsupported hash 2014-11-27 01:08:02 +00:00
James Booth
e263e00a85 Refactored parsing caps 2014-11-26 21:59:36 +00:00
James Booth
508bfeb2bf Refactored available presence handler 2014-11-26 21:07:46 +00:00
James Booth
ed228ebb59 Merge remote-tracking branch 'incertia/master' 2014-11-24 00:54:51 +00:00
James Booth
679513ae73 Merge remote-tracking branch 'incertia/account-remove' 2014-11-24 00:38:22 +00:00
James Booth
d1c5cfefb6 Free contact list on /who 2014-11-24 00:32:30 +00:00
James Booth
05664ef009 Free string after setting theme ui preference, fixed valgrind warning 2014-11-24 00:29:02 +00:00
Will Song
be031bbe54 implement account removal 2014-11-23 15:53:13 -06:00
Will Song
915c3633e8 implement account removal 2014-11-23 15:37:10 -06:00
Will Song
035dc313dd add nooffline to /roster autocomplete 2014-11-23 02:06:04 -06:00
Will Song
553f8b54cc updated description for /roster 2014-11-23 02:03:26 -06:00
Will Song
e113fd2b1d roster_get_contacts_nooffline only gets contacts that are not offline 2014-11-23 02:00:56 -06:00
Will Song
a980fbe0bd add nooffline option to roster 2014-11-23 01:34:09 -06:00
Will Song
0f2035e4ad add functions for getting roster list without offline contacts (but not implemented) 2014-11-23 01:33:23 -06:00
James Booth
f486b5884b Added Alt-Backspace to navigation help 2014-11-22 22:12:32 +00:00
James Booth
b819ea3708 Fix autocomplete clash, fix crash on opening window when recipient not in roster 2014-11-22 21:55:33 +00:00
James Booth
6772935493 Remove contact lookup when showing OTR privacy 2014-11-22 21:26:53 +00:00
James Booth
e8a65e3b68 Renamed roster autocomplete functions 2014-11-22 21:13:33 +00:00
James Booth
c0420e9cfb Merge branch 'autocomplete_fix' 2014-11-22 20:41:57 +00:00
James Booth
d965709910 Tidied whitespace 2014-11-22 20:41:47 +00:00
James Booth
3e98df7a2f Fixed autoaway help 2014-11-20 23:31:20 +00:00
James Booth
cdba79cbb5 Merge branch 'master' into autocomplete_fix 2014-11-20 22:37:14 +00:00
James Booth
5030d49952 Removed bookmark autojoin limit 2014-11-20 22:33:46 +00:00
James Booth
f24b348739 refactor parts of title bar render out of _title_bar_draw 2014-11-20 21:32:19 +00:00
James Booth
81b1009fd9 Updated /theme usage 2014-11-20 01:50:04 +00:00
James Booth
9d9ffb08cf Show roster after roster received 2014-11-20 00:32:33 +00:00
James Booth
20fa96325d Added [ui] preferences to themes 2014-11-19 23:58:55 +00:00
James Booth
1a896d7b53 Tidied theme.c 2014-11-19 16:53:40 +00:00
James Booth
076576178c Update input window on /theme set 2014-11-19 16:32:26 +00:00
James Booth
a781295542 Added newline 2014-11-17 21:14:03 +00:00
James Booth
1d5ac1b474 Added /theme colours command 2014-11-17 21:10:08 +00:00
James Booth
74d9937573 Changed type to enum for presence colour attributes 2014-11-16 23:37:07 +00:00
James Booth
976e5aac0a Added support for bold theme settings 2014-11-16 21:56:19 +00:00
James Booth
ed4391ec8a Replaced colours with theme_item_t 2014-11-16 20:40:19 +00:00
James Booth
90dd1de91a Fixed indentation bug 2014-11-16 16:27:11 +00:00
James Booth
cd855d3740 Added /time off 2014-11-16 01:28:41 +00:00
James Booth
8c027a56f9 Implemented /time preference 2014-11-16 01:11:00 +00:00
James Booth
40dc8e2c49 Added /time setting 2014-11-16 00:40:54 +00:00
James Booth
1479a5e134 Added /roster size and /occupants size settings 2014-11-15 23:47:27 +00:00
James Booth
3a778cc974 Added seperate values for roster and occupants win sizes 2014-11-15 22:59:13 +00:00
James Booth
3642797146 Changed subwin width to percentage 2014-11-15 22:26:43 +00:00
James Booth
dad8e2799d Fixed roster resource list 2014-11-13 01:19:20 +00:00
James Booth
0a7c16747b Fixed freeing lists 2014-11-13 01:01:41 +00:00
James Booth
ada6f5a8b6 Fixed leaks 2014-11-13 00:47:07 +00:00
James Booth
4e429fe788 Implemented /roster by group 2014-11-13 00:22:22 +00:00
James Booth
15d0f679f6 Implemented roster grouped by presence 2014-11-12 23:19:07 +00:00
James Booth
7e360dc35a Fixed printing utf8 chats to roster, changed boothj5 theme 2014-11-11 00:54:10 +00:00
James Booth
a45cb4bb3c Added /roster by commands, wip 2014-11-11 00:30:29 +00:00
James Booth
eace543da5 Added /roster show|hide resource 2014-11-11 00:00:10 +00:00
James Booth
f715c0580c Added /roster show|hide offline 2014-11-10 23:51:13 +00:00
James Booth
497b07c1c3 Added /roster show|hide command, only show roster on connect success 2014-11-10 23:23:02 +00:00
James Booth
5d59d17642 Refactor subwin sizing and disabled wrapping 2014-11-10 22:47:53 +00:00
James Booth
04bacdcf38 Order resources in roster, allow paging roster 2014-11-10 01:10:43 +00:00
James Booth
48afa52390 Show resources and only subscribed contacts in roster panel 2014-11-10 00:46:20 +00:00
James Booth
36331e4908 Added simple roster 2014-11-10 00:31:11 +00:00
James Booth
eed8f6c76d Added subwin to console 2014-11-10 00:06:13 +00:00
James Booth
46583839df Added /wrap user preference for enabling/disabling word wrapping 2014-11-09 23:29:25 +00:00
James Booth
70501f5dbf Wordwrap, handle words bigger than line space 2014-11-09 23:05:53 +00:00
James Booth
fbda2b4170 Fixed history messages to work with wrapping 2014-11-09 00:36:25 +00:00
James Booth
bcfbc9f7b3 Added time to xmlconsole, handle newlines in messages 2014-11-08 22:35:47 +00:00
James Booth
da376b26d6 Simple word wrap 2014-11-08 21:16:16 +00:00
James Booth
ecef8f7956 Print one word at a time 2014-11-08 21:03:28 +00:00
James Booth
373b3a2d7c Added /presence command to show contacts presence 2014-11-07 22:38:34 +00:00
James Booth
571db23150 Use message theme settings in chat rooms 2014-11-07 21:05:51 +00:00
James Booth
0bde9a6121 Use message theme setting for regular chat 2014-11-07 20:54:55 +00:00
James Booth
f56cc9761f Added main.text.me and main.text.them theme settings 2014-11-07 20:46:31 +00:00
James Booth
e445356c5a Updated /who help 2014-11-05 23:17:14 +00:00
James Booth
74a2d4601f Removed hash_table_iter usage for room roster 2014-11-03 21:27:41 +00:00
James Booth
7a03dd7641 Free datetime on ping errors 2014-11-03 21:09:49 +00:00
James Booth
c4ab9405f6 Fixed leaks in /affiliation and /role 2014-11-03 20:57:22 +00:00
James Booth
c4412fe823 Fixed various memory leaks 2014-11-01 01:48:36 +00:00
James Booth
b6c116e8b6 Updated help 2014-10-27 20:52:45 +00:00
James Booth
d1e99ab920 Updated /account clear help 2014-10-27 20:37:51 +00:00
James Booth
c8b524d9c8 Show message on /prefs desktop when notifications not supported by the build 2014-10-26 22:20:37 +00:00
James Booth
6c980969e0 Added compile time checks for big endian from @pasis 2014-10-26 21:43:50 +00:00
James Booth
d7911664e1 Merge branch 'master' into symlinks 2014-10-26 20:53:33 +00:00
James Booth
be7c4f5a00 Follow symlinks for profrc and accounts files 2014-10-26 20:43:05 +00:00
James Booth
fea8945953 Updated /info help 2014-10-24 19:23:37 +01:00
James Booth
25b673a422 Updated /form help 2014-10-24 19:14:38 +01:00
James Booth
bc563851aa Updated privileges help 2014-10-24 19:11:23 +01:00
James Booth
5fc35bd6a6 Changed room help colour, added whitespace after invalid field setting 2014-10-24 00:21:00 +01:00
James Booth
0b61c75969 Removed room unlocked console message 2014-10-24 00:00:37 +01:00
James Booth
fa834d003c Added locked messages when joining rooms 2014-10-23 23:58:25 +01:00
James Booth
60e3f91cf6 Removed console message when joining locked rooms 2014-10-23 23:56:31 +01:00
James Booth
c014bb34b3 Renamed room destroy function 2014-10-23 23:33:12 +01:00
James Booth
84765969e0 Added /account clear [account] port 2014-10-23 23:12:15 +01:00
James Booth
552d88b931 Added /account clear [account] server 2014-10-23 23:07:27 +01:00
James Booth
a78891b8b3 Added patch from @pasis for big endian architectures 2014-10-21 23:56:24 +01:00
James Booth
140cf0cbb0 Revert "Removed 0.4.5 todo" 
This reverts commit e1f5cfb928.
 2014-10-20 21:01:27 +01:00
James Booth
e1f5cfb928 Removed 0.4.5 todo 2014-10-20 20:58:49 +01:00
James Booth
7a88898a21 Implemented new field commands 2014-10-19 03:27:34 +01:00
James Booth
272fbf2f0f Updated form field help 2014-10-19 01:27:44 +01:00
James Booth
ecb2989a5d Added /form help autocomplete 2014-10-19 01:23:06 +01:00
James Booth
7973e0b683 Refactor form field and form autocompleters 2014-10-19 01:09:53 +01:00
James Booth
23ff88f27f Added all autocompelers for form fields 2014-10-19 01:01:31 +01:00
James Booth
f1097daaa3 Added autocomplete for /field list-single types 2014-10-19 00:34:09 +01:00
James Booth
5818fbe7bb Added autocomplete for /field boolean types 2014-10-19 00:26:02 +01:00
James Booth
04a6504689 Remove fields from command autocomplete on form submit/cancel 2014-10-18 23:56:10 +01:00
James Booth
6246c8b940 Add fields to command autocompleter on switch/previous/next 2014-10-18 23:16:19 +01:00
James Booth
bd03bbad73 Moved previous win function 2014-10-18 22:43:47 +01:00
James Booth
bb3f1b0909 Set file permissions for logs 2014-10-18 21:41:39 +01:00
James Booth
c6ae459cd5 Set file permissions for preferences file 2014-10-18 21:26:38 +01:00
James Booth
462cf67f1d Set file permissions for accounts file 2014-10-18 21:23:42 +01:00
James Booth
bbf807ea97 Fixed message on /ban in private conversations 2014-10-18 20:35:23 +01:00
James Booth
fc049c9eef Added /privileges command to set UI option for showing roles/affiliations in rooms 2014-10-18 20:22:34 +01:00
James Booth
0cc25e1b76 Removed debug messages when setting roles/affiliations 2014-10-18 19:19:01 +01:00
James Booth
77674beb7e Show occupants role/affiliation changes 2014-10-18 19:10:50 +01:00
James Booth
67755ca74d Added reason to role/affiliation changes 2014-10-18 01:37:52 +01:00
James Booth
3790b16299 Add output for when both role and affiliation changed at same time 2014-10-18 01:07:25 +01:00
James Booth
9134a65e97 Show occupants role and affiliation when they join a room 2014-10-18 00:52:42 +01:00
James Booth
014f0f7a91 Don't show join messages on subsequent /join commands 2014-10-18 00:40:44 +01:00
James Booth
48929aa92e Removed /help other 2014-10-18 00:18:10 +01:00
James Booth
9f2f54b2a0 Removed /duck command 2014-10-18 00:07:48 +01:00
James Booth
6b6ed6a93e Show role/affiliation on room join and on change 2014-10-12 02:10:46 +01:00
James Booth
da373e9097 Added validation to /role and /affiliation 2014-10-12 01:32:15 +01:00
James Booth
77684cda00 Allow /role list and /affiliation list with no args 2014-10-12 01:10:46 +01:00
James Booth
8b1d0bdc3f Added /affiliation and /role commands 2014-10-12 00:43:58 +01:00
James Booth
c66d03539d Removed /room info command, covered by /info 2014-10-11 23:37:04 +01:00
James Booth
8b77f527c0 Moved /room subject to /subject 2014-10-11 23:13:56 +01:00
James Booth
9054427144 Moved /room ban to /ban 2014-10-11 23:13:22 +01:00
James Booth
02a4beb6fe Moved /room kick to /kick 2014-10-10 13:35:50 +01:00
James Booth
6a2bc79ca6 Fixed nick changes 2014-10-10 02:25:52 +01:00
James Booth
ed9266f959 Added key code for ctrl-left ctrl-right 2014-10-09 22:43:06 +01:00
James Booth
3615736762 Renamed args to /occupants default 2014-10-09 22:39:57 +01:00
James Booth
ce7cb3f40f Added occupants UI preference 2014-10-09 22:02:39 +01:00
James Booth
cbe14d6e4e Implemented /occupants show 2014-10-09 21:42:09 +01:00
James Booth
73262221f5 Implemented /occupants hide 2014-10-09 21:27:16 +01:00
James Booth
778a495fbd Added /occupants commands, unfinished 2014-10-09 13:16:36 +01:00
James Booth
f6e0a219ff Add key codes for shift arrow keys on ITerm 2014-10-08 00:50:28 +01:00
James Booth
ef62104d63 Added larger occupants pad size 2014-10-08 00:34:26 +01:00
James Booth
4f0009312f Added help to form config 2014-10-07 21:31:34 +01:00
James Booth
fb84c6dcd0 Fixed spelling 2014-10-07 21:21:03 +01:00
James Booth
b8ba9b038c Added scroll support to occupant list 2014-10-07 21:12:19 +01:00
James Booth
639796384a Handle occupant list resize 2014-10-07 17:06:02 +01:00
James Booth
0c24b53bfa Added room occupants panel 2014-10-07 16:37:14 +01:00
James Booth
0e18b10b8e Include self in room roster 2014-10-07 01:16:46 +01:00
James Booth
d8eb97eec8 Refactor handle_muc_occupant_online 2014-10-07 00:57:51 +01:00
James Booth
d6a4af9992 Refactor muc user handler 2014-10-07 00:46:08 +01:00
James Booth
ea511f8fbc Refactor muc_user_handler 2014-10-07 00:22:39 +01:00
James Booth
3228746827 Added /room ban command 2014-10-06 23:17:40 +01:00
James Booth
78a1556f12 Added jid autocomplete for affiliation commands 2014-10-06 22:59:25 +01:00
James Booth
965f048b18 Implemented setting and listing roles 2014-10-06 21:42:09 +01:00
James Booth
2aeaad230e Allow setting "none" affiliation 2014-10-06 00:38:29 +01:00
James Booth
d12534c58e Implemented /room kick command 2014-10-05 20:52:34 +01:00
James Booth
ac7bc02c63 Added /room kick command 2014-10-05 03:52:55 +01:00
James Booth
7584ddaa62 Added /room subject command 2014-10-05 03:05:46 +01:00
James Booth
2026ab4b6e Implemented getting affiliation list, and setting affiliation 2014-10-05 01:39:48 +01:00
James Booth
fd5326b40b Added autocompleters for /room subcommands 2014-10-04 23:58:54 +01:00
James Booth
0b78a9a57e Implemented setting affiliation and listing affiliations 2014-10-04 23:40:36 +01:00
James Booth
719dbfaacc Split autocompleters for roster and rooms 2014-10-04 22:43:22 +01:00
James Booth
2d05601259 Split validation between /who for rooms and roster 2014-10-04 21:53:04 +01:00
James Booth
58fb89ad33 Allow adding and removing room owners 2014-10-04 21:38:31 +01:00
James Booth
7090f04a92 Formatted /room info output 2014-10-02 23:52:17 +01:00
James Booth
25b04537e1 Added service discovery to /room info command 2014-10-02 23:37:10 +01:00
James Booth
ba6aded2b4 Merge branch 'master' into muc_roles 2014-10-02 22:17:56 +01:00
James Booth
1423ee7a75 Handle roster set and result when item name is empty string 
fixed #431
 2014-10-02 22:12:41 +01:00
James Booth
41d6994310 Merge remote-tracking branch 'origin/muc_roles' into muc_roles 2014-10-02 01:38:02 +01:00
James Booth
bdad22e548 Merge remote-tracking branch 'origin/master' 2014-10-02 01:35:41 +01:00
James Booth
ae4d83fb47 Update UI before generating OTR key 2014-10-02 01:34:35 +01:00
James Booth
e561e2bd11 Update UI before generating OTR key 2014-10-02 01:34:00 +01:00
James Booth
44764e12dd Merge branch 'master' into muc_roles 2014-10-02 01:01:38 +01:00
James Booth
92a0aba93f Removed usages of strcpy 2014-10-02 00:57:29 +01:00
James Booth
60e0d5ef7b Store real jid with occupants 2014-10-01 13:27:01 +01:00
James Booth
b189f8f52e Show fixed form fields 2014-10-01 13:01:20 +01:00
James Booth
c90f4a37a3 Added /room <affiliation> command 2014-10-01 00:46:58 +01:00