| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 7 | -90/+30 | |
| |\| | | ||||||
| | * | | Move current win check to event, removed next and prev win functions | James Booth | 2015-04-30 | 7 | -90/+30 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 10 | -154/+77 | |
| |\| | | ||||||
| | * | | Removed ui_win_switch_num | James Booth | 2015-04-30 | 10 | -155/+77 | |
| | | | | ||||||
| | * | | Added assert to ui_switch_win | James Booth | 2015-04-30 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 4 | -36/+13 | |
| |\| | | ||||||
| | * | | Removed some ui functions, inlined | James Booth | 2015-04-30 | 4 | -36/+13 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 4 | -2/+10 | |
| |\| | | ||||||
| | * | | Added ui_win_error_line() | James Booth | 2015-04-29 | 4 | -2/+10 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 11 | -158/+131 | |
| |\| | | ||||||
| | * | | Return result on OTR message sending | James Booth | 2015-04-29 | 11 | -49/+74 | |
| | | | | ||||||
| | * | | Return new window on new chat win event | James Booth | 2015-04-29 | 3 | -12/+9 | |
| | | | | ||||||
| | * | | Changed message when sending non encrypted message with OTR policy always | James Booth | 2015-04-29 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Reuse ui_new_chat_win | James Booth | 2015-04-29 | 1 | -55/+17 | |
| | | | | ||||||
| | * | | _win_show_history takes ProfChatWin as first arg | James Booth | 2015-04-29 | 1 | -66/+55 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-28 | 15 | -291/+341 | |
| |\| | | | | | | | | | | | | | | Conflicts: src/xmpp/message.c | |||||
| | * | | Added ui events module | James Booth | 2015-04-28 | 6 | -16/+92 | |
| | | | | ||||||
| | * | | Renamed event functions | James Booth | 2015-04-28 | 11 | -251/+251 | |
| | | | | ||||||
| | * | | Removed commented code | James Booth | 2015-04-28 | 1 | -26/+0 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-27 | 5 | -74/+92 | |
| |\| | | ||||||
| | * | | Moved otr message send event to otr module | James Booth | 2015-04-27 | 4 | -33/+44 | |
| | | | | ||||||
| | * | | Removed server_events dependency on libotr headers | James Booth | 2015-04-27 | 4 | -41/+48 | |
| | | | | ||||||
| | * | | Renamed incoming otr message | James Booth | 2015-04-27 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-23 | 5 | -60/+79 | |
| |\| | | | | | | | | | | | | | | Conflicts: src/config/account.h | |||||
| | * | | Tidied account login | James Booth | 2015-04-23 | 5 | -60/+79 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-22 | 3 | -109/+132 | |
| |\| | | ||||||
| | * | | Moved login events to client events module | James Booth | 2015-04-22 | 3 | -98/+121 | |
| | | | | ||||||
| | * | | Tidy execute alias code | James Booth | 2015-04-21 | 1 | -11/+11 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 9 | -67/+102 | |
| |\| | | ||||||
| | * | | Moved new chat win events to client events module | James Booth | 2015-04-21 | 9 | -67/+102 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 3 | -50/+57 | |
| |\| | | ||||||
| | * | | Moved all message sending to client events module | James Booth | 2015-04-21 | 3 | -50/+57 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 1 | -5/+0 | |
| |\| | | ||||||
| | * | | Removed unused otr check | James Booth | 2015-04-19 | 1 | -5/+0 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 4 | -77/+132 | |
| |\| | | ||||||
| | * | | Added client_events module, reuse message sending code for all commands | James Booth | 2015-04-19 | 4 | -77/+132 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 8 | -223/+223 | |
| |\| | | | | | | | | | | | | | | Conflicts: src/xmpp/message.c | |||||
| | * | | Renamed server event functions | James Booth | 2015-04-19 | 8 | -221/+221 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 10 | -10/+10 | |
| |\| | | ||||||
| | * | | Moved server_events to event/ | James Booth | 2015-04-19 | 10 | -10/+10 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-12 | 16 | -23/+113 | |
| |\| | | ||||||
| | * | | Added option to show jids in occupants panel | James Booth | 2015-04-12 | 16 | -23/+113 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-12 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | | | | Conflicts: .travis.yml | |||||
| | * | | Updated travis build to include uuid-dev dependency | James Booth | 2015-04-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-11 | 7 | -28/+32 | |
| |\| | | ||||||
| | * | | Autogenerate room name with UUID for /join with no args | James Booth | 2015-04-11 | 7 | -28/+32 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-04-11 | 1 | -0/+1 | |
| |\| | | ||||||
| | * | | Updated CHANGELOG | James Booth | 2015-04-11 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Fixed message sending when not PGP key found | James Booth | 2015-04-05 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 7 | -17/+47 | |
| |\| | | ||||||