# Conflicts:
#	pom.xml

Merge pull request #119 in EDELIVERY/smp from bugfix/EDELIVERY-4004-role-is-not-getting-displayed to development

* commit '9dc268b25d006e2e69061f3d8dc02366f3cf1ce3':
  - bugfixes - update button for generating client cert header on domain - domain warnings on delete
  reported bugfixes

- update button for generating client cert header on domain
- domain warnings on delete

Merge pull request #118 in EDELIVERY/smp from feature/EDELIVERY-3693-smp-ui-servicegroup-metadata to development

* commit '7c8c5c2cdd1e2dbdd45fa35d8ad51eb1fc953254':
  bugfixes reported by testing team
  Implemented login update metadata dialog
  Implementation of metadata dialog, service group dialog,
  Implementation of metadata dialog, service group dialog,
  update service group search add service metadata dialog update service group deialog

Merge branch 'development' of https://ec.europa.eu/cefdigital/code/scm/edelivery/smp into feature/EDELIVERY-3693-smp-ui-servicegroup-metadata

# Conflicts:
#	smp-angular/src/app/guards/authorized-admin.guard.ts
#	smp-angular/src/app/security/role.model.ts
#	smp-angular/src/app/security/security.service.ts
#	smp-angular/src/app/user/user-details-dialog/user-details-dialog.component.ts
#	smp-angular/src/app/user/user.component.ts
#	smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/UserResource.java

Merge pull request #116 in EDELIVERY/smp from feature/EDELIVERY-3687-smp-ui-add-edit-user to development

* commit '663c62a3be135e616aaf52b314aa402b75d60fc2':
  EDELIVERY-3687 SMP UI Add/Edit user

add service metadata dialog
update service group deialog

Rename roles to match those defined in the back-end.
Fix wrong role binding when adding or editing users.
Fix missing id and status properties.
Improve user resource annotations.

Merge pull request #115 in EDELIVERY/smp from feature/EDELIVERY-3687-smp-ui-add-edit-user to development

* commit '7d364b802ed6d9b17525355c624d739873a2072d':
  EDELIVERY-3687 SMP UI Add/Edit user
  EDELIVERY-3687 SMP UI Add/Edit user
  EDELIVERY-3687 SMP UI Add/Edit user
  EDELIVERY-3687 SMP UI Add/Edit user

Replace fingerprint with serial number.

Rename validUntil to validTo as present in the back-end.
Add support for fingerprints when reading the uploaded certificate.
Add Jackson 2 support for JSR310 dates and configure a Jackson 2
HttpMessageConverter.

# Conflicts:
#	smp-angular/src/app/user/certificate.service.ts
#	smp-angular/src/app/user/user-details-dialog/user-details-dialog.component.html
#	smp-angular/src/app/user/user-details-dialog/user-details-dialog.component.ts
#	smp-angular/src/app/user/user.component.html

Add missing validators.
Fix bindings for the user's certificate.

Merge pull request #114 in EDELIVERY/smp from feature/EDELIVERY-3693-smp-ui-servicegroup-metadata to development

* commit '1c1f93531a6c62f4120ade3d5b6f533f6480047b':
  change css class names update table entity model with id and index update service name update soapui scripts
  Delete extension dialog is not needed anymore
  add cert examples for unit tests
  - update database model - update webservices for users, domain service groups - update UI - fix war structure to show UI

update table entity model with id and index
update service name
update soapui scripts

- update webservices for users, domain service groups
- update UI
- fix war structure to show UI

Replace the numeric Role enum with a string one; remove the role
service.
Remove the search user panel.
Simplify the style and the template for the user dialog.
Remove alert when changing page size in the search table component.

Merge pull request #112 in EDELIVERY/smp from feature/EDELIVERY-3693-smp-ui-servicegroup-metadata to development

* commit '9d23fa0ef44064a315fd3cb502d0c595bc0a2c4f':
  Merge
  updates
  set Edit Service group page for Edit - change expand button with (+), (-)
  - update angular project    - search page    - domain page    - create edit page    - update project angular web-fragment -ui is reachable on smp/ui/index.html  ex: http://[host]:[port]/smp/ui/index.html - update ui MT services for persist/update/delete
  - add is alive function - update imports