about summary refs log tree commit diff stats
path: root/src/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into pgpJames Booth2015-04-302-16/+2
|\
| * Removed some ui functions, inlinedJames Booth2015-04-302-16/+2
| |
* | Merge branch 'master' into pgpJames Booth2015-04-292-0/+7
|\|
| * Added ui_win_error_line()James Booth2015-04-292-0/+7
| |
* | Merge branch 'master' into pgpJames Booth2015-04-292-124/+63
|\|
| * Return result on OTR message sendingJames Booth2015-04-292-20/+8
| |
| * Reuse ui_new_chat_winJames Booth2015-04-291-55/+17
| |
| * _win_show_history takes ProfChatWin as first argJames Booth2015-04-291-66/+55
| |
* | Merge branch 'master' into pgpJames Booth2015-04-281-26/+0
|\| | | | | | | | | Conflicts: src/xmpp/message.c
| * Removed commented codeJames Booth2015-04-281-26/+0
| |
* | Merge branch 'master' into pgpJames Booth2015-04-214-56/+55
|\|
| * Moved new chat win events to client events moduleJames Booth2015-04-214-56/+55
| |
* | Merge branch 'master' into pgpJames Booth2015-04-211-5/+0
|\|
| * Removed unused otr checkJames Booth2015-04-191-5/+0
| |
* | Merge branch 'master' into pgpJames Booth2015-04-127-6/+40
|\|
| * Added option to show jids in occupants panelJames Booth2015-04-127-6/+40
| |
* | Added pgpkeyid account setting, send signed presenceJames Booth2015-03-231-0/+4
|/
* Added individual options to send and request delivery receiptsJames Booth2015-03-193-5/+11
|
* Merge remote-tracking branch 'origin/master'James Booth2015-03-181-1/+1
|\
| * Fix buffer entry freeJames Booth2015-03-171-1/+1
| |
* | Added keybindings for rxvtJames Booth2015-03-181-6/+13
|/
* Added static functions to commands.c for sending messagesJames Booth2015-03-161-1/+0
|
* Tidied helpJames Booth2015-03-151-12/+14
|
* Added /receipts commandJames Booth2015-03-152-0/+10
|
* Added receipt.sent theme settingJames Booth2015-03-151-3/+3
|
* Fixed mergeJames Booth2015-03-151-1/+1
|
* Merge branch 'master' into xep-0184James Booth2015-03-152-0/+13
|\
| * Added OTR error messagesJames Booth2015-03-152-0/+13
| |
* | Merge branch 'master' into xep-0184James Booth2015-03-142-0/+42
|\| | | | | | | | | | | | | | | 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-142-0/+44
| |
* | Use colouring for message receiptsJames Booth2015-03-145-20/+92
| |
* | Removed from argument from outgoing message functionsJames Booth2015-03-142-11/+7
| |
* | Renamed win_save_newline -> win_newlineJames Booth2015-03-144-26/+26
| |
* | Renamed win_save_println -> win_printlnJames Booth2015-03-144-22/+22
| |
* | Renamed win_save_print -> win_printJames Booth2015-03-145-182/+182
| |
* | Renamed win_save_vprint -> win_vprintJames Booth2015-03-144-191/+191
| |
* | Show message received text for receiptsJames Booth2015-03-112-3/+12
| |
* | Added basic delivery receiptsJames Booth2015-03-112-0/+14
|/
* Added /time statusbar preferenceJames Booth2015-03-102-12/+52
|
* Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280James Booth2015-03-082-0/+10
|\
| * Add XEP-0280 supportOlivier LE MOAL2015-02-102-0/+10
| |
* | 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-241-0/+3
|\| |
| * | Updated default preferencesJames Booth2015-02-241-1/+1
| | |
| * | 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-234-8/+8
|\| |
| * | Fixed spelling.Christian Storm2015-02-174-8/+8
| | |