Commit Graph

4 Commits

Author SHA1 Message Date
Alexandre Cloutier
3f27e9bb57 Created user-modal.js, code refactoring
Conflicts:

	UI/Common/UIxAclEditor.m
	UI/Common/UIxUserRightsEditor.m
	UI/Common/product.plist
	UI/Contacts/UIxContactsUserRightsEditor.m
	UI/Templates/ContactsUI/UIxContactFoldersView.wox
	UI/WebServerResources/js/Common/resource.js
	UI/WebServerResources/js/ContactsUI.js
2014-11-11 22:32:45 -05:00
Alexandre Cloutier
ff5b25972f GUI for mobile version of AclUsers
Conflicts:

	UI/Common/UIxAclEditor.m
	UI/Common/UIxUserRightsEditor.m
	UI/WebServerResources/js/Common/acl-model.js
2014-11-11 22:32:45 -05:00
Francis Lachapelle
2429e0e2f4 Revert "file lost through rebasing"
This reverts commit a952402c39.
2014-11-11 22:32:43 -05:00
Alexandre Cloutier
81f434cf4b file lost through rebasing 2014-11-11 22:32:43 -05:00