about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ | | | | | log_msg() uses prefs, so prefs_close() should be called after log_close(). It makes possible to use logs in other finalisation functions.
* 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
| | | | | | | | | | | | | | | | | | Allows for "quoting" a command--doing nothing but sending the string: SPC/command As we're used to from for example irc clients. Fixes boothj5/profanity#513
* | | Merge branch 'master' into openpgpJames Booth2015-06-177-185/+139
|\| |
| * | Removed wins_get_current_* functionsJames Booth2015-06-177-185/+139
| | |
* | | Merge branch 'master' into openpgpJames Booth2015-06-1725-686/+691
|\| | | | | | | | | | | | | | | | | Conflicts: src/command/commands.c src/command/commands.h
| * | Removed unused function prototypeJames Booth2015-06-171-2/+0
| | |
| * | Added current window reference to command functionsJames Booth2015-06-1724-578/+582
| | |
| * | Pass current window to autocompletersJames Booth2015-06-166-104/+107
| |/
* | Merge branch 'master' into openpgpJames Booth2015-06-156-103/+157
|\|
| * Tidied cmd_otr, added check-unit target to MakefileJames Booth2015-06-156-103/+157
| |
* | Merge branch 'master' into openpgpJames Booth2015-06-155-27/+25
|\|
| * Removed ui_get_current_chat()James Booth2015-06-155-27/+25
| |
* | Merge branch 'master' into openpgpJames Booth2015-06-1528-275/+312
|\|
| * Moved UI interfaces to ui.hJames Booth2015-06-1511-139/+208
| |