Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Moved stub_gpg.c | James Booth | 2015-06-12 | 1 | -0/+32 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-12 | 70 | -0/+10924 | |
|\| | ||||||
| * | Moved all tests to tests folder | James Booth | 2015-06-12 | 70 | -0/+10913 | |
| | | ||||||
* | | Moved gpg stub | James Booth | 2015-06-12 | 1 | -32/+0 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-05 | 55 | -9756/+0 | |
|\| | | | | | | | | | Conflicts: .travis.yml | |||||
| * | Moved tests -> unittests | James Booth | 2015-05-28 | 55 | -9742/+0 | |
| | | ||||||
| * | Added initial stabber test | James Booth | 2015-05-17 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-06-02 | 1 | -1/+4 | |
|\ \ | ||||||
| * \ | Merge remote-tracking branch 'PMaynard/#551' | James Booth | 2015-06-02 | 1 | -1/+4 | |
| |\ \ | | |/ | |/| | ||||||
| | * | Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected ↵ | Pete | 2015-06-01 | 1 | -1/+4 | |
| | | | | | | | | | | | | underline, removed call to function 'wins_resize_all()'. | |||||
| | * | Added winstidy to test stub | Pete Maynard | 2015-05-31 | 1 | -0/+1 | |
| |/ | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-10 | 1 | -1/+1 | |
|\| | ||||||
| * | Moved logic to notify_message | James Booth | 2015-05-10 | 1 | -1/+1 | |
| | | ||||||
* | | Moved pgp signature generation to cl_ev_presence_send | James Booth | 2015-05-08 | 3 | -2/+17 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 2 | -4/+4 | |
|\| | ||||||
| * | Renamed presence_update -> presence_send | James Booth | 2015-05-07 | 2 | -4/+4 | |
| | | ||||||
* | | Moved pgp signature verification to sv_ev_contact_online | James Booth | 2015-05-07 | 2 | -3/+4 | |
| | | ||||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 3 | -63/+25 | |
|\| | ||||||
| * | Added ui_contact_online | James Booth | 2015-05-07 | 3 | -63/+25 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -2/+6 | |
|\| | ||||||
| * | Added ui_ev_new_private_win to ui events | James Booth | 2015-05-04 | 1 | -2/+6 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -1/+1 | |
|\| | ||||||
| * | ui_outgoing_chat_msg now takes ProfChatWin as argument | James Booth | 2015-05-04 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-02 | 1 | -10/+1 | |
|\| | ||||||
| * | Pass ProfChatWin to otr_on_message_send | James Booth | 2015-05-02 | 1 | -10/+1 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-01 | 2 | -86/+0 | |
|\| | ||||||
| * | Removed server event delegation functions | James Booth | 2015-05-01 | 2 | -86/+0 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -3/+0 | |
|\| | ||||||
| * | Move current win check to event, removed next and prev win functions | James Booth | 2015-04-30 | 1 | -3/+0 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 4 | -58/+1 | |
|\| | ||||||
| * | Removed ui_win_switch_num | James Booth | 2015-04-30 | 4 | -58/+1 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -9/+0 | |
|\| | ||||||
| * | Removed some ui functions, inlined | James Booth | 2015-04-30 | 1 | -9/+0 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 1 | -0/+2 | |
|\| | ||||||
| * | Added ui_win_error_line() | James Booth | 2015-04-29 | 1 | -0/+2 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 2 | -2/+11 | |
|\| | ||||||
| * | Return result on OTR message sending | James Booth | 2015-04-29 | 2 | -2/+11 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-28 | 1 | -14/+14 | |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | |||||
| * | Renamed event functions | James Booth | 2015-04-28 | 1 | -14/+14 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-27 | 1 | -1/+3 | |
|\| | ||||||
| * | Moved otr message send event to otr module | James Booth | 2015-04-27 | 1 | -0/+1 | |
| | | ||||||
| * | Removed server_events dependency on libotr headers | James Booth | 2015-04-27 | 1 | -1/+2 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 2 | -6/+15 | |
|\| | ||||||
| * | Moved new chat win events to client events module | James Booth | 2015-04-21 | 2 | -6/+15 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 1 | -14/+14 | |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | |||||
| * | Renamed server event functions | James Booth | 2015-04-19 | 1 | -14/+14 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 1 | -1/+1 | |
|\| | ||||||
| * | Moved server_events to event/ | James Booth | 2015-04-19 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-12 | 1 | -0/+1 | |
|\| | ||||||
| * | Added option to show jids in occupants panel | James Booth | 2015-04-12 | 1 | -0/+1 | |
| | |