Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'pasis/pgp-without-otr-fix' | James Booth | 2015-06-23 | 1 | -2/+1 |
|\ | |||||
| * | pgp: Fixed compilation error when libotr is not supported | Dmitry Podgorny | 2015-06-23 | 1 | -2/+1 |
| | | |||||
* | | Added /pgp setkey command | James Booth | 2015-06-23 | 6 | -9/+215 |
|/ | |||||
* | Added AC_SYS_LARGEFILE to configure.ac | James Booth | 2015-06-23 | 1 | -0/+3 |
| | |||||
* | Added PGP prefs | James Booth | 2015-06-22 | 5 | -0/+28 |
| | |||||
* | Use AM_CPPFLAGS for gpgme-config --cflags | James Booth | 2015-06-22 | 1 | -1/+1 |
| | |||||
* | Use gpgme-config | James Booth | 2015-06-22 | 1 | -1/+6 |
| | |||||
* | Tidied gpgme check | James Booth | 2015-06-22 | 1 | -6/+4 |
| | |||||
* | Merge remote-tracking branch 'pasis/configure-debug-args' | James Booth | 2015-06-22 | 1 | -1/+1 |
|\ | |||||
| * | Don't ignore arguments passed to ./configure-debug | Dmitry Podgorny | 2015-06-22 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'pasis/shutdown-fix' | James Booth | 2015-06-22 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | shutdown: Call prefs_close() after log_close() | Dmitry Podgorny | 2015-06-22 | 1 | -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 CHANGELOG | James Booth | 2015-06-22 | 1 | -0/+1 |
| | |||||
* | Merge remote-tracking branch 'pasis/configure-cleanup' | James Booth | 2015-06-21 | 1 | -17/+4 |
|\ | |||||
| * | autotools: Avoid copy-paste in configure.ac | Dmitry Podgorny | 2015-06-21 | 1 | -17/+4 |
| | | |||||
* | | Fixed pgp help | James Booth | 2015-06-21 | 1 | -1/+1 |
| | | |||||
* | | Fixed /pgp help formatting | James Booth | 2015-06-21 | 1 | -1/+1 |
| | | |||||
* | | Added PGP logging preferences | James Booth | 2015-06-21 | 9 | -20/+100 |
| | | |||||
* | | Moved setting otr.warn -> enc.warn | James Booth | 2015-06-21 | 18 | -121/+46 |
| | | |||||
* | | Show message when contact ends PGP | James Booth | 2015-06-21 | 1 | -0/+4 |
| | | |||||
* | | Added /pgp end command | James Booth | 2015-06-21 | 2 | -0/+25 |
| | | |||||
* | | Added enc_mode check when starting OTR | James Booth | 2015-06-21 | 1 | -0/+10 |
| | | |||||
* | | Encryption modes for sv_ev_incoming_message | James Booth | 2015-06-21 | 4 | -22/+105 |
| | | |||||
* | | Tidied OTR and PGP combinations in client_events.c | James Booth | 2015-06-21 | 2 | -21/+39 |
| | | |||||
* | | Moved window creation to sv_ev_incoming_message | James Booth | 2015-06-21 | 4 | -26/+28 |
| | | |||||
* | | Moved message display logic to sv_ev_incoming_message | James Booth | 2015-06-21 | 4 | -16/+19 |
| | | |||||
* | | Extracted chat session code from message senders | James Booth | 2015-06-21 | 1 | -49/+40 |
| | | |||||
* | | Added pgp checks for message sending | James Booth | 2015-06-21 | 9 | -29/+124 |
| | | |||||
* | | Added window encyption mode for PGP | James Booth | 2015-06-20 | 7 | -88/+203 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-20 | 2 | -0/+19 |
|\| | |||||
| * | Added /roster empty command | James Booth | 2015-06-20 | 2 | -0/+19 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-19 | 1 | -0/+1 |
|\| | |||||
| * | Added missing include client_events.c | James Booth | 2015-06-19 | 1 | -0/+1 |
| | | |||||
* | | Added initial /pgp start checks | James Booth | 2015-06-18 | 4 | -0/+113 |
| | | |||||
* | | Added cmd_pgp tests | James Booth | 2015-06-18 | 6 | -4/+69 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-17 | 1 | -1/+1 |
|\| | |||||
| * | Merge remote-tracking branch 'quite/#513' | James Booth | 2015-06-17 | 1 | -1/+1 |
| |\ | |||||
| | * | Let's only strip trailing whitespace when parsing command | Daniel | 2015-06-16 | 1 | -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 openpgp | James Booth | 2015-06-17 | 7 | -185/+139 |
|\| | | |||||
| * | | Removed wins_get_current_* functions | James Booth | 2015-06-17 | 7 | -185/+139 |
| | | | |||||
* | | | Merge branch 'master' into openpgp | James Booth | 2015-06-17 | 25 | -686/+691 |
|\| | | | | | | | | | | | | | | | | | Conflicts: src/command/commands.c src/command/commands.h | ||||
| * | | Removed unused function prototype | James Booth | 2015-06-17 | 1 | -2/+0 |
| | | | |||||
| * | | Added current window reference to command functions | James Booth | 2015-06-17 | 24 | -578/+582 |
| | | | |||||
| * | | Pass current window to autocompleters | James Booth | 2015-06-16 | 6 | -104/+107 |
| |/ | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 6 | -103/+157 |
|\| | |||||
| * | Tidied cmd_otr, added check-unit target to Makefile | James Booth | 2015-06-15 | 6 | -103/+157 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 5 | -27/+25 |
|\| | |||||
| * | Removed ui_get_current_chat() | James Booth | 2015-06-15 | 5 | -27/+25 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 28 | -275/+312 |
|\| | |||||
| * | Moved UI interfaces to ui.h | James Booth | 2015-06-15 | 11 | -139/+208 |
| | |