Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into openpgp | James Booth | 2015-06-02 | 3 | -9/+14 |
|\ | |||||
| * | Merge remote-tracking branch 'PMaynard/#551' | James Booth | 2015-06-02 | 3 | -9/+14 |
| |\ | |||||
| | * | Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected ↵ | Pete | 2015-06-01 | 2 | -9/+3 |
| | | | | | | | | | | | | underline, removed call to function 'wins_resize_all()'. | ||||
| | * | Added window auto tidy. | Pete | 2015-05-29 | 2 | -0/+11 |
| |/ | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-25 | 1 | -1/+1 |
|\| | |||||
| * | Added jid to OTR errors in console | James Booth | 2015-05-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-10 | 1 | -60/+62 |
|\| | |||||
| * | Tidy ui_room_message | James Booth | 2015-05-10 | 1 | -60/+62 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-10 | 3 | -36/+20 |
|\| | |||||
| * | Moved logic to notify_message | James Booth | 2015-05-10 | 3 | -36/+20 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 2 | -0/+37 |
|\| | |||||
| * | Added ui_contact_online | James Booth | 2015-05-07 | 2 | -0/+37 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 7 | -212/+212 |
|\| | |||||
| * | Use null check convention in windows.c | James Booth | 2015-05-04 | 1 | -18/+18 |
| | | |||||
| * | Use null check convention in window.c | James Booth | 2015-05-04 | 1 | -38/+38 |
| | | |||||
| * | Use null check convention in titlebar.c | James Booth | 2015-05-04 | 1 | -3/+3 |
| | | |||||
| * | Use null check convention in statusbar.c | James Booth | 2015-05-04 | 1 | -7/+7 |
| | | |||||
| * | Use null check convention in notifier.c | James Booth | 2015-05-04 | 1 | -4/+4 |
| | | |||||
| * | Use null check convention in core.c | James Booth | 2015-05-04 | 1 | -62/+62 |
| | | |||||
| * | Use null check convention in console.c | James Booth | 2015-05-04 | 1 | -80/+80 |
| | | |||||
* | | 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 | 2 | -16/+7 |
|\| | |||||
| * | Added ui_ev_new_private_win to ui events | James Booth | 2015-05-04 | 2 | -16/+7 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 2 | -10/+8 |
|\| | |||||
| * | ui_outgoing_chat_msg now takes ProfChatWin as argument | James Booth | 2015-05-04 | 2 | -10/+8 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -24/+8 |
|\| | |||||
| * | Added roster list function to get display name for messages | James Booth | 2015-05-03 | 1 | -24/+8 |
| | | |||||
* | | 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-04-30 | 4 | -77/+23 |
|\| | |||||
| * | Move current win check to event, removed next and prev win functions | James Booth | 2015-04-30 | 4 | -77/+23 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 4 | -85/+62 |
|\| | |||||
| * | Removed ui_win_switch_num | James Booth | 2015-04-30 | 4 | -86/+62 |
| | | |||||
| * | Added assert to ui_switch_win | James Booth | 2015-04-30 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 2 | -16/+2 |
|\| | |||||
| * | Removed some ui functions, inlined | James Booth | 2015-04-30 | 2 | -16/+2 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 2 | -0/+7 |
|\| | |||||
| * | Added ui_win_error_line() | James Booth | 2015-04-29 | 2 | -0/+7 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 2 | -124/+63 |
|\| | |||||
| * | Return result on OTR message sending | James Booth | 2015-04-29 | 2 | -20/+8 |
| | | |||||
| * | 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 | 1 | -26/+0 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Removed commented code | James Booth | 2015-04-28 | 1 | -26/+0 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 4 | -56/+55 |
|\| | |||||
| * | Moved new chat win events to client events module | James Booth | 2015-04-21 | 4 | -56/+55 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 1 | -5/+0 |
|\| | |||||
| * | Removed unused otr check | James Booth | 2015-04-19 | 1 | -5/+0 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-12 | 7 | -6/+40 |
|\| |