James Booth
|
97d57cd8c0
|
Merge branch 'master' into osx-functional
Conflicts:
tests/functionaltests/proftest.c
|
2016-11-22 00:42:50 +00:00 |
|
James Booth
|
e043029a50
|
Allow clearing account resource
issue #880
|
2016-11-22 00:39:52 +00:00 |
|
James Booth
|
095cedb763
|
Merge branch 'master' into osx-functional
|
2016-11-20 02:19:26 +00:00 |
|
James Booth
|
609d05366c
|
Use server features for account muc service
issue #878
|
2016-11-20 02:09:34 +00:00 |
|
James Booth
|
2e15cf8a93
|
Merge branch 'master' into osx-functional
|
2016-10-17 23:54:19 +01:00 |
|
James Booth
|
333403d2e5
|
Remove ui_current_print_formatted_line
|
2016-10-16 22:13:49 +01:00 |
|
James Booth
|
769e71b17b
|
Remove ui_current_print_line
|
2016-10-16 21:45:48 +01:00 |
|
James Booth
|
a45c50b013
|
Merge branch 'master' into osx-functional
|
2016-10-15 22:22:06 +01:00 |
|
James Booth
|
f3aebd547c
|
Use varargs in win_println_indent
|
2016-10-15 21:05:26 +01:00 |
|
James Booth
|
711c5b8e45
|
Add win_appendln
|
2016-10-15 19:19:44 +01:00 |
|
James Booth
|
8f1d3ab55c
|
Add win_print
|
2016-10-15 18:29:02 +01:00 |
|
James Booth
|
3612270e90
|
Rename win_println -> win_println_indent
|
2016-10-15 17:23:02 +01:00 |
|
James Booth
|
5488fd6e72
|
Remove win_vprintln_ch
|
2016-10-15 17:17:17 +01:00 |
|
James Booth
|
478c749ff9
|
Remove ui_current_error_line
|
2016-10-15 17:08:29 +01:00 |
|
James Booth
|
9d075c9805
|
Remove ui_win_error_line
|
2016-10-15 17:07:15 +01:00 |
|
James Booth
|
6ed04d87b3
|
Rename win_get_string -> win_to_string
|
2016-10-15 16:41:37 +01:00 |
|
James Booth
|
33b4b79f2e
|
Add ch arg to win_printf_line
|
2016-10-15 00:04:57 +01:00 |
|
James Booth
|
97898ee082
|
Add win_printf_line
|
2016-10-12 00:14:55 +01:00 |
|
James Booth
|
0890179fc4
|
Remove win_print, use win_printf instead
|
2016-10-11 23:38:59 +01:00 |
|
James Booth
|
0337c5b22c
|
Rename win_vprint -> win_printf
|
2016-10-11 23:10:48 +01:00 |
|
James Booth
|
2f0f59bc49
|
Merge branch 'master' into osx-functional
|
2016-10-05 00:53:53 +01:00 |
|
James Booth
|
c40660b0d8
|
Use current room for /bookmark add and /bookmark remove
|
2016-10-05 00:52:57 +01:00 |
|
James Booth
|
8e94debd27
|
Merge branch 'master' into osx-functional
|
2016-09-26 00:55:39 +01:00 |
|
James Booth
|
388a20813c
|
Tests: disable occupants panel in functional tests
|
2016-09-26 00:39:37 +01:00 |
|
James Booth
|
e78684f689
|
Tests: longer timeout for failing functional test on travis
|
2016-09-26 00:16:12 +01:00 |
|
James Booth
|
da437642a5
|
Merge branch 'master' into win-order
|
2016-09-25 23:32:15 +01:00 |
|
James Booth
|
46892e0c76
|
Merge branch 'master' into osx-functional
|
2016-09-25 23:31:54 +01:00 |
|
James Booth
|
a48df40138
|
Fix assertion errors in unit tests
|
2016-09-25 23:30:44 +01:00 |
|
James Booth
|
d3cc5bd7ed
|
Allow vertical positioning of all windows
|
2016-09-23 00:56:53 +01:00 |
|
James Booth
|
3983ee1d6b
|
Rename /titlebar -> /wintitle
|
2016-09-22 21:42:00 +01:00 |
|
James Booth
|
347f5e5724
|
Merge branch 'master' into osx-functional
|
2016-09-19 23:43:56 +01:00 |
|
James Booth
|
0aa758cbfb
|
Add /inputwin top|bottom command
closes #853
|
2016-09-19 23:40:45 +01:00 |
|
James Booth
|
98b77fa6d2
|
Merge branch 'master' into osx-functional
Conflicts:
.travis.yml
tests/functionaltests/functionaltests.c
|
2016-09-03 23:12:18 +01:00 |
|
James Booth
|
ea98a8b04a
|
Rename Bookmark->jid to Bookmark->barejid
|
2016-08-28 22:12:50 +01:00 |
|
James Booth
|
fca59a3110
|
log_info on private carbons
|
2016-08-28 17:27:26 +01:00 |
|
James Booth
|
698a35aec9
|
Merge branch 'master' into osx-functional
|
2016-08-21 15:27:07 +01:00 |
|
James Booth
|
0886062806
|
Use hash table for bookmarks
|
2016-08-21 15:25:49 +01:00 |
|
James Booth
|
b6ab90124b
|
Merge branch 'master' into osx-functional
|
2016-08-18 22:56:12 +01:00 |
|
James Booth
|
a978bb12bf
|
Send receipt request only when receiver supports feature
issue #829
|
2016-08-18 22:53:23 +01:00 |
|
James Booth
|
61072e4cef
|
Merge branch 'master' into osx-functional
|
2016-08-18 00:16:12 +01:00 |
|
James Booth
|
4de570b1ee
|
Only include receipts feature in disco responses when enabled
issue #829
|
2016-08-18 00:10:15 +01:00 |
|
James Booth
|
92668611da
|
Merge branch 'master' into osx-functional
|
2016-08-17 23:22:42 +01:00 |
|
James Booth
|
9945246a64
|
Use hashtables for plugin disco features
|
2016-08-17 23:21:48 +01:00 |
|
James Booth
|
d132dbfe93
|
Merge branch 'master' into osx-functional
|
2016-08-13 18:04:58 +01:00 |
|
James Booth
|
80eb5bee90
|
Rename Capabilties -> EntityCapabilities
|
2016-08-13 16:39:25 +01:00 |
|
James Booth
|
edaeb4bd45
|
Merge branch 'master' into osx-functional
|
2016-07-24 22:47:08 +01:00 |
|
James Booth
|
a3a73cf003
|
Move all filepath handling to files.c
|
2016-07-24 21:49:35 +01:00 |
|
James Booth
|
29452f8f1b
|
Move xgd functions
|
2016-07-24 17:12:09 +01:00 |
|
James Booth
|
6cc4abedc5
|
Move window functions to window_list.c
|
2016-07-24 17:02:09 +01:00 |
|
James Booth
|
e7bfaa643f
|
Move autoaway check
|
2016-07-24 16:06:24 +01:00 |
|