Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 4 | -10/+15 |
|\ | |||||
| * | Added enc_mode to ProfChatWin | James Booth | 2015-05-04 | 4 | -10/+15 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -40/+54 |
|\| | |||||
| * | Extracted carbons handling | James Booth | 2015-05-04 | 1 | -41/+55 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -52/+52 |
|\| | |||||
| * | Revert "Added carbons handler" | James Booth | 2015-05-04 | 1 | -52/+52 |
| | | | | | | | | This reverts commit ff867e7f2bdfbd8856bd2a010e9d19b9a429a239. | ||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 8 | -27/+33 |
|\| | |||||
| * | Added ui_ev_new_private_win to ui events | James Booth | 2015-05-04 | 8 | -27/+33 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 3 | -5/+5 |
|\| | |||||
| * | cl_ev_send_muc_msg takes ProfMucWin as arg | James Booth | 2015-05-04 | 3 | -5/+5 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 5 | -15/+13 |
|\| | |||||
| * | ui_outgoing_chat_msg now takes ProfChatWin as argument | James Booth | 2015-05-04 | 5 | -15/+13 |
| | | |||||
* | | 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 | 4 | -52/+22 |
|\| | |||||
| * | Pass ProfChatWin to otr_on_message_send | James Booth | 2015-05-02 | 4 | -52/+22 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-01 | 8 | -394/+76 |
|\| | |||||
| * | Removed server event delegation functions | James Booth | 2015-05-01 | 8 | -394/+76 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 7 | -90/+30 |
|\| | |||||
| * | Move current win check to event, removed next and prev win functions | James Booth | 2015-04-30 | 7 | -90/+30 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 10 | -154/+77 |
|\| | |||||
| * | Removed ui_win_switch_num | James Booth | 2015-04-30 | 10 | -155/+77 |
| | | |||||
| * | Added assert to ui_switch_win | James Booth | 2015-04-30 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 4 | -36/+13 |
|\| | |||||
| * | Removed some ui functions, inlined | James Booth | 2015-04-30 | 4 | -36/+13 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 4 | -2/+10 |
|\| | |||||
| * | Added ui_win_error_line() | James Booth | 2015-04-29 | 4 | -2/+10 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 11 | -158/+131 |
|\| | |||||
| * | Return result on OTR message sending | James Booth | 2015-04-29 | 11 | -49/+74 |
| | | |||||
| * | 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 | 15 | -291/+341 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Added ui events module | James Booth | 2015-04-28 | 6 | -16/+92 |
| | | |||||
| * | Renamed event functions | James Booth | 2015-04-28 | 11 | -251/+251 |
| | |