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

..

css

Icons font

2014-11-11 22:30:12 -05:00

fonts

Icons font

2014-11-11 22:30:12 -05:00

img

Restore/move missing images

2014-11-11 22:31:24 -05:00

js

Created user-modal.js, code refactoring

2014-11-11 22:32:45 -05:00

scss

Fix buttons in card editor

2014-11-11 22:32:44 -05:00

bower.json

Update GNUmakefile for WebServerResources

2014-11-11 22:32:42 -05:00

GNUmakefile

Revert "rebase modification"

2014-11-11 22:32:43 -05:00

Gruntfile.js

Fix installation of ionic JS in Gruntfile.js

2014-11-11 22:32:43 -05:00

package.json

Improve build scripts of Web frontend

2014-11-11 22:31:25 -05:00