about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into xep-0184James Booth2015-03-144-3/+47
|\| | | | | | | | | | | | | | | Conflicts: src/server_events.c src/ui/core.c src/ui/ui.h tests/ui/stub_ui.c
| * Don't switch window on sent carbonJames Booth2015-03-144-1/+47
| |
* | Merge branch 'master' into xep-0184James Booth2015-03-141-1/+1
|\|
| * Check for sent and received carbonsJames Booth2015-03-141-1/+1
| |
* | Merge branch 'master' into xep-0184James Booth2015-03-141-33/+36
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Fixed error with /otr start with carbons enabledJames Booth2015-03-141-33/+36
| |
* | Use colouring for message receiptsJames Booth2015-03-145-20/+92
| |
* | Removed from argument from outgoing message functionsJames Booth2015-03-146-28/+22
| |
* | Renamed win_save_newline -> win_newlineJames Booth2015-03-144-26/+26
| |
* | Renamed win_save_println -> win_printlnJames Booth2015-03-145-26/+26
| |
* | Renamed win_save_print -> win_printJames Booth2015-03-146-187/+187
| |
* | Renamed win_save_vprint -> win_vprintJames Booth2015-03-145-199/+199
| |
* | Show message received text for receiptsJames Booth2015-03-1111-34/+54
| |
* | Added basic delivery receiptsJames Booth2015-03-1110-37/+158
|/
* Added /time statusbar preferenceJames Booth2015-03-1010-36/+144
|
* Updated changelogJames Booth2015-03-101-0/+6
|
* Send private carbons element with message when encryptedJames Booth2015-03-1010-19/+62
|
* Added server error handling when setting /carbons preferenceJames Booth2015-03-095-47/+80
|
* Added /carbons autocompletionJames Booth2015-03-091-1/+1
|
* Added connection check before sending carbons enable/disable IQJames Booth2015-03-091-0/+7
|
* Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280James Booth2015-03-0817-2/+167
|\
| * Upgrade CMocka to 1.0.0Olivier LE MOAL2015-02-251-4/+4
| |
| * mergeOlivier LE MOAL2015-02-231-1/+6
| |\
| | * fix segfault on self sent message carbonOlivier Le Moal2015-02-211-0/+5
| | |
| | * Fix stubOlivier LE MOAL2015-02-031-2/+2
| | |
| | * Add declarations to tests headersOlivier LE MOAL2015-02-032-0/+3
| | |
| | * Add /carbons in /help settingsOlivier LE MOAL2015-02-031-1/+1
| | |
| | * Fix help for message carbonsOlivier LE MOAL2015-02-032-3/+2
| | |
| | * Add preference/commands for carbons messageOlivier LE MOAL2015-02-0312-6/+85
| | |
| | * Add XEP-0280 supportOlivier LE MOAL2015-02-028-0/+79
| | |
| * | Add XEP-0280 supportOlivier LE MOAL2015-02-1017-1/+161
| | |
* | | Added libreadline-devel to install-all.sh for cygwinJames Booth2015-03-081-2/+2
| | |
* | | Added readline-devel to install-all.sh for opensuseJames Booth2015-03-081-1/+1
| | |
* | | Added readline-devel to instal-all.sh for fedoraJames Booth2015-03-081-1/+1
| | |
* | | Added libreadline-dev to install-all.sh for ubuntuJames Booth2015-03-081-1/+1
| | |
* | | Added conditional OSX check for readlineJames Booth2015-03-081-9/+10
| | |
* | | Merge remote-tracking branch 'origin/readline' into readlineJames Booth2015-03-080-0/+0
|\ \ \
| * \ \ Merge branch 'master' into readlineJames Booth2015-03-042-1/+7
| |\ \ \
| * \ \ \ Merge branch 'master' into readlineJames Booth2015-03-041-0/+1
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into readlineJames Booth2015-03-041-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into readlineJames Booth2015-03-031-4/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into readlineJames Booth2015-02-2619-417/+436
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'master' into readlineJames Booth2015-03-0824-423/+450
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fixed tests for --disable-otrJames Booth2015-03-042-1/+7
| | |_|_|/ / / | |/| | | | |
| * | | | | | Added profanity.sh (OSX helper script for codelite) to .gitignoreJames Booth2015-03-041-0/+1
| | |_|/ / / | |/| | | |
| * | | | | Set version to 0.4.7 developmentJames Booth2015-03-042-4/+2
| | | | | |
| * | | | | Set version to 0.4.6James Booth2015-03-032-1/+3
| | |/ / / | |/| | |
| * | | | Fixed swapping windows when in source winJames Booth2015-03-031-4/+5
| |/ / /
| * | | Updated themes for releaseJames Booth2015-02-2619-417/+436
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-262-11/+11
|\| | |