Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'incertia/time' | James Booth | 2015-07-01 | 2 | -39/+43 |
|\ | | | | | | | | | Conflicts: src/config/preferences.c | ||||
| * | add examples and be more specific about time formatting | Will Song | 2015-05-30 | 1 | -3/+8 |
| | | |||||
| * | update autocomplete | Will Song | 2015-05-29 | 1 | -11/+13 |
| | | |||||
| * | fix conflicts | Will Song | 2015-05-29 | 4 | -1093/+1332 |
| |\ | |||||
| * | | use custom format string for time preference | Will Song | 2015-01-27 | 2 | -36/+9 |
| | | | |||||
* | | | Added messaage when account resource changed whilst connected | James Booth | 2015-06-24 | 1 | -1/+5 |
| | | | |||||
* | | | Fixed various jid and account mem leaks | James Booth | 2015-06-24 | 1 | -0/+2 |
| | | | |||||
* | | | free account after account connect | James Booth | 2015-06-24 | 1 | -0/+1 |
| | | | |||||
* | | | Added /pgp setkey command | James Booth | 2015-06-23 | 2 | -9/+49 |
| | | | |||||
* | | | Added PGP prefs | James Booth | 2015-06-22 | 2 | -0/+5 |
| | | | |||||
* | | | 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 | 2 | -9/+49 |
| | | | |||||
* | | | Moved setting otr.warn -> enc.warn | James Booth | 2015-06-21 | 3 | -13/+16 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | Added pgp checks for message sending | James Booth | 2015-06-21 | 1 | -2/+2 |
| | | | |||||
* | | | Added window encyption mode for PGP | James Booth | 2015-06-20 | 2 | -45/+133 |
| | | | |||||
* | | | 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 |
| | | | | |||||
* | | | | Added initial /pgp start checks | James Booth | 2015-06-18 | 1 | -0/+7 |
| | | | | |||||
* | | | | Added cmd_pgp tests | James Booth | 2015-06-18 | 1 | -1/+4 |
| | | | | |||||
* | | | | 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 | 2 | -48/+96 |
|\| | | | | |||||
| * | | | | Removed wins_get_current_* functions | James Booth | 2015-06-17 | 2 | -48/+96 |
| | | | | | |||||
* | | | | | Merge branch 'master' into openpgp | James Booth | 2015-06-17 | 4 | -371/+328 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -268/+228 |
| | | | | | |||||
| * | | | | Pass current window to autocompleters | James Booth | 2015-06-16 | 4 | -99/+98 |
| |/ / / | |||||
* | | | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 1 | -79/+118 |
|\| | | | |||||
| * | | | Tidied cmd_otr, added check-unit target to Makefile | James Booth | 2015-06-15 | 1 | -79/+118 |
| | | | | |||||
* | | | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 1 | -2/+2 |
|\| | | | |||||
| * | | | Removed ui_get_current_chat() | James Booth | 2015-06-15 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into openpgp | James Booth | 2015-06-15 | 2 | -3/+4 |
|\| | | | |||||
| * | | | Moved UI interfaces to ui.h | James Booth | 2015-06-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Moved ui/windows -> window_list | James Booth | 2015-06-15 | 2 | -2/+2 |
| | | | | |||||
| * | | | Added win_clear() function | James Booth | 2015-06-15 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into openpgp | James Booth | 2015-06-14 | 1 | -15/+54 |
|\| | | | |||||
| * | | | Set columns when running functional tests | James Booth | 2015-06-13 | 1 | -15/+54 |
| | | | | |||||
* | | | | Show message when offline for /pgp fps | James Booth | 2015-06-13 | 1 | -13/+18 |
| | | | | |||||
* | | | | Merge branch 'master' into openpgp | James Booth | 2015-06-02 | 3 | -3/+33 |
|\| | | | |||||
| * | | | Merge remote-tracking branch 'PMaynard/#551' | James Booth | 2015-06-02 | 3 | -3/+33 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Tidy up windows when enabling | Pete | 2015-06-01 | 1 | -0/+4 |
| | | | | |||||
| | * | | Extra underline | Pete Maynard | 2015-06-01 | 1 | -1/+1 |
| | | | | |||||
| | * | | Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected ↵ | Pete | 2015-06-01 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | underline, removed call to function 'wins_resize_all()'. | ||||
| | * | | Added window auto tidy. | Pete | 2015-05-29 | 3 | -2/+26 |
| |/ / | |||||
* | | | Merge branch 'master' into openpgp | James Booth | 2015-05-17 | 1 | -14/+12 |
|\| | | |||||
| * | | allow enabling / disabling carbons without being connected. | Adam Ehlers Nyholm Thomsen | 2015-05-17 | 1 | -14/+12 |
| | | |