about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into notificationsJames Booth2015-11-254-0/+111
|\
| * Merge remote-tracking branch 'incertia/export-command'James Booth2015-11-254-0/+111
| |\
| | * add spaces after constructs such as if/for/whileWill Song2015-11-241-13/+13
| | * free fname as soon as we are done with it (also prevents a memory leak)Will Song2015-11-241-1/+1
| | * remove NULL check because parse_args will fail before calling cmd_exportWill Song2015-11-241-3/+1
| | * add some code to deal with a common $HOME conventionWill Song2015-11-241-1/+13
| | * show different message when one is not connectedWill Song2015-11-241-3/+9
| | * move brace to newline to follow conventionsWill Song2015-11-241-1/+2
| | * styling changes and remove temporary commentWill Song2015-11-241-7/+5
| | * actually check the return value of write for rare fail conditionsWill Song2015-11-231-13/+21
| | * ignore another return value and move initial loop declaration outside of loopWill Song2015-11-231-4/+5
| | * mark return value of sys_write as unused to fix testsWill Song2015-11-231-4/+7
| | * update CHANGELOGWill Song2015-11-231-0/+1
| | * since we keep track of length correctly, we don't need to add a null terminat...Will Song2015-11-231-1/+1
| | * fix typoWill Song2015-11-231-1/+1
| | * decrease the amount of sys_writes used and add a useful error messageWill Song2015-11-231-8/+22
| | * add feature in issue #585Will Song2015-11-233-0/+69
| |/
* | Tidy regular chat and room notificationsJames Booth2015-11-248-59/+127
* | Added autocompleters for notify trigger removalJames Booth2015-11-243-0/+81
* | Added functions to manage custom notification triggersJames Booth2015-11-243-10/+130
* | Merge branch 'master' into notificationsJames Booth2015-11-244-93/+181
|\|
| * Added conf_string_list_addJames Booth2015-11-243-42/+52
| * Created config/conflists.c for shared config list handlingJames Booth2015-11-234-51/+129
* | Added notify triggers WIPJames Booth2015-11-235-12/+116
|/
* Show error message when OTR key cannot be loadedJames Booth2015-11-231-9/+18
* Show summary of trusted certificates, add /tls cert <fingerprint>James Booth2015-11-227-19/+90
* Tidied roster commandsJames Booth2015-11-228-152/+186
* Added /roster resource joinJames Booth2015-11-225-17/+79
* Removed whitespace from boothj5 themeJames Booth2015-11-221-15/+15
* Added /roster char resourceJames Booth2015-11-229-0/+76
* Updated helpJames Booth2015-11-221-3/+3
* Updated themesJames Booth2015-11-223-0/+3
* Added word wrap to roster panelJames Booth2015-11-2211-19/+60
* Pass wrap boolean to win_sub_print()James Booth2015-11-224-18/+18
* Renamed subwin functionsJames Booth2015-11-224-27/+27
* Updated themesJames Booth2015-11-226-14/+37
* Option to show presence information on single line in rosterJames Booth2015-11-225-44/+94
* Added /roster indent presenceJames Booth2015-11-216-9/+61
* Added /roster indent resourceJames Booth2015-11-216-83/+141
* Tidy rosterwinJames Booth2015-11-211-59/+61
* Free pref stringsJames Booth2015-11-213-10/+31
* Added /roster indent contactJames Booth2015-11-219-129/+202
* Don't print empty line when no presence or status displayed in rosterJames Booth2015-11-201-1/+1
* Merge remote-tracking branch 'kiethandi/patch-2'James Booth2015-11-201-0/+2
|\
| * Update privwin.ckiethandi2015-11-201-1/+2
| * Update privwin.ckiethandi2015-11-201-0/+1
* | Removed unused priority settingsJames Booth2015-11-205-16/+1
|/
* Added /roster char contactJames Booth2015-11-2010-0/+83
* Added missing includeJames Booth2015-11-191-0/+1
* Added /roster char headerJames Booth2015-11-199-11/+127