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
|
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
|
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 |
|
James Booth
|
8a5d1fef29
|
Added Id and fingerprint to pgp key list
|
2015-03-22 01:03:06 +00:00 |
|
James Booth
|
fd86615549
|
Added /pgp libver command
|
2015-03-22 00:29:57 +00:00 |
|
James Booth
|
2490c3ed20
|
Added pgp key list command
|
2015-03-22 00:12:14 +00:00 |
|
James Booth
|
f1f047889e
|
Added individual options to send and request delivery receipts
|
2015-03-19 22:57:51 +00:00 |
|
James Booth
|
311b64a379
|
Tidy cmd_tiny
|
2015-03-16 23:03:31 +00:00 |
|