Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into otr | James Booth | 2014-01-05 | 2 | -32/+33 |
|\ | | | | | | | | | Conflicts: .gitignore | ||||
| * | Added contact presence offline test | James Booth | 2014-01-05 | 1 | -3/+3 |
| | | |||||
| * | Refactored contact display string | James Booth | 2014-01-05 | 1 | -6/+3 |
| | | |||||
| * | fixed segfault when home directory doesn't exist | Dmitry Podgorny | 2014-01-03 | 1 | -27/+31 |
| | | |||||
* | | Merge branch 'master' into otr | James Booth | 2014-01-03 | 1 | -4/+2 |
|\| | | | | | | | | | Conflicts: configure.ac | ||||
| * | Tidied navigation help | James Booth | 2014-01-02 | 1 | -4/+2 |
| | | | | | | | | | | | | Conflicts: src/ui/console.c | ||||
* | | Merge branch 'master' into otr | James Booth | 2014-01-02 | 21 | -792/+1146 |
|\| | | | | | | | | | Conflicts: Makefile.am | ||||
| * | Added full stop to /help help summary | James Booth | 2014-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Conflicts: src/command/command.c | ||||
| * | Added full stop to /grlog help summary | James Booth | 2014-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Conflicts: src/command/command.c | ||||
| * | Added full stop to /help service summary | James Booth | 2014-01-02 | 1 | -1/+1 |
| | | |||||
| * | Added full stop to /chlog help summary | James Booth | 2014-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Conflicts: src/command/command.c | ||||
| * | Added full stop to /about help summary | James Booth | 2014-01-02 | 1 | -1/+1 |
| | | | | | | | | | | | | Conflicts: src/command/command.c | ||||
| * | Merge remote-tracking branch 'louiecaulfield/master' | James Booth | 2013-12-29 | 3 | -7/+7 |
| |\ | |||||
| | * | src/ui/core.c: Removed duplicate const keyword | Jasper van Bourgognie | 2013-12-27 | 1 | -4/+4 |
| | | | |||||
| | * | Fixed types of presence variables to resource_presence_type (avoid useless ↵ | Jasper van Bourgognie | 2013-12-27 | 2 | -3/+3 |
| | | | | | | | | | | | | and implicit casts) | ||||
| * | | Removed wins_refresh_console when not required for /sub command output | James Booth | 2013-12-27 | 1 | -2/+0 |
| | | | | | | | | | | | | Implicitly called by cons_show | ||||
| * | | Added /sub command test | James Booth | 2013-12-27 | 1 | -1/+1 |
| |/ | |||||
| * | Test for presence update when changing priority | James Booth | 2013-12-27 | 1 | -1/+2 |
| | | |||||
| * | Changed messages on invalid priorities | James Booth | 2013-12-27 | 1 | -4/+4 |
| | | |||||
| * | Added mock_accounts and fixed tests | James Booth | 2013-12-26 | 3 | -99/+141 |
| | | |||||
| * | Bind remaining ui functions in main.c | James Booth | 2013-12-23 | 6 | -40/+67 |
| | | |||||
| * | Bind console functions in main.c | James Booth | 2013-12-23 | 3 | -64/+68 |
| | | |||||
| * | Bind ui core functions in main.c | James Booth | 2013-12-22 | 3 | -81/+78 |
| | | |||||
| * | Bind roster functions in main.c | James Booth | 2013-12-22 | 3 | -6/+13 |
| | | |||||
| * | Bind presence functions in main.c | James Booth | 2013-12-22 | 3 | -11/+17 |
| | | |||||
| * | Bind message functions in main.c | James Booth | 2013-12-22 | 3 | -9/+15 |
| | | |||||
| * | Bind iq functions in main.c | James Booth | 2013-12-22 | 3 | -4/+11 |
| | | |||||
| * | Bind capabilities functions in main.c | James Booth | 2013-12-22 | 3 | -2/+9 |
| | | |||||
| * | Bind bookmark functions in main.c | James Booth | 2013-12-22 | 3 | -5/+12 |
| | | |||||
| * | Bind jabber functions in main.c | James Booth | 2013-12-22 | 4 | -14/+29 |
| | | |||||
| * | Dynamically load UI functions, fixed tests | James Booth | 2013-12-22 | 9 | -528/+706 |
| | | |||||
| * | Added mocks and stubs for cons_show | James Booth | 2013-12-19 | 2 | -3/+4 |
| | | |||||
| * | Dynamically bind xmpp module api | James Booth | 2013-12-18 | 8 | -143/+194 |
| | | |||||
* | | Merge branch 'master' into otr | James Booth | 2013-12-18 | 1 | -3/+8 |
|\| | |||||
| * | Added tests for setting presence priorities | James Booth | 2013-12-17 | 1 | -3/+8 |
| | | |||||
* | | Merge branch 'master' into otr | James Booth | 2013-12-16 | 5 | -24/+29 |
|\| | | | | | | | | | Conflicts: src/command/commands.c | ||||
| * | Test account free'd after connect | James Booth | 2013-12-15 | 1 | -1/+1 |
| | | |||||
| * | Moved fulljid logic to accounts | James Booth | 2013-12-15 | 3 | -6/+12 |
| | | |||||
| * | Moved _ask_password to UI module | James Booth | 2013-12-15 | 3 | -16/+16 |
| | | |||||
* | | Merge branch 'master' into otr | James Booth | 2013-12-15 | 31 | -3499/+3682 |
|\| | | | | | | | | | Conflicts: src/command/command.c | ||||
| * | Seperated command functions into module | James Booth | 2013-12-15 | 5 | -2488/+2560 |
| | | |||||
| * | Moved autocomplete tests to cmocka | James Booth | 2013-12-14 | 1 | -11/+11 |
| | | |||||
| * | Added simple mock test, refactored roster | James Booth | 2013-12-14 | 26 | -571/+652 |
| | | |||||
| * | Merge branch 'master' into refactor | James Booth | 2013-12-10 | 1 | -0/+49 |
| |\ | |||||
| * \ | Merge branch 'master' into refactor | James Booth | 2013-12-10 | 2 | -16/+22 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into refactor | James Booth | 2013-12-08 | 3 | -9/+46 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into refactor | James Booth | 2013-12-08 | 1 | -20/+43 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into refactor2 | James Booth | 2013-11-11 | 16 | -31/+139 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ui/core.c | ||||
| * | | | | | | Removed usages of ui_current_print_line from ui/core.c | James Booth | 2013-10-07 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Tidy _ui_draw_win_title | James Booth | 2013-10-07 | 1 | -3/+8 |
| | | | | | | |