about summary refs log tree commit diff stats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Return after message receiptJames Booth2015-03-141-1/+1
|
* Merge branch 'master' into xep-0184James Booth2015-03-143-3/+46
|\ | | | | | | | | | | | | | | 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-143-1/+45
| |
* | 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-145-24/+20
| |
* | 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-119-31/+49
| |
* | Added basic delivery receiptsJames Booth2015-03-119-37/+156
|/
* Added /time statusbar preferenceJames Booth2015-03-107-36/+141
|
* Send private carbons element with message when encryptedJames Booth2015-03-108-17/+54
|
* 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-0815-2/+164
|\
| * mergeOlivier LE MOAL2015-02-231-1/+6
| |\
| | * fix segfault on self sent message carbonOlivier Le Moal2015-02-211-0/+5
| | |
| | * 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-1015-1/+158
| | |
* | | Merge branch 'master' into readlineJames Booth2015-03-081-4/+5
|\ \ \
| * | | Fixed swapping windows when in source winJames Booth2015-03-031-4/+5
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-262-11/+11
|\| | |
| * | | Renamed /theme set -> /theme loadJames Booth2015-02-262-11/+11
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-252-31/+17
|\| | |
| * | | Upgrade otr warn preference, added UI theme settingsJames Booth2015-02-252-31/+17
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-242-4/+16
|\| | |
| * | | Updated default preferencesJames Booth2015-02-242-5/+14
| | | |
| * | | Added /roster by preference to UI preferences summaryJames Booth2015-02-241-0/+3
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-241-2/+2
|\| | |
| * | | Fixed /resource preference displayJames Booth2015-02-241-2/+2
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-231-1/+1
|\| | |
| * | | Fixed create_fulljidJames Booth2015-02-231-1/+1
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-233-7/+17
|\| | |
| * | | Lowercase barejid in JidJames Booth2015-02-232-2/+8
| | | |
| * | | Lowercase barejid before searching rosterJames Booth2015-02-231-5/+9
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-231-9/+11
|\| | |
| * | | Lowercase barejid before adding to rosterJames Booth2015-02-231-9/+11
| | | |
* | | | Merge branch 'master' into readlineJames Booth2015-02-2311-35/+35
|\| | |
| * | | Merge remote-tracking branch 'stormc/master-spellfixes'James Booth2015-02-2311-35/+35
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/command/command.c
| | * | | Fixed spelling.Christian Storm2015-02-1711-38/+38
| | | | |
* | | | | Merge branch 'master' into readlineJames Booth2015-02-231-279/+331
|\| | | |