1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Commit Graph

849 Commits

Author SHA1 Message Date
James Booth
446027b950 Moved setting otr.warn -> enc.warn 2015-06-21 21:07:57 +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
6617bb5a2b Added window encyption mode for PGP 2015-06-20 23:49:24 +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
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
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
0ef00e87ab Merge branch 'master' into openpgp 2015-06-13 16:27:20 +01:00
James Booth
e0783e20db Renamed otr trusted window property 2015-06-13 01:13:56 +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
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
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
80665ea051 Added rooms iq test 2015-05-24 04:13:28 +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
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
3fd9692aec Merge branch 'master' into pgp 2015-05-04 23:40:58 +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
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
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
bb2b5d20d5 Merge branch 'master' into pgp 2015-05-04 00:57:17 +01:00