Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 4 | -14/+12 |
|\ | |||||
| * | ui_outgoing_chat_msg now takes ProfChatWin as argument | James Booth | 2015-05-04 | 4 | -14/+12 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 3 | -24/+37 |
|\| | |||||
| * | Added roster list function to get display name for messages | James Booth | 2015-05-03 | 3 | -24/+37 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -52/+52 |
|\| | |||||
| * | Added carbons handler | James Booth | 2015-05-03 | 1 | -52/+52 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -1/+6 |
|\| | |||||
| * | Show resource in status bar | James Booth | 2015-05-03 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -12/+31 |
|\| | |||||
| * | Extracted receipt request processing in message.c | James Booth | 2015-05-03 | 1 | -12/+31 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 3 | -82/+87 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Extract private message hanlding in message.c | James Booth | 2015-05-03 | 3 | -70/+75 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -40/+50 |
|\| | |||||
| * | Tidy message.c | James Booth | 2015-05-03 | 1 | -40/+50 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-03 | 1 | -30/+34 |
|\| | |||||
| * | Extracted receipt received handler | James Booth | 2015-05-03 | 1 | -30/+34 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-02 | 1 | -68/+62 |
|\| | |||||
| * | Tidy message.c | James Booth | 2015-05-02 | 1 | -68/+62 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-02 | 3 | -42/+21 |
|\| | |||||
| * | Pass ProfChatWin to otr_on_message_send | James Booth | 2015-05-02 | 3 | -42/+21 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-01 | 6 | -308/+76 |
|\| | |||||
| * | Removed server event delegation functions | James Booth | 2015-05-01 | 6 | -308/+76 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 6 | -87/+30 |
|\| | |||||
| * | Move current win check to event, removed next and prev win functions | James Booth | 2015-04-30 | 6 | -87/+30 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 5 | -95/+76 |
|\| | |||||
| * | Removed ui_win_switch_num | James Booth | 2015-04-30 | 5 | -96/+76 |
| | | |||||
| * | Added assert to ui_switch_win | James Booth | 2015-04-30 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 3 | -27/+13 |
|\| | |||||
| * | Removed some ui functions, inlined | James Booth | 2015-04-30 | 3 | -27/+13 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 3 | -2/+8 |
|\| | |||||
| * | Added ui_win_error_line() | James Booth | 2015-04-29 | 3 | -2/+8 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 9 | -156/+120 |
|\| | |||||
| * | Return result on OTR message sending | James Booth | 2015-04-29 | 9 | -47/+63 |
| | | |||||
| * | Return new window on new chat win event | James Booth | 2015-04-29 | 3 | -12/+9 |
| | | |||||
| * | Changed message when sending non encrypted message with OTR policy always | James Booth | 2015-04-29 | 1 | -2/+2 |
| | | |||||
| * | Reuse ui_new_chat_win | James Booth | 2015-04-29 | 1 | -55/+17 |
| | | |||||
| * | _win_show_history takes ProfChatWin as first arg | James Booth | 2015-04-29 | 1 | -66/+55 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-28 | 13 | -277/+325 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Added ui events module | James Booth | 2015-04-28 | 5 | -16/+90 |
| | | |||||
| * | Renamed event functions | James Booth | 2015-04-28 | 10 | -237/+237 |
| | | |||||
| * | Removed commented code | James Booth | 2015-04-28 | 1 | -26/+0 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-27 | 4 | -73/+89 |
|\| | |||||
| * | Moved otr message send event to otr module | James Booth | 2015-04-27 | 3 | -33/+43 |
| | | |||||
| * | Removed server_events dependency on libotr headers | James Booth | 2015-04-27 | 3 | -40/+46 |
| | | |||||
| * | Renamed incoming otr message | James Booth | 2015-04-27 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-23 | 5 | -60/+79 |
|\| | | | | | | | | | Conflicts: src/config/account.h | ||||
| * | Tidied account login | James Booth | 2015-04-23 | 5 | -60/+79 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-22 | 3 | -109/+132 |
|\| | |||||
| * | Moved login events to client events module | James Booth | 2015-04-22 | 3 | -98/+121 |
| | | |||||
| * | Tidy execute alias code | James Booth | 2015-04-21 | 1 | -11/+11 |
| | |