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
|
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
|
43189b1ab4
|
Merge branch 'master' into pgp
|
2015-04-27 23:45:51 +01:00 |
|
James Booth
|
70d1756a1c
|
Moved otr message send event to otr module
|
2015-04-27 23:30:33 +01:00 |
|
James Booth
|
eb177ccbef
|
Removed server_events dependency on libotr headers
|
2015-04-27 23:17:38 +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
|
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
|
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
|
24a45e5292
|
Set members only property when getting room features
|
2015-03-29 00:21:18 +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
|
11966d39b0
|
Added otr_tag_message, removed commands.c dependency on libotr
|
2015-03-16 21:41:35 +00:00 |
|
James Booth
|
8944a3b5bb
|
Move common chat logging code to log.c
|
2015-03-15 23:19:00 +00:00 |
|
James Booth
|
2762f18a3e
|
Added /receipts command
|
2015-03-15 19:48:19 +00:00 |
|
James Booth
|
ca30ff3910
|
Merge branch 'master' into xep-0184
Conflicts:
src/server_events.c
src/ui/core.c
src/ui/ui.h
tests/ui/stub_ui.c
|
2015-03-14 23:10:51 +00:00 |
|
James Booth
|
385336c10b
|
Don't switch window on sent carbon
|
2015-03-14 22:59:49 +00:00 |
|
James Booth
|
bc6e32175d
|
Removed from argument from outgoing message functions
|
2015-03-14 14:50:45 +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 |
|
James Booth
|
2e493112bb
|
Merge branch 'master' into readline
|
2015-03-08 18:12:50 +00:00 |
|
James Booth
|
7638f379ca
|
Fixed tests for --disable-otr
|
2015-03-04 23:32:47 +00:00 |
|
Olivier LE MOAL
|
48f9f3b3b0
|
Add XEP-0280 support
|
2015-02-10 11:32:22 +01:00 |
|
James Booth
|
8cec79faef
|
Merge branch 'master' into readline
|
2015-02-08 21:03:26 +00:00 |
|
James Booth
|
44c5b34a71
|
Moved quote stripper to common, added tests
|
2015-02-08 20:59:51 +00:00 |
|
James Booth
|
a70aa0255f
|
Moved command processing to main loop, allow resize during password prompt
|
2015-02-05 00:58:23 +00:00 |
|
James Booth
|
30180ac8bb
|
Move SIGWINCH handling to ui/core.c, ignore signal whilst resizing
|
2015-02-04 23:35:28 +00:00 |
|
James Booth
|
3b3ffcfb37
|
Added mock ui functions to tests
|
2015-01-31 22:14:41 +00:00 |
|
James Booth
|
a9ed64911d
|
Removed history and various key handlers
|
2015-01-30 23:42:51 +00:00 |
|
James Booth
|
83bd207316
|
Moved readline code to inputwin.c
|
2015-01-30 23:28:02 +00:00 |
|
James Booth
|
2cdbfc7eb7
|
Added gnu readline
|
2015-01-27 22:13:09 +00:00 |
|
James Booth
|
25d31101bf
|
Added key insert tests, extracted key_ctrl_left handler
|
2015-01-20 23:02:04 +00:00 |
|
James Booth
|
58239244bb
|
Added key insert handler tests
|
2015-01-20 00:56:35 +00:00 |
|