Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -3/+0 |
|\ | |||||
| * | Move current win check to event, removed next and prev win functions | James Booth | 2015-04-30 | 1 | -3/+0 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 4 | -58/+1 |
|\| | |||||
| * | Removed ui_win_switch_num | James Booth | 2015-04-30 | 4 | -58/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -9/+0 |
|\| | |||||
| * | Removed some ui functions, inlined | James Booth | 2015-04-30 | 1 | -9/+0 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 1 | -0/+2 |
|\| | |||||
| * | Added ui_win_error_line() | James Booth | 2015-04-29 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 2 | -2/+11 |
|\| | |||||
| * | Return result on OTR message sending | James Booth | 2015-04-29 | 2 | -2/+11 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-28 | 1 | -14/+14 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Renamed event functions | James Booth | 2015-04-28 | 1 | -14/+14 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-27 | 1 | -1/+3 |
|\| | |||||
| * | Moved otr message send event to otr module | James Booth | 2015-04-27 | 1 | -0/+1 |
| | | |||||
| * | Removed server_events dependency on libotr headers | James Booth | 2015-04-27 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 2 | -6/+15 |
|\| | |||||
| * | Moved new chat win events to client events module | James Booth | 2015-04-21 | 2 | -6/+15 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 1 | -14/+14 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Renamed server event functions | James Booth | 2015-04-19 | 1 | -14/+14 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 1 | -1/+1 |
|\| | |||||
| * | Moved server_events to event/ | James Booth | 2015-04-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-12 | 1 | -0/+1 |
|\| | |||||
| * | Added option to show jids in occupants panel | James Booth | 2015-04-12 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-11 | 3 | -19/+0 |
|\| | |||||
| * | Autogenerate room name with UUID for /join with no args | James Booth | 2015-04-11 | 3 | -19/+0 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 1 | -7/+7 |
|\| | |||||
| * | Use password for chat room invites | James Booth | 2015-03-29 | 1 | -7/+7 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 1 | -1/+1 |
|\| | |||||
| * | Add callback data to room disco info response handler | James Booth | 2015-03-29 | 1 | -1/+1 |
| | | |||||
| * | Set members only property when getting room features | James Booth | 2015-03-29 | 1 | -1/+1 |
| | | |||||
* | | Added signature verification, /pgp fps command | James Booth | 2015-03-24 | 1 | -1/+9 |
| | | |||||
* | | Added pgpkeyid account setting, send signed presence | James Booth | 2015-03-23 | 5 | -14/+16 |
| | | |||||
* | | Added Id and fingerprint to pgp key list | James Booth | 2015-03-22 | 1 | -0/+4 |
| | | |||||
* | | Added /pgp libver command | James Booth | 2015-03-22 | 1 | -0/+6 |
| | | |||||
* | | Added pgp key list command | James Booth | 2015-03-22 | 1 | -0/+7 |
|/ | |||||
* | Added otr_tag_message, removed commands.c dependency on libotr | James Booth | 2015-03-16 | 1 | -1/+6 |
| | |||||
* | Move common chat logging code to log.c | James Booth | 2015-03-15 | 1 | -2/+8 |
| | |||||
* | Added /receipts command | James Booth | 2015-03-15 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' into xep-0184 | James Booth | 2015-03-14 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | Conflicts: src/server_events.c src/ui/core.c src/ui/ui.h tests/ui/stub_ui.c | ||||
| * | Don't switch window on sent carbon | James Booth | 2015-03-14 | 1 | -0/+2 |
| | | |||||
* | | Removed from argument from outgoing message functions | James Booth | 2015-03-14 | 1 | -4/+2 |
| | | |||||
* | | Show message received text for receipts | James Booth | 2015-03-11 | 2 | -3/+5 |
| | | |||||
* | | Added basic delivery receipts | James Booth | 2015-03-11 | 1 | -0/+2 |
|/ | |||||
* | Send private carbons element with message when encrypted | James Booth | 2015-03-10 | 2 | -2/+8 |
| | |||||
* | Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280 | James Booth | 2015-03-08 | 2 | -0/+3 |
|\ | |||||
| * | Add XEP-0280 support | Olivier LE MOAL | 2015-02-10 | 2 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into readline | James Booth | 2015-03-08 | 1 | -0/+2 |
|\ \ | |||||
| * | | Fixed tests for --disable-otr | James Booth | 2015-03-04 | 1 | -0/+2 |
| |/ | |||||
* | | Merge branch 'master' into readline | James Booth | 2015-02-08 | 3 | -1/+53 |
|\| | |||||
| * | Moved quote stripper to common, added tests | James Booth | 2015-02-08 | 3 | -1/+53 |
| | |