Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Added receipt.sent theme setting | James Booth | 2015-03-15 | 18 | -78/+97 | |
| | ||||||
* | Merge branch 'master' into xep-0184 | James Booth | 2015-03-15 | 1 | -2/+2 | |
|\ | ||||||
| * | Added freebsd check for libnotify | James Booth | 2015-03-15 | 1 | -2/+2 | |
| | | ||||||
* | | Fixed merge | James Booth | 2015-03-15 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into xep-0184 | James Booth | 2015-03-15 | 3 | -6/+64 | |
|\| | ||||||
| * | Added OTR error messages | James Booth | 2015-03-15 | 3 | -6/+64 | |
| | | ||||||
* | | Return after message receipt | James Booth | 2015-03-14 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into xep-0184 | James Booth | 2015-03-14 | 4 | -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 carbon | James Booth | 2015-03-14 | 4 | -1/+47 | |
| | | ||||||
* | | Merge branch 'master' into xep-0184 | James Booth | 2015-03-14 | 1 | -1/+1 | |
|\| | ||||||
| * | Check for sent and received carbons | James Booth | 2015-03-14 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into xep-0184 | James Booth | 2015-03-14 | 1 | -33/+36 | |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | |||||
| * | Fixed error with /otr start with carbons enabled | James Booth | 2015-03-14 | 1 | -33/+36 | |
| | | ||||||
* | | Use colouring for message receipts | James Booth | 2015-03-14 | 5 | -20/+92 | |
| | | ||||||
* | | Removed from argument from outgoing message functions | James Booth | 2015-03-14 | 6 | -28/+22 | |
| | | ||||||
* | | Renamed win_save_newline -> win_newline | James Booth | 2015-03-14 | 4 | -26/+26 | |
| | | ||||||
* | | Renamed win_save_println -> win_println | James Booth | 2015-03-14 | 5 | -26/+26 | |
| | | ||||||
* | | Renamed win_save_print -> win_print | James Booth | 2015-03-14 | 6 | -187/+187 | |
| | | ||||||
* | | Renamed win_save_vprint -> win_vprint | James Booth | 2015-03-14 | 5 | -199/+199 | |
| | | ||||||
* | | Show message received text for receipts | James Booth | 2015-03-11 | 11 | -34/+54 | |
| | | ||||||
* | | Added basic delivery receipts | James Booth | 2015-03-11 | 10 | -37/+158 | |
|/ | ||||||
* | Added /time statusbar preference | James Booth | 2015-03-10 | 10 | -36/+144 | |
| | ||||||
* | Updated changelog | James Booth | 2015-03-10 | 1 | -0/+6 | |
| | ||||||
* | Send private carbons element with message when encrypted | James Booth | 2015-03-10 | 10 | -19/+62 | |
| | ||||||
* | Added server error handling when setting /carbons preference | James Booth | 2015-03-09 | 5 | -47/+80 | |
| | ||||||
* | Added /carbons autocompletion | James Booth | 2015-03-09 | 1 | -1/+1 | |
| | ||||||
* | Added connection check before sending carbons enable/disable IQ | James Booth | 2015-03-09 | 1 | -0/+7 | |
| | ||||||
* | Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280 | James Booth | 2015-03-08 | 17 | -2/+167 | |
|\ | ||||||
| * | Upgrade CMocka to 1.0.0 | Olivier LE MOAL | 2015-02-25 | 1 | -4/+4 | |
| | | ||||||
| * | merge | Olivier LE MOAL | 2015-02-23 | 1 | -1/+6 | |
| |\ | ||||||
| | * | fix segfault on self sent message carbon | Olivier Le Moal | 2015-02-21 | 1 | -0/+5 | |
| | | | ||||||
| | * | Fix stub | Olivier LE MOAL | 2015-02-03 | 1 | -2/+2 | |
| | | | ||||||
| | * | Add declarations to tests headers | Olivier LE MOAL | 2015-02-03 | 2 | -0/+3 | |
| | | | ||||||
| | * | Add /carbons in /help settings | Olivier LE MOAL | 2015-02-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fix help for message carbons | Olivier LE MOAL | 2015-02-03 | 2 | -3/+2 | |
| | | | ||||||
| | * | Add preference/commands for carbons message | Olivier LE MOAL | 2015-02-03 | 12 | -6/+85 | |
| | | | ||||||
| | * | Add XEP-0280 support | Olivier LE MOAL | 2015-02-02 | 8 | -0/+79 | |
| | | | ||||||
| * | | Add XEP-0280 support | Olivier LE MOAL | 2015-02-10 | 17 | -1/+161 | |
| | | | ||||||
* | | | Added libreadline-devel to install-all.sh for cygwin | James Booth | 2015-03-08 | 1 | -2/+2 | |
| | | | ||||||
* | | | Added readline-devel to install-all.sh for opensuse | James Booth | 2015-03-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Added readline-devel to instal-all.sh for fedora | James Booth | 2015-03-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Added libreadline-dev to install-all.sh for ubuntu | James Booth | 2015-03-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Added conditional OSX check for readline | James Booth | 2015-03-08 | 1 | -9/+10 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/readline' into readline | James Booth | 2015-03-08 | 0 | -0/+0 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' into readline | James Booth | 2015-03-04 | 2 | -1/+7 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into readline | James Booth | 2015-03-04 | 1 | -0/+1 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into readline | James Booth | 2015-03-04 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into readline | James Booth | 2015-03-03 | 1 | -4/+5 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into readline | James Booth | 2015-02-26 | 19 | -417/+436 | |
| |\ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ | Merge branch 'master' into readline | James Booth | 2015-03-08 | 24 | -423/+450 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | |