James Booth
|
79d21d4cd2
|
Merge branch 'master' into pgp
|
2015-05-03 00:35:47 +01:00 |
|
James Booth
|
236c854419
|
Tidy message.c
|
2015-05-03 00:35:31 +01:00 |
|
James Booth
|
03ef791401
|
Merge branch 'master' into pgp
|
2015-05-03 00:06:12 +01:00 |
|
James Booth
|
5a90e2862e
|
Extracted receipt received handler
|
2015-05-03 00:05:47 +01:00 |
|
James Booth
|
0bc4377ad7
|
Merge branch 'master' into pgp
|
2015-05-02 23:40:34 +01:00 |
|
James Booth
|
ddc64755a0
|
Tidy message.c
|
2015-05-02 23:40:14 +01:00 |
|
James Booth
|
cade9e7c4c
|
Merge branch 'master' into pgp
|
2015-05-01 00:55:58 +01:00 |
|
James Booth
|
0118178080
|
Removed server event delegation functions
|
2015-05-01 00:55:40 +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
|
8aba52f4fe
|
Renamed event functions
|
2015-04-28 23:38:56 +01:00 |
|
James Booth
|
d612b9695a
|
Merge branch 'master' into pgp
Conflicts:
src/xmpp/message.c
|
2015-04-19 17:33:35 +01:00 |
|
James Booth
|
e688dd7d28
|
Renamed server event functions
|
2015-04-19 17:29:54 +01:00 |
|
James Booth
|
60f94722d4
|
Merge branch 'master' into pgp
|
2015-04-19 16:56:11 +01:00 |
|
James Booth
|
424f52c3fa
|
Moved server_events to event/
|
2015-04-19 16:54:16 +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
|
5305a3e3a6
|
Fixed message sending when not PGP key found
|
2015-04-05 16:03:50 +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
|
c36d4b3643
|
Merge branch 'master' into pgp
|
2015-03-29 02:51:05 +01:00 |
|
James Booth
|
1917d4c095
|
Added password to direct invites
|
2015-03-29 02:46:59 +01:00 |
|
James Booth
|
c1eceebcba
|
Merge branch 'master' into pgp
|
2015-03-29 00:59:42 +00:00 |
|
James Booth
|
fac2b2cf66
|
Added check members only room to send mediated invites
|
2015-03-28 22:51:41 +00:00 |
|
James Booth
|
0f6bc9b55d
|
Decrypt incoming messages
|
2015-03-25 00:05:32 +00:00 |
|
James Booth
|
eb5cb7b2f8
|
Send encrypted messages
|
2015-03-24 23:34:24 +00:00 |
|
James Booth
|
f1f047889e
|
Added individual options to send and request delivery receipts
|
2015-03-19 22:57:51 +00:00 |
|
James Booth
|
125719673b
|
Return after message receipt
|
2015-03-14 23:25:20 +00:00 |
|
James Booth
|
a79ea3cbe2
|
Merge branch 'master' into xep-0184
|
2015-03-14 16:45:44 +00:00 |
|
James Booth
|
ede3368f7a
|
Check for sent and received carbons
|
2015-03-14 16:44:21 +00:00 |
|
James Booth
|
060dcc24e3
|
Merge branch 'master' into xep-0184
Conflicts:
src/xmpp/message.c
|
2015-03-14 16:41:40 +00:00 |
|
James Booth
|
2fc7937dcd
|
Fixed error with /otr start with carbons enabled
|
2015-03-14 16:37:33 +00:00 |
|
James Booth
|
57c7564445
|
Show message received text for receipts
|
2015-03-11 23:47:11 +00:00 |
|
James Booth
|
78becceedb
|
Added basic delivery receipts
|
2015-03-11 23:18:28 +00:00 |
|
James Booth
|
2ff6873cf1
|
Send private carbons element with message when encrypted
|
2015-03-10 21:16:34 +00:00 |
|
James Booth
|
945f29873e
|
Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280
|
2015-03-08 21:51:50 +00:00 |
|
Olivier LE MOAL
|
ced5a8c2e0
|
merge
|
2015-02-23 10:47:54 +01:00 |
|
Olivier Le Moal
|
3eeafa2277
|
fix segfault on self sent message carbon
|
2015-02-21 22:22:21 +01:00 |
|
James Booth
|
b3be26a214
|
Updated copyright
|
2015-02-10 23:16:09 +00:00 |
|
Olivier LE MOAL
|
48f9f3b3b0
|
Add XEP-0280 support
|
2015-02-10 11:32:22 +01:00 |
|
Olivier LE MOAL
|
e3feacddd6
|
Add XEP-0280 support
|
2015-02-02 11:10:05 +01:00 |
|
James Booth
|
13f0166aa0
|
Only show UI events for chat states when in session
|
2015-01-11 23:04:22 +00:00 |
|
James Booth
|
c16871d143
|
Added remaining chat states
|
2015-01-11 20:20:17 +00:00 |
|
James Booth
|
76bd2ec13f
|
Send active chat state, handle composing and gone from recipients
|
2015-01-10 22:03:40 +00:00 |
|
James Booth
|
c3ad3c0ba6
|
Show resource in titlebar and on each message
|
2015-01-10 18:35:59 +00:00 |
|
James Booth
|
5e7d2f5f91
|
Removed chat states from chat_session module, WIP
|
2015-01-08 00:57:25 +00:00 |
|
James Booth
|
8bbf126e83
|
Refactored chat sessions in _chat_handler
|
2015-01-07 00:17:54 +00:00 |
|
James Booth
|
95ad564372
|
Added offline handler for chat sessions
|
2015-01-06 23:19:56 +00:00 |
|
James Booth
|
c2dccad818
|
Create chat session when no resource
|
2015-01-05 00:48:30 +00:00 |
|
James Booth
|
8326c8b3a2
|
Refactored chat session handling on sending message
|
2015-01-04 23:40:10 +00:00 |
|
James Booth
|
42a5c431c7
|
Use resource in chat sessions
|
2015-01-04 20:19:42 +00:00 |
|