GitLab

igoshin authored Jan 16, 2014 and Matija Obreza committed Jan 23, 2014

Squashed commits:
[b08c3ca] First version of user story "Reset password"

values are allowed in MCPD, use AccessionAlias as back-end for names

* commit 'fcb0c1b3':
  Final version of user story "Acl editor"

Conflicts:
	src/main/java/org/genesys2/server/service/AclService.java
	src/main/resources/spring/spring.properties
	src/main/webapp/WEB-INF/jsp/acl/editor.jsp

#10160

Conflicts:
	pom.xml
	src/main/java/org/genesys2/server/service/UserService.java
	src/main/java/org/genesys2/server/service/impl/UserServiceImpl.java
	src/main/java/org/genesys2/server/servlet/controller/UserProfileController.java
	src/main/resources/spring/spring.properties
	src/main/webapp/WEB-INF/jsp/user/profile.jsp

#10141