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

1054 Commits

Author SHA1 Message Date
Will Song
4501231eb3
since we keep track of length correctly, we don't need to add a null terminator for sys_write 2015-11-23 20:30:48 -06:00
Will Song
f73f88c571
fix typo 2015-11-23 20:29:17 -06:00
Will Song
aac8bfe98f
decrease the amount of sys_writes used and add a useful error message 
also pretty up console messages by adding an empty line
 2015-11-23 20:27:25 -06:00
Will Song
fa6a26c6fd
add feature in issue #585 
this should only be temporary due the silly amounts of syscalls involved

ideally we would create a new escaped string and write that directly via
fputs
 2015-11-23 20:09:51 -06:00
James Booth
00a735ece5 Added autocompleters for notify trigger removal 2015-11-24 01:34:06 +00:00
James Booth
a488d944d2 Added functions to manage custom notification triggers 2015-11-24 00:38:33 +00:00
James Booth
b79d77409f Added notify triggers WIP 2015-11-23 23:43:53 +00:00
James Booth
bf1e7efe23 Show summary of trusted certificates, add /tls cert <fingerprint> 
fixes #676
 2015-11-22 19:53:41 +00:00
James Booth
216493ef07 Tidied roster commands 2015-11-22 17:45:38 +00:00
James Booth
0f22179eef Added /roster resource join 2015-11-22 16:37:05 +00:00
James Booth
c4e8af0b6d Added /roster char resource 2015-11-22 02:04:59 +00:00
James Booth
fade5469df Updated help 2015-11-22 01:51:32 +00:00
James Booth
3bc9275079 Added word wrap to roster panel 2015-11-22 01:39:20 +00:00
James Booth
7a324abcd6 Option to show presence information on single line in roster 2015-11-22 00:30:42 +00:00
James Booth
5c08bea8d0 Added /roster indent presence 2015-11-21 22:03:43 +00:00
James Booth
ef0f093efd Added /roster indent resource 2015-11-21 21:49:12 +00:00
James Booth
b73ff08a72 Free pref strings 2015-11-21 21:19:28 +00:00
James Booth
4b022687fa Added /roster indent contact 2015-11-21 21:03:53 +00:00
James Booth
548f9394be Removed unused priority settings 2015-11-20 00:18:13 +00:00
James Booth
16fbdedceb Added /roster char contact 2015-11-20 00:06:46 +00:00
James Booth
316b6a7b8b Added /roster char header 2015-11-19 23:21:51 +00:00
James Booth
78a8487892 Fixed /roster help 2015-11-19 01:02:13 +00:00
James Booth
8e84d160e6 Added option to show resource priority in roster 2015-11-18 02:14:11 +00:00
James Booth
4505102fa8 Added roster count option 2015-11-18 02:02:49 +00:00
James Booth
4efe456e74 Pass offline filter to roster_get_contacts 2015-11-18 01:03:35 +00:00
James Booth
b373cbcfc0 Pass offline filter to roster list functions 2015-11-18 00:25:35 +00:00
James Booth
2260e3bd6f Pass ordering to roster list functions 2015-11-18 00:06:00 +00:00
James Booth
8e8852fa9f Added /roster order name|presence 2015-11-17 23:37:33 +00:00
James Booth
badbc3003f Show presence in roster WIP 2015-11-15 21:33:48 +00:00
James Booth
79c2b177a2 Tidy /tls command 2015-11-11 00:57:38 +00:00
James Booth
1e34b9c914 Added /tls trust 2015-11-10 23:26:19 +00:00
James Booth
9302188a32 Show current TLS certificate 2015-11-10 01:20:40 +00:00
James Booth
bee27f4773 Added /tls cert to show current certificate fingerprint 2015-11-09 23:31:21 +00:00
James Booth
4cbfb88814 Store current TLS certificate fingerpint in memory for reconnect 2015-11-09 20:57:26 +00:00
James Booth
6feaa12253 Fixed /time help examples 
fixes #650
 2015-11-08 22:43:42 +00:00
James Booth
8230a28445 Added /account autocomplete for startscript property 2015-11-08 22:31:53 +00:00
James Booth
9fcdc5901c Removed ui_new_private_win 2015-11-05 23:28:21 +00:00
James Booth
38255e9be4 Make all mucconfwin functions take ProfMucConfWin 2015-11-02 22:19:01 +00:00
James Booth
a3e9178ea2 Renamed mucconfwin functions 2015-11-02 22:05:17 +00:00
James Booth
eece15d92c Removed ui_statusbar_new 2015-11-02 21:24:12 +00:00
James Booth
022d20bbdc Removed ui_clear_win 2015-11-02 21:21:52 +00:00
James Booth
bcd19c6d16 Removed ui_swap_wins 2015-11-02 21:05:21 +00:00
James Booth
df5b93987f Removed ui_tidy_wins 2015-11-02 21:03:30 +00:00
James Booth
75bce88b8a Renamed ui_switch_win -> ui_focus_win 2015-11-02 20:59:36 +00:00
James Booth
6779c5bf68 mucwin_hide_occupants takes ProfMucWin 2015-11-02 01:01:37 +00:00
James Booth
668f92ece2 mucwin_show_occupants takes ProfMucWin 2015-11-02 00:59:27 +00:00
James Booth
ce0763e160 mucwin_update_occupants takes ProfMucWin 2015-11-02 00:57:13 +00:00
James Booth
8b4bb1c7f1 mucwin_roster takes ProfMucWin 2015-11-01 23:41:45 +00:00
James Booth
ed2324900a Renamed ui_room_hide_occupants -> mucwin_hide_occupants 2015-11-01 21:57:57 +00:00
James Booth
a08f112fd0 Renamed mucwin_occupants -> mucwin_show_occupants 2015-11-01 21:57:18 +00:00
James Booth
2e08910841 Renamed ui_room_show_occupants -> mucwin_occupants 2015-11-01 21:56:17 +00:00
James Booth
4697393373 Renamed ui_room_update_occupants -> mucwin_update_occupants 2015-11-01 21:55:16 +00:00
James Booth
e4e76ec58b Renamed ui_show_room_info -> mucwin_info 2015-11-01 21:54:31 +00:00
James Booth
d47da01c00 Renamed ui_show_room_role_list -> mucwin_show_role_list 2015-11-01 21:51:24 +00:00
James Booth
381bce385f Renamed ui_show_room_affiliation_list -> mucwin_show_affiliation_list 2015-11-01 21:46:57 +00:00
James Booth
51c9d4186e Renamed ui_room_roster -> mucwin_roster 2015-11-01 21:20:11 +00:00
James Booth
7e386fbf00 Removed ui_open_xmlconsole_win() 2015-11-01 19:33:01 +00:00
James Booth
9eae20298f Removed ui_create_xmlconsole_win() 2015-11-01 19:29:59 +00:00
James Booth
486d2e0495 Removed ui_xmlconsole_exists 2015-11-01 19:26:31 +00:00
James Booth
d6e4b74802 Removed ui_input_nonblocking() 2015-11-01 18:56:34 +00:00
James Booth
17488ca346 Added missing config.h includes 2015-10-31 23:38:08 +00:00
James Booth
dda753da3b Added /subject edit <subject> 2015-10-29 21:21:41 +00:00
James Booth
f3c65496c7 Added /subject prepend <text> 2015-10-29 21:02:46 +00:00
James Booth
86354a2bc5 Added /subject append <text> 2015-10-29 20:55:37 +00:00
James Booth
ea09dcda18 Renamed ui_new_chat_win -> chatwin_new 2015-10-27 23:15:28 +00:00
James Booth
40dcd59727 Renamed chatwin OTR functions 2015-10-27 21:23:56 +00:00
James Booth
0fd616167e Removed ui_events module 2015-10-27 20:49:06 +00:00
James Booth
61bcb59ee9 Removed ui_ev_new_chat_win 2015-10-27 20:45:07 +00:00
James Booth
8087053f49 Removed ui_ev_focus_win 2015-10-27 20:40:42 +00:00
James Booth
124aaa9809 remaining otr functions take ProfChatWin 2015-10-27 00:19:22 +00:00
James Booth
9d3bcf5f90 ui_gone_insecure takes ProfChatWin 2015-10-26 23:10:30 +00:00
James Booth
4fb0b4b0da ui_gone_secure takes ProfChatWin 2015-10-26 23:04:45 +00:00
James Booth
d8fc7faa36 Removed ui_about() function 2015-10-26 20:37:50 +00:00
James Booth
523d92e950 Fixed spelling mistake 2015-10-26 01:07:15 +00:00
James Booth
22db16e646 Applied coding style to commands.h 2015-10-25 00:33:41 +01:00
James Booth
99b2d5fda2 Applied coding style to commands.c 2015-10-25 00:31:42 +01:00
James Booth
fa53e23805 Applied coding style to command.h 2015-10-25 00:26:42 +01:00
James Booth
cded90bcd0 Applied coding style to command.c 2015-10-25 00:25:10 +01:00
James Booth
1d4d693a53 Merge remote-tracking branch 'jubalh/jub' 2015-10-24 21:42:04 +01:00
James Booth
6640a0891f Force tls on all connections, add tls policy account property 2015-10-18 03:06:23 +01:00
James Booth
31ecd41c8f Renamed PREF_CERT_PATH -> PREF_TLS_CERTPATH 2015-10-18 00:03:15 +01:00
James Booth
b8c08f85cc Added /script autocompletion 2015-10-17 23:14:55 +01:00
James Booth
eca7390951 Implemented /script show 2015-10-17 22:58:45 +01:00
James Booth
a35cbea732 Implemented /script list 2015-10-17 22:30:01 +01:00
James Booth
0769fc6b1b Added /script run 2015-10-15 23:57:52 +01:00
James Booth
ea4fb2ce6c Allow /lastactivity on|off when not connected 2015-10-15 23:32:47 +01:00
James Booth
904a5a81cf Add ability to script commands after connect 2015-10-15 01:19:24 +01:00
James Booth
d38e10828e Added /lastactivity on|off 2015-10-14 22:09:18 +01:00
James Booth
85764ddb53 Added TLS show to UI preferences 2015-10-14 00:58:33 +01:00
James Booth
ef832ce526 Add preference for showing TLS indicator in titlebar 
Issue #616
 2015-10-14 00:48:11 +01:00
James Booth
ecbcecea7d Fixed closing room config windows 2015-10-13 20:46:59 +01:00
James Booth
6e28df66e8 Use libstrophe/libmesode uuid generator 2015-10-12 23:37:11 +01:00
Michael Vetter
8dfa41ea8e Remove double declaration and reduce scope of pcontact 
In command/commands.c you declare pcontact at the top of the function.
Later in one case you declare it again and use it in a small scope. And
in the same function you use it again this time from the first
declaration. I think you intended only declaring it one time. At first I
thought about top of the function because its easier to find. Then I saw
that you declare "Jid jid" not at the top too, and I think for the sake
of reducing scope it is better. So I went for this approach.
 2015-10-09 10:34:58 +02:00
James Booth
b9948a4c01 Added time format perferences per window type 2015-09-30 22:34:27 +01:00
James Booth
99fc70bd92 Added last activity time format option 2015-09-29 23:30:23 +01:00
James Booth
26d160cae8 WIP: Added last activity request and response 2015-09-29 00:01:38 +01:00
James Booth
a12624ea75 Increased help examples size 2015-09-28 21:39:09 +01:00
James Booth
9f4e2c036e Added contact OTR policy to help 2015-09-28 21:34:27 +01:00
James Booth
54e225aa53 Added auto xa option, tidied autoaway code 2015-09-27 23:08:30 +01:00
James Booth
a5c6710024 Removed redundant last activity setter 2015-09-25 00:35:08 +01:00
James Booth
b484411ea8 Save last activity to account on disconnect 2015-09-25 00:26:58 +01:00
James Booth
b96e3f100b Fixed /tls help 2015-09-24 01:23:48 +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
1eab57bd13 Perform directory exists check before setting TLS cert path 2015-09-23 20:42:47 +01:00
James Booth
a37d55e1a9 Added TLS trusted certificate path preference 2015-09-23 20:37:41 +01:00
James Booth
b88885aaae Store trusted TLS cert fingerprints 2015-09-22 22:44:18 +01:00
James Booth
9414ad268d Prompt user to allow or deny untrusted TLS certificates 2015-09-22 21:42:05 +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
fed6128bbc Spelling fix 2015-09-09 19:31:11 +01:00
James Booth
e44688306b Removed duplicate help entry for /roster show empty 2015-09-02 00:07:25 +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
98ea744648 Added /otr char and /pgp char 2015-08-26 01:24:53 +01:00
James Booth
48630d45a4 Added check for libgpgme on account autocomplete 2015-08-26 00:48:01 +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
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
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
c18b7f4d67 Free id for OTR messages 2015-08-20 22:02:58 +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
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
8ec931eb84 Added cons_show_padded 2015-07-29 23:48:28 +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
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
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
59dd87d5f8 Fix /help commands spacing 2015-07-21 22:55:39 +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
106e909fbd Merge remote-tracking branch 'incertia/time' 
Conflicts:
	src/config/preferences.c
 2015-07-01 20:16:09 +01:00
James Booth
ae4c2781e1 Added messaage when account resource changed whilst connected 2015-06-24 21:36:39 +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
358e9d6af0 Added /pgp setkey command 2015-06-23 23:29:10 +01:00
James Booth
86acd4649b Added PGP prefs 2015-06-22 21:09:14 +01: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
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
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
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
a849b200b3 Added win_clear() function 2015-06-15 17:54:47 +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
698288ab5c Show message when offline for /pgp fps 2015-06-13 01:19:56 +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 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
0e7507a1aa
update autocomplete 2015-05-29 20:49:28 -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
34d9b2b272 Merge branch 'master' into openpgp 2015-05-17 22:28:12 +01:00
Adam Ehlers Nyholm Thomsen
882ca85aca allow enabling / disabling carbons without being connected. 2015-05-17 13:29:08 +02: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
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
3fd9692aec Merge branch 'master' into pgp 2015-05-04 23:40:58 +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
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
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
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
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
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
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
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
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
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
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
551f7df1f7 Added signature verification, /pgp fps command 2015-03-24 00:47:13 +00:00
James Booth
475dfebd97 Added pgpkeyid account setting, send signed presence 2015-03-23 23:38:06 +00:00