about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nextdevJames Booth2013-08-041-2/+4
|\
| * Added patch from Dmitry to fix crash on delayed message from contact not in ↵James Booth2013-08-041-2/+4
| | | | | | | | | | | | roster fixes #219
* | Merge remote-tracking branch 'dmitry/memleaks' into nextdevJames Booth2013-07-313-54/+75
|\ \
| * | separate glib allocator and stdlib malloc/freeDmitry Podgorny2013-07-311-6/+6
| | | | | | | | | | | | | | | | | | Memory allocated by glib should be freed by g_free. Probably g_free calls stdlib free, but in order to avoid portability issues better use g_free as described in glib documentation.
| * | rewritten FREE_SET_NULL and GFREE_SET_NULLDmitry Podgorny2013-07-311-8/+6
| | | | | | | | | | | | | | | NULL is valid argument for free(). Construction do {} while (0) allows using FREE_SET_NULL as one token and force to put semicolon at the end.
| * | fixed several memory leaks in command.c and jid.cDmitry Podgorny2013-07-312-40/+63
| | |
* | | Merge branch 'master' into nextdevJames Booth2013-07-311-1/+6
|\ \ \ | | |/ | |/|
| * | fixed null pointer dereference in /join commandDmitry Podgorny2013-07-311-1/+6
| |/ | | | | | | Command /join @/ leads to crash because jid_create("@/") returns NULL
* | Merge branch 'master' into nextdevJames Booth2013-07-301-2/+2
|\|
| * Updated install-all.sh with new libstrophe urlJames Booth2013-07-221-2/+2
| |
* | Merge branch 'master' into nextdevJames Booth2013-07-222-7/+9
|\|
| * Updated man pageJames Booth2013-07-221-2/+8
| |
| * Removed escaping XML as handled by libstropheJames Booth2013-07-221-5/+1
| | | | | | | | https://github.com/metajack/libstrophe/commit/4ad21c9283ceae9109ea71860aa27814222c9ee3
* | Merge branch 'master' into nextdevJames Booth2013-07-214-10/+22
|\|
| * Fixed typo on /invite helpJames Booth2013-07-201-1/+1
| |
| * Fix freetext arguments with quotesJames Booth2013-07-201-5/+5
| | | | | | | | fixes #203
| * Added test for quoted freetext in parserJames Booth2013-07-201-0/+13
| |
| * Merge remote-tracking branch 'dmitry/fixes'James Booth2013-07-142-4/+3
| |\
| | * removed useless code in autocomplete.cDmitry Podgorny2013-07-141-2/+1
| | |
| | * fixed typos in command.cDmitry Podgorny2013-07-141-2/+2
| | |
* | | Bookmarks: Move stanza pointer on in loop, check for autojoin "true"James Booth2013-07-151-2/+4
| | |
* | | Merge remote-tracking branch 'dmitry/bookmarks' into nextdevJames Booth2013-07-148-49/+330
|\ \ \
| * | | draft of bookmarks implementationDmitry Podgorny2013-07-145-30/+288
| | | | | | | | | | | | | | | | '/bookmark add' and '/bookmark remove' ain't finished
| * | | improved autojoin logicDmitry Podgorny2013-07-141-15/+49
| | | | | | | | | | | | | | | | | | | | Delete id handler after timeout (5sec) if response isn't received Auto join maximum 5 conferences
| * | | Merge branch 'master' into bookmarksDmitry Podgorny2013-07-1412-130/+248
| |\ \ \ | | | |/ | | |/|
| * | | use get_unique_id for bookmarksDmitry Podgorny2013-07-144-26/+15
| | | |
* | | | Merge branch 'master' into nextdevJames Booth2013-07-149-112/+275
|\ \ \ \ | | |_|/ | |/| |
| * | | Remaining parser function unicode compatibleJames Booth2013-07-141-30/+29
| | | |
| * | | Added parser testsJames Booth2013-07-142-2/+131
| | | |
| * | | Implemented parse_args_with_freetext with unicode compatibilityJames Booth2013-07-141-20/+26
| | | |
| * | | Implemented parse_args with unicode compatibilityJames Booth2013-07-141-4/+17
| | | |
| * | | Merge branch 'master' into unicodeJames Booth2013-07-133-3/+11
| |\ \ \ | | | |/ | | |/|
| | * | Down arrow adds current line to history and shows empty lineJames Booth2013-07-133-3/+11
| | | |
| * | | Handle unicode chars in command parserJames Booth2013-07-121-9/+14
| | | |
| * | | Removed if clause in parserJames Booth2013-07-111-2/+0
| | | |
| * | | Moved functions to parser.c, moved parser to toolsJames Booth2013-07-116-83/+88
| |/ /
* | | Merge branch 'master' into nextdevJames Booth2013-07-091-10/+0
|\| |
| * | Removed debugJames Booth2013-07-091-10/+0
| | |
* | | Merge branch 'master' into nextdevJames Booth2013-07-098-86/+207
|\| |
| * | Fix autocompletion of quoted strings - WIPJames Booth2013-07-092-23/+104
| | | | | | | | | | | | | | | | | | | | | Needs some refactoring Need to use unicode functions in: parser.c autocomplete.c
| * | Coloured contact and subscription in /roster and /group outputJames Booth2013-07-036-63/+103
| | |
* | | Merge branch 'master' into nextdevJames Booth2013-07-031-2/+2
|\| |
| * | Fixed naming clash for roster helpJames Booth2013-07-031-2/+2
| | |
* | | Merge remote-tracking branch 'dmitry/bookmarks' into nextdevJames Booth2013-07-017-0/+204
|\ \ \ | |/ / |/| / | |/
| * initial support of autojoin for MUCDmitry Podgorny2013-06-307-0/+204
| |
* | Tidied helpJames Booth2013-06-301-33/+31
| |
* | Merge pull request #196 from pasis/memleaksJames Booth2013-06-301-3/+4
|\ \ | | | | | | Fixed memory leaks in command.c
| * | fixed memory leaks in command.cDmitry Podgorny2013-06-301-3/+4
| |/
* | Merge pull request #197 from SamWhited/patch-1James Booth2013-06-301-1/+1
|\ \ | |/ |/| Fix a small typo
| * Fix a small typoSam Whited2013-06-301-1/+1
|/ | | (`Invalud' -> `Invalid')