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 |
|
James Booth
|
ef54ff305e
|
ui_outgoing_chat_msg now takes ProfChatWin as argument
|
2015-05-04 00:55:43 +01:00 |
|
James Booth
|
bab4da039a
|
Merge branch 'master' into pgp
|
2015-05-04 00:43:36 +01:00 |
|
James Booth
|
c3d2a7e937
|
Added roster list function to get display name for messages
|
2015-05-03 23:38:46 +01:00 |
|
James Booth
|
bec9b53f10
|
Merge branch 'master' into pgp
|
2015-05-03 02:04:21 +01:00 |
|
James Booth
|
4e1c2a4f64
|
Show resource in status bar
|
2015-05-03 02:04:04 +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
|
20555fcb36
|
Added assert to ui_switch_win
|
2015-04-30 21:27:44 +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
|
d5188a160e
|
Merge branch 'master' into pgp
|
2015-04-29 23:16:43 +01:00 |
|
James Booth
|
2e75e54460
|
Added ui_win_error_line()
|
2015-04-29 23:16:28 +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
|
15b34692fd
|
Reuse ui_new_chat_win
|
2015-04-29 21:42:29 +01:00 |
|
James Booth
|
0296a60390
|
_win_show_history takes ProfChatWin as first arg
|
2015-04-29 21:19:20 +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
|
403e9b47fe
|
Removed commented code
|
2015-04-28 23:00:06 +01:00 |
|
James Booth
|
bc445ccdfb
|
Merge branch 'master' into pgp
|
2015-04-21 23:35:37 +01:00 |
|