Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' into muc_roles | James Booth | 2014-10-02 | 1 | -10/+15 | |
|\ | ||||||
| * | Handle roster set and result when item name is empty string | James Booth | 2014-10-02 | 1 | -10/+15 | |
| | | | | | | | | fixed #431 | |||||
* | | Merge branch 'master' into muc_roles | James Booth | 2014-10-02 | 0 | -0/+0 | |
|\| | ||||||
| * | Merge remote-tracking branch 'origin/master' | James Booth | 2014-10-02 | 2 | -18/+8 | |
| |\ | ||||||
| * | | Update UI before generating OTR key | James Booth | 2014-10-02 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/muc_roles' into muc_roles | James Booth | 2014-10-02 | 2 | -18/+8 | |
|\ \ \ | ||||||
| * \ \ | Merge branch 'master' into muc_roles | James Booth | 2014-10-02 | 2 | -18/+8 | |
| |\ \ \ | | | |/ | | |/| | ||||||
| | * | | Removed usages of strcpy | James Booth | 2014-10-02 | 2 | -18/+8 | |
| | |/ | ||||||
* | / | Update UI before generating OTR key | James Booth | 2014-10-02 | 1 | -0/+1 | |
|/ / | ||||||
* | | Store real jid with occupants | James Booth | 2014-10-01 | 8 | -24/+47 | |
| | | ||||||
* | | Show fixed form fields | James Booth | 2014-10-01 | 1 | -1/+6 | |
| | | ||||||
* | | Added /room <affiliation> command | James Booth | 2014-10-01 | 7 | -6/+107 | |
| | | ||||||
* | | Added /room <role> command | James Booth | 2014-10-01 | 6 | -1/+100 | |
| | | ||||||
* | | Moved room info output to ui module, added TODO for roles | James Booth | 2014-09-30 | 4 | -6/+22 | |
| | | ||||||
* | | Show occupants affiliation and role with /info in rooms | James Booth | 2014-09-30 | 4 | -14/+37 | |
| | | ||||||
* | | Merge branch 'master' into muc_roles | James Booth | 2014-09-30 | 1 | -2/+2 | |
|\| | ||||||
| * | Fixed help for jid-multi form fields | James Booth | 2014-09-30 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into muc_roles | James Booth | 2014-09-30 | 1 | -0/+1 | |
|\| | ||||||
| * | travis: added m4 dir for libstrophe | James Booth | 2014-09-30 | 1 | -0/+1 | |
| | | ||||||
| * | Revert "Fix travis build by adding m4 dir" | James Booth | 2014-09-30 | 1 | -1/+0 | |
| | | | | | | | | This reverts commit 5d9a7ec36c7dded1ca21a1ff7472c299ceaf0d7e. | |||||
| * | Fix travis build by adding m4 dir | James Booth | 2014-09-30 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'master' into muc_roles | James Booth | 2014-09-30 | 3 | -54/+58 | |
|\| | | | | | | | | | Conflicts: .gitignore | |||||
| * | Dont check for var attribute on form fields of type fixed | James Booth | 2014-09-30 | 3 | -53/+60 | |
| | | ||||||
* | | wip - Store roles and affiliations with occupants | James Booth | 2014-09-30 | 6 | -24/+41 | |
| | | ||||||
* | | Merge branch 'master' into muc_roles | James Booth | 2014-09-30 | 1 | -1/+1 | |
|\| | ||||||
| * | Merge pull request #430 from acoffman/master | James Booth | 2014-09-30 | 1 | -1/+1 | |
| |\ | | | | | | | free latest_release regardless of its validity | |||||
| | * | free latest_release regardless of its validity | Adam Coffman | 2014-09-29 | 1 | -1/+1 | |
| |/ | ||||||
* | | Changed rooms to use Occupant type instead of PContact | James Booth | 2014-09-30 | 9 | -127/+235 | |
| | | ||||||
* | | Updated gitignore | James Booth | 2014-09-29 | 1 | -1/+1 | |
| | | ||||||
* | | Updated gitignore | James Booth | 2014-09-28 | 1 | -0/+2 | |
| | | ||||||
* | | Added codelite project to gitignore | James Booth | 2014-09-28 | 1 | -0/+3 | |
| | | ||||||
* | | Tidied muc module | James Booth | 2014-09-28 | 16 | -189/+190 | |
| | | ||||||
* | | Store room affiliation and role | James Booth | 2014-09-28 | 7 | -20/+208 | |
| | | ||||||
* | | Check for NULL inside autocomplete_free | James Booth | 2014-09-26 | 4 | -11/+7 | |
| | | ||||||
* | | Create room list on muc_init | James Booth | 2014-09-26 | 1 | -155/+82 | |
| | | ||||||
* | | Tidied muc.c | James Booth | 2014-09-26 | 1 | -104/+73 | |
| | | ||||||
* | | Renamed autocomplete function to get list | James Booth | 2014-09-26 | 6 | -27/+39 | |
| | | ||||||
* | | Removed NULL check when checking roster for nick | James Booth | 2014-09-25 | 1 | -6/+2 | |
|/ | ||||||
* | Use log_warning for room config form errors | James Booth | 2014-09-25 | 1 | -5/+5 | |
| | ||||||
* | Fixed spelling mistake in form.h | James Booth | 2014-09-25 | 1 | -1/+1 | |
| | ||||||
* | Free caps, remove strdup | James Booth | 2014-09-24 | 2 | -1/+4 | |
| | ||||||
* | Unreference date time | James Booth | 2014-09-24 | 1 | -0/+1 | |
| | ||||||
* | Free unique id | James Booth | 2014-09-24 | 1 | -0/+2 | |
| | ||||||
* | Handle errors for /disco info requests | James Booth | 2014-09-24 | 5 | -3/+24 | |
| | ||||||
* | Removed TODO | James Booth | 2014-09-23 | 1 | -2/+0 | |
| | ||||||
* | Updated TODO | James Booth | 2014-09-23 | 1 | -1/+0 | |
| | ||||||
* | Capabilities: check for identity locale | James Booth | 2014-09-23 | 1 | -7/+55 | |
| | ||||||
* | Updated TODO | James Booth | 2014-09-23 | 1 | -0/+1 | |
| | ||||||
* | Reordered identity attributes in caps cache for readability | James Booth | 2014-09-23 | 1 | -3/+3 | |
| | ||||||
* | Updated caps TODO | James Booth | 2014-09-23 | 1 | -2/+0 | |
| |