about summary refs log tree commit diff stats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into otrJames Booth2014-01-052-32/+33
|\ | | | | | | | | Conflicts: .gitignore
| * Added contact presence offline testJames Booth2014-01-051-3/+3
| |
| * Refactored contact display stringJames Booth2014-01-051-6/+3
| |
| * fixed segfault when home directory doesn't existDmitry Podgorny2014-01-031-27/+31
| |
* | Merge branch 'master' into otrJames Booth2014-01-031-4/+2
|\| | | | | | | | | Conflicts: configure.ac
| * Tidied navigation helpJames Booth2014-01-021-4/+2
| | | | | | | | | | | | Conflicts: src/ui/console.c
* | Merge branch 'master' into otrJames Booth2014-01-0221-792/+1146
|\| | | | | | | | | Conflicts: Makefile.am
| * Added full stop to /help help summaryJames Booth2014-01-021-1/+1
| | | | | | | | | | | | Conflicts: src/command/command.c
| * Added full stop to /grlog help summaryJames Booth2014-01-021-1/+1
| | | | | | | | | | | | Conflicts: src/command/command.c
| * Added full stop to /help service summaryJames Booth2014-01-021-1/+1
| |
| * Added full stop to /chlog help summaryJames Booth2014-01-021-1/+1
| | | | | | | | | | | | Conflicts: src/command/command.c
| * Added full stop to /about help summaryJames Booth2014-01-021-1/+1
| | | | | | | | | | | | Conflicts: src/command/command.c
| * Merge remote-tracking branch 'louiecaulfield/master'James Booth2013-12-293-7/+7
| |\
| | * src/ui/core.c: Removed duplicate const keywordJasper van Bourgognie2013-12-271-4/+4
| | |
| | * Fixed types of presence variables to resource_presence_type (avoid useless ↵Jasper van Bourgognie2013-12-272-3/+3
| | | | | | | | | | | | and implicit casts)
| * | Removed wins_refresh_console when not required for /sub command outputJames Booth2013-12-271-2/+0
| | | | | | | | | | | | Implicitly called by cons_show
| * | Added /sub command testJames Booth2013-12-271-1/+1
| |/
| * Test for presence update when changing priorityJames Booth2013-12-271-1/+2
| |
| * Changed messages on invalid prioritiesJames Booth2013-12-271-4/+4
| |
| * Added mock_accounts and fixed testsJames Booth2013-12-263-99/+141
| |
| * Bind remaining ui functions in main.cJames Booth2013-12-236-40/+67
| |
| * Bind console functions in main.cJames Booth2013-12-233-64/+68
| |
| * Bind ui core functions in main.cJames Booth2013-12-223-81/+78
| |
| * Bind roster functions in main.cJames Booth2013-12-223-6/+13
| |
| * Bind presence functions in main.cJames Booth2013-12-223-11/+17
| |
| * Bind message functions in main.cJames Booth2013-12-223-9/+15
| |
| * Bind iq functions in main.cJames Booth2013-12-223-4/+11
| |
| * Bind capabilities functions in main.cJames Booth2013-12-223-2/+9
| |
| * Bind bookmark functions in main.cJames Booth2013-12-223-5/+12
| |
| * Bind jabber functions in main.cJames Booth2013-12-224-14/+29
| |
| * Dynamically load UI functions, fixed testsJames Booth2013-12-229-528/+706
| |
| * Added mocks and stubs for cons_showJames Booth2013-12-192-3/+4
| |
| * Dynamically bind xmpp module apiJames Booth2013-12-188-143/+194
| |
* | Merge branch 'master' into otrJames Booth2013-12-181-3/+8
|\|
| * Added tests for setting presence prioritiesJames Booth2013-12-171-3/+8
| |
* | Merge branch 'master' into otrJames Booth2013-12-165-24/+29
|\| | | | | | | | | Conflicts: src/command/commands.c
| * Test account free'd after connectJames Booth2013-12-151-1/+1
| |
| * Moved fulljid logic to accountsJames Booth2013-12-153-6/+12
| |
| * Moved _ask_password to UI moduleJames Booth2013-12-153-16/+16
| |
* | Merge branch 'master' into otrJames Booth2013-12-1531-3499/+3682
|\| | | | | | | | | Conflicts: src/command/command.c
| * Seperated command functions into moduleJames Booth2013-12-155-2488/+2560
| |
| * Moved autocomplete tests to cmockaJames Booth2013-12-141-11/+11
| |
| * Added simple mock test, refactored rosterJames Booth2013-12-1426-571/+652
| |
| * Merge branch 'master' into refactorJames Booth2013-12-101-0/+49
| |\
| * \ Merge branch 'master' into refactorJames Booth2013-12-102-16/+22
| |\ \
| * \ \ Merge branch 'master' into refactorJames Booth2013-12-083-9/+46
| |\ \ \
| * \ \ \ Merge branch 'master' into refactorJames Booth2013-12-081-20/+43
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into refactor2James Booth2013-11-1116-31/+139
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ui/core.c
| * | | | | | Removed usages of ui_current_print_line from ui/core.cJames Booth2013-10-071-3/+3
| | | | | | |
| * | | | | | Tidy _ui_draw_win_titleJames Booth2013-10-071-3/+8
| | | | | | |