about summary refs log tree commit diff stats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'pasis/prefs-alloc'James Booth2015-06-241-2/+2
|\
| * prefs: Don't mix allocator typesDmitry Podgorny2015-06-241-2/+2
* | Merge remote-tracking branch 'pasis/gpgme-h-check'James Booth2015-06-241-0/+2
|\ \
| * | pgp: Added include config.hDmitry Podgorny2015-06-241-0/+2
* | | Removed NULL checks when not requiredJames Booth2015-06-241-8/+4
|/ /
* / Free prefs strings, check for NULLs when closing pgp moduleJames Booth2015-06-244-6/+17
|/
* Merge remote-tracking branch 'pasis/stabber-linker'James Booth2015-06-231-1/+1
|\
| * autotools: Don't link profanity with libstabberDmitry Podgorny2015-06-231-1/+1
* | Merge remote-tracking branch 'pasis/ui-log-fix'James Booth2015-06-231-1/+1
|\ \
| * | ui: decreased log level of the message on resizingDmitry Podgorny2015-06-231-1/+1
| |/
* | Merge remote-tracking branch 'pasis/pgp-without-otr-fix'James Booth2015-06-231-2/+1
|\ \
| * | pgp: Fixed compilation error when libotr is not supportedDmitry Podgorny2015-06-231-2/+1
| |/
* / Added /pgp setkey commandJames Booth2015-06-236-9/+215
|/
* Added AC_SYS_LARGEFILE to configure.acJames Booth2015-06-231-0/+3
* Added PGP prefsJames Booth2015-06-225-0/+28
* Use AM_CPPFLAGS for gpgme-config --cflagsJames Booth2015-06-221-1/+1
* Use gpgme-configJames Booth2015-06-221-1/+6
* Tidied gpgme checkJames Booth2015-06-221-6/+4
* Merge remote-tracking branch 'pasis/configure-debug-args'James Booth2015-06-221-1/+1
|\
| * Don't ignore arguments passed to ./configure-debugDmitry Podgorny2015-06-221-1/+1
* | Merge remote-tracking branch 'pasis/shutdown-fix'James Booth2015-06-221-1/+1
|\ \ | |/ |/|
| * shutdown: Call prefs_close() after log_close()Dmitry Podgorny2015-06-221-1/+1
|/
* Updated CHANGELOGJames Booth2015-06-221-0/+1
* Merge remote-tracking branch 'pasis/configure-cleanup'James Booth2015-06-211-17/+4
|\
| * autotools: Avoid copy-paste in configure.acDmitry Podgorny2015-06-211-17/+4
* | Fixed pgp helpJames Booth2015-06-211-1/+1
* | Fixed /pgp help formattingJames Booth2015-06-211-1/+1
* | Added PGP logging preferencesJames Booth2015-06-219-20/+100
* | Moved setting otr.warn -> enc.warnJames Booth2015-06-2118-121/+46
* | Show message when contact ends PGPJames Booth2015-06-211-0/+4
* | Added /pgp end commandJames Booth2015-06-212-0/+25
* | Added enc_mode check when starting OTRJames Booth2015-06-211-0/+10
* | Encryption modes for sv_ev_incoming_messageJames Booth2015-06-214-22/+105
* | Tidied OTR and PGP combinations in client_events.cJames Booth2015-06-212-21/+39
* | Moved window creation to sv_ev_incoming_messageJames Booth2015-06-214-26/+28
* | Moved message display logic to sv_ev_incoming_messageJames Booth2015-06-214-16/+19
* | Extracted chat session code from message sendersJames Booth2015-06-211-49/+40
* | Added pgp checks for message sendingJames Booth2015-06-219-29/+124
* | Added window encyption mode for PGPJames Booth2015-06-207-88/+203
* | Merge branch 'master' into openpgpJames Booth2015-06-202-0/+19
|\|
| * Added /roster empty commandJames Booth2015-06-202-0/+19
* | Merge branch 'master' into openpgpJames Booth2015-06-191-0/+1
|\|
| * Added missing include client_events.cJames Booth2015-06-191-0/+1
* | Added initial /pgp start checksJames Booth2015-06-184-0/+113
* | Added cmd_pgp testsJames Booth2015-06-186-4/+69
* | Merge branch 'master' into openpgpJames Booth2015-06-171-1/+1
|\|
| * Merge remote-tracking branch 'quite/#513'James Booth2015-06-171-1/+1
| |\
| | * Let's only strip trailing whitespace when parsing commandDaniel2015-06-161-1/+1
* | | Merge branch 'master' into openpgpJames Booth2015-06-177-185/+139
|\| |
| * | Removed wins_get_current_* functionsJames Booth2015-06-177-185/+139