Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into openpgp | James Booth | 2015-05-10 | 1 | -1/+1 |
|\ | |||||
| * | Moved logic to notify_message | James Booth | 2015-05-10 | 1 | -1/+1 |
| | | |||||
* | | Moved pgp signature generation to cl_ev_presence_send | James Booth | 2015-05-08 | 3 | -2/+17 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 2 | -4/+4 |
|\| | |||||
| * | Renamed presence_update -> presence_send | James Booth | 2015-05-07 | 2 | -4/+4 |
| | | |||||
* | | Moved pgp signature verification to sv_ev_contact_online | James Booth | 2015-05-07 | 2 | -3/+4 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 3 | -63/+25 |
|\| | |||||
| * | Added ui_contact_online | James Booth | 2015-05-07 | 3 | -63/+25 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -2/+6 |
|\| | |||||
| * | Added ui_ev_new_private_win to ui events | James Booth | 2015-05-04 | 1 | -2/+6 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -1/+1 |
|\| | |||||
| * | ui_outgoing_chat_msg now takes ProfChatWin as argument | James Booth | 2015-05-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-02 | 1 | -10/+1 |
|\| | |||||
| * | Pass ProfChatWin to otr_on_message_send | James Booth | 2015-05-02 | 1 | -10/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-01 | 2 | -86/+0 |
|\| | |||||
| * | Removed server event delegation functions | James Booth | 2015-05-01 | 2 | -86/+0 |
| | | |||||
* | | 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 |
| | |