Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into openpgp | James Booth | 2015-06-02 | 1 | -2/+23 |
|\ | |||||
| * | Merge remote-tracking branch 'PMaynard/#551' | James Booth | 2015-06-02 | 1 | -2/+23 |
| |\ | |||||
| | * | Tidy up windows when enabling | Pete | 2015-06-01 | 1 | -0/+4 |
| | | | |||||
| | * | Refactored 'ui_tidy_wins()' to return bool and not output text, Corrected ↵ | Pete | 2015-06-01 | 1 | -3/+6 |
| | | | | | | | | | | | | underline, removed call to function 'wins_resize_all()'. | ||||
| | * | Added window auto tidy. | Pete | 2015-05-29 | 1 | -1/+16 |
| |/ | |||||
* | | 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 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 1 | -3/+3 |
|\| | |||||
| * | Added cl_ev_presence_send | James Booth | 2015-05-07 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into openpgp | James Booth | 2015-05-07 | 1 | -3/+3 |
|\| | |||||
| * | Renamed presence_update -> presence_send | James Booth | 2015-05-07 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -50/+50 |
|\| | |||||
| * | Use null check convention in commands.c | James Booth | 2015-05-04 | 1 | -50/+50 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -5/+9 |
|\| | |||||
| * | Added ui_ev_new_private_win to ui events | James Booth | 2015-05-04 | 1 | -5/+9 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-05-04 | 1 | -2/+2 |
|\| | |||||
| * | cl_ev_send_muc_msg takes ProfMucWin as arg | James Booth | 2015-05-04 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -9/+3 |
|\| | |||||
| * | Move current win check to event, removed next and prev win functions | James Booth | 2015-04-30 | 1 | -9/+3 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -10/+14 |
|\| | |||||
| * | Removed ui_win_switch_num | James Booth | 2015-04-30 | 1 | -10/+14 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-30 | 1 | -11/+11 |
|\| | |||||
| * | Removed some ui functions, inlined | James Booth | 2015-04-30 | 1 | -11/+11 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-29 | 1 | -17/+15 |
|\| | |||||
| * | Return result on OTR message sending | James Booth | 2015-04-29 | 1 | -15/+15 |
| | | |||||
| * | Return new window on new chat win event | James Booth | 2015-04-29 | 1 | -8/+6 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-28 | 1 | -16/+17 |
|\| | | | | | | | | | Conflicts: src/xmpp/message.c | ||||
| * | Added ui events module | James Booth | 2015-04-28 | 1 | -0/+1 |
| | | |||||
| * | Renamed event functions | James Booth | 2015-04-28 | 1 | -16/+16 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-23 | 1 | -6/+31 |
|\| | | | | | | | | | Conflicts: src/config/account.h | ||||
| * | Tidied account login | James Booth | 2015-04-23 | 1 | -6/+31 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-22 | 1 | -109/+67 |
|\| | |||||
| * | Moved login events to client events module | James Booth | 2015-04-22 | 1 | -98/+56 |
| | | |||||
| * | Tidy execute alias code | James Booth | 2015-04-21 | 1 | -11/+11 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 1 | -5/+16 |
|\| | |||||
| * | Moved new chat win events to client events module | James Booth | 2015-04-21 | 1 | -5/+16 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-21 | 1 | -48/+40 |
|\| | |||||
| * | Moved all message sending to client events module | James Booth | 2015-04-21 | 1 | -48/+40 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-19 | 1 | -77/+4 |
|\| | |||||
| * | Added client_events module, reuse message sending code for all commands | James Booth | 2015-04-19 | 1 | -77/+4 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-12 | 1 | -7/+27 |
|\| | |||||
| * | Added option to show jids in occupants panel | James Booth | 2015-04-12 | 1 | -7/+27 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-04-11 | 1 | -2/+19 |
|\| | |||||
| * | Autogenerate room name with UUID for /join with no args | James Booth | 2015-04-11 | 1 | -2/+19 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 1 | -1/+6 |
|\| | |||||
| * | Use password for chat room invites | James Booth | 2015-03-29 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' into pgp | James Booth | 2015-03-29 | 1 | -1/+1 |
|\| | |||||
| * | Add callback data to room disco info response handler | James Booth | 2015-03-29 | 1 | -1/+1 |
| | | |||||
* | | Added signature verification, /pgp fps command | James Booth | 2015-03-24 | 1 | -0/+16 |
| | | |||||
* | | Added pgpkeyid account setting, send signed presence | James Booth | 2015-03-23 | 1 | -0/+8 |
| | |