Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into openpgp | James Booth | 2015-06-17 | 4 | -371/+328 |
|\ | | | | | | | | | | | Conflicts: src/command/commands.c src/command/commands.h | ||||
| * | Removed unused function prototype | James Booth | 2015-06-17 | 1 | -2/+0 |
| | | |||||
| * | Added current window reference to command functions | James Booth | 2015-06-17 | 3 | -268/+228 |
| | | |||||
| * | Pass current window to autocompleters | James Booth | 2015-06-16 | 4 | -99/+98 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 1 | -79/+118 |
|\| | |||||
| * | Tidied cmd_otr, added check-unit target to Makefile | James Booth | 2015-06-15 | 1 | -79/+118 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 1 | -2/+2 |
|\| | |||||
| * | Removed ui_get_current_chat() | James Booth | 2015-06-15 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 2 | -3/+4 |
|\| | |||||
| * | Moved UI interfaces to ui.h | James Booth | 2015-06-15 | 1 | -1/+1 |
| | | |||||
| * | Moved ui/windows -> window_list | James Booth | 2015-06-15 | 2 | -2/+2 |
| | | |||||
| * | Added win_clear() function | James Booth | 2015-06-15 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-14 | 1 | -15/+54 |
|\| | |||||
| * | Set columns when running functional tests | James Booth | 2015-06-13 | 1 | -15/+54 |
| | | |||||
* | | Show message when offline for /pgp fps | James Booth | 2015-06-13 | 1 | -13/+18 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-02 | 3 | -3/+33 |
|\| | |||||
| * | Merge remote-tracking branch 'PMaynard/#551' | James Booth | 2015-06-02 | 3 | -3/+33 |
| |\ | |||||
| | * | Tidy up windows when enabling | Pete | 2015-06-01 | 1 | -0/+4 |
| | | | |||||
| | * | Extra underline | Pete Maynard | 2015-06-01 | 1 | -1/+1 |
| | | | |||||
| | * | Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected ↵ | Pete | 2015-06-01 | 2 | -4/+7 |
| | | | | | | | | | | | | underline, removed call to function 'wins_resize_all()'. | ||||
| | * | Added window auto tidy. | Pete | 2015-05-29 | 3 | -2/+26 |
| |/ | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-17 | 1 | -14/+12 |
|\| | |||||
| * | allow enabling / disabling carbons without being connected. | Adam Ehlers Nyholm Thomsen | 2015-05-17 | 1 | -14/+12 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 1 | -3/+3 |
|\| | |||||
| * | Added cl_ev_presence_send | James Booth | 2015-05-07 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 1 | -3/+3 |
|\| | |||||
| * | Renamed presence_update -> presence_send | James Booth | 2015-05-07 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-05 | 1 | -22/+26 |
|\| | |||||
| * | Tidied form field autocompleters | James Booth | 2015-05-05 | 1 | -22/+26 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 2 | -160/+160 |
|\| | |||||
| * | Use null check convention in commands.c | James Booth | 2015-05-04 | 1 | -50/+50 |
| | | |||||
| * | Use null check convention in command.c | James Booth | 2015-05-04 | 1 | -110/+110 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -5/+9 |
|\| | |||||
| * | Added ui_ev_new_private_win to ui events | James Booth | 2015-05-04 | 1 | -5/+9 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -2/+2 |
|\| | |||||
| * | cl_ev_send_muc_msg takes ProfMucWin as arg | James Booth | 2015-05-04 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -9/+3 |
|\| | |||||
| * | Move current win check to event, removed next and prev win functions | James Booth | 2015-04-30 | 1 | -9/+3 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -10/+14 |
|\| | |||||
| * | Removed ui_win_switch_num | James Booth | 2015-04-30 | 1 | -10/+14 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -11/+11 |
|\| | |||||
| * | Removed some ui functions, inlined | James Booth | 2015-04-30 | 1 | -11/+11 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 1 | -17/+15 |
|\| | |||||
| * | Return result on OTR message sending | James Booth | 2015-04-29 | 1 | -15/+15 |
| | | |||||
| * | Return new window on new chat win event | James Booth | 2015-04-29 | 1 | -8/+6 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-28 | 1 | -16/+17 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Added ui events module | James Booth | 2015-04-28 | 1 | -0/+1 |
| | | |||||
| * | Renamed event functions | James Booth | 2015-04-28 | 1 | -16/+16 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-23 | 1 | -6/+31 |
|\| | | | | | | | | | Conflicts: src/config/account.h | ||||
| * | Tidied account login | James Booth | 2015-04-23 | 1 | -6/+31 |
| | |