Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-jams
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Model registry
- Incidents
- Model experiments

Snippets Groups Projects

1f248167

Commit 1f248167 authored 5 years ago by Félix Sidokhine

Downloads
- Plain Diff

Merge branch 'feature/vcard-detail' into 'master'

Feature/vcard detail

See merge request fsidokhine/jams-refactoring!3

parents 31097581 c6e94ba4

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

integration-test/install-server.py 7 additions, 1 deletion

integration-test/install-server.py
jams-ca/src/main/java/net/jami/jams/ca/workers/crl/CRLFileStorage.java 22 additions, 0 deletions

...ain/java/net/jami/jams/ca/workers/crl/CRLFileStorage.java
jams-common/pom.xml 5 additions, 0 deletions

jams-common/pom.xml
jams-common/src/main/java/net/jami/jams/common/objects/user/UserProfile.java 39 additions, 0 deletions

...n/java/net/jami/jams/common/objects/user/UserProfile.java
jams-common/src/main/java/net/jami/jams/common/serialization/fs/FileStorage.java 22 additions, 0 deletions

...va/net/jami/jams/common/serialization/fs/FileStorage.java
jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/directory/DirectoryEntryServlet.java 8 additions, 2 deletions

...er/servlets/api/auth/directory/DirectoryEntryServlet.java
jams-server/src/main/java/net/jami/jams/server/servlets/api/install/InstallLastStepServlet.java 22 additions, 0 deletions

...s/server/servlets/api/install/InstallLastStepServlet.java
pom.xml 1 addition, 0 deletions

pom.xml

with 126 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment