about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' into muc_rolesJames Booth2014-10-021-10/+15
|\
| * Handle roster set and result when item name is empty stringJames Booth2014-10-021-10/+15
| | | | | | | | fixed #431
* | Merge branch 'master' into muc_rolesJames Booth2014-10-020-0/+0
|\|
| * Merge remote-tracking branch 'origin/master'James Booth2014-10-022-18/+8
| |\
| * | Update UI before generating OTR keyJames Booth2014-10-021-0/+1
| | |
* | | Merge remote-tracking branch 'origin/muc_roles' into muc_rolesJames Booth2014-10-022-18/+8
|\ \ \
| * \ \ Merge branch 'master' into muc_rolesJames Booth2014-10-022-18/+8
| |\ \ \ | | | |/ | | |/|
| | * | Removed usages of strcpyJames Booth2014-10-022-18/+8
| | |/
* | / Update UI before generating OTR keyJames Booth2014-10-021-0/+1
|/ /
* | Store real jid with occupantsJames Booth2014-10-018-24/+47
| |
* | Show fixed form fieldsJames Booth2014-10-011-1/+6
| |
* | Added /room <affiliation> commandJames Booth2014-10-017-6/+107
| |
* | Added /room <role> commandJames Booth2014-10-016-1/+100
| |
* | Moved room info output to ui module, added TODO for rolesJames Booth2014-09-304-6/+22
| |
* | Show occupants affiliation and role with /info in roomsJames Booth2014-09-304-14/+37
| |
* | Merge branch 'master' into muc_rolesJames Booth2014-09-301-2/+2
|\|
| * Fixed help for jid-multi form fieldsJames Booth2014-09-301-2/+2
| |
* | Merge branch 'master' into muc_rolesJames Booth2014-09-301-0/+1
|\|
| * travis: added m4 dir for libstropheJames Booth2014-09-301-0/+1
| |
| * Revert "Fix travis build by adding m4 dir"James Booth2014-09-301-1/+0
| | | | | | | | This reverts commit 5d9a7ec36c7dded1ca21a1ff7472c299ceaf0d7e.
| * Fix travis build by adding m4 dirJames Booth2014-09-301-0/+1
| |
* | Merge branch 'master' into muc_rolesJames Booth2014-09-303-54/+58
|\| | | | | | | | | Conflicts: .gitignore
| * Dont check for var attribute on form fields of type fixedJames Booth2014-09-303-53/+60
| |
* | wip - Store roles and affiliations with occupantsJames Booth2014-09-306-24/+41
| |
* | Merge branch 'master' into muc_rolesJames Booth2014-09-301-1/+1
|\|
| * Merge pull request #430 from acoffman/masterJames Booth2014-09-301-1/+1
| |\ | | | | | | free latest_release regardless of its validity
| | * free latest_release regardless of its validityAdam Coffman2014-09-291-1/+1
| |/
* | Changed rooms to use Occupant type instead of PContactJames Booth2014-09-309-127/+235
| |
* | Updated gitignoreJames Booth2014-09-291-1/+1
| |
* | Updated gitignoreJames Booth2014-09-281-0/+2
| |
* | Added codelite project to gitignoreJames Booth2014-09-281-0/+3
| |
* | Tidied muc moduleJames Booth2014-09-2816-189/+190
| |
* | Store room affiliation and roleJames Booth2014-09-287-20/+208
| |
* | Check for NULL inside autocomplete_freeJames Booth2014-09-264-11/+7
| |
* | Create room list on muc_initJames Booth2014-09-261-155/+82
| |
* | Tidied muc.cJames Booth2014-09-261-104/+73
| |
* | Renamed autocomplete function to get listJames Booth2014-09-266-27/+39
| |
* | Removed NULL check when checking roster for nickJames Booth2014-09-251-6/+2
|/
* Use log_warning for room config form errorsJames Booth2014-09-251-5/+5
|
* Fixed spelling mistake in form.hJames Booth2014-09-251-1/+1
|
* Free caps, remove strdupJames Booth2014-09-242-1/+4
|
* Unreference date timeJames Booth2014-09-241-0/+1
|
* Free unique idJames Booth2014-09-241-0/+2
|
* Handle errors for /disco info requestsJames Booth2014-09-245-3/+24
|
* Removed TODOJames Booth2014-09-231-2/+0
|
* Updated TODOJames Booth2014-09-231-1/+0
|
* Capabilities: check for identity localeJames Booth2014-09-231-7/+55
|
* Updated TODOJames Booth2014-09-231-0/+1
|
* Reordered identity attributes in caps cache for readabilityJames Booth2014-09-231-3/+3
|
* Updated caps TODOJames Booth2014-09-231-2/+0
|