Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

gdd-sigma-poc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

984e6b6c

Commit 984e6b6c authored 6 years ago by Quentin CHEVALIER

Downloads
- Plain Diff

Merge branch 'LDAP_changes' of gitlab.binets.fr:br/sigma-backend into LDAP_changes

parents 582c99da 0367a222

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

db/knexfile.js 1 addition, 1 deletion

db/knexfile.js
ldap_config.json 1 addition, 0 deletions

ldap_config.json
notes/hist_rights.md 65 additions, 57 deletions

notes/hist_rights.md
package-lock.json 205 additions, 211 deletions

package-lock.json
src/adminview/admin_router.ts 2 additions, 1 deletion

src/adminview/admin_router.ts
src/graphql/object_resolvers/messages.ts 36 additions, 5 deletions

src/graphql/object_resolvers/messages.ts
src/graphql/resolvers.ts 0 additions, 23 deletions

src/graphql/resolvers.ts
src/graphql/typeDefs/actions.graphql 33 additions, 20 deletions

src/graphql/typeDefs/actions.graphql
src/graphql/typeDefs/objects.graphql 8 additions, 5 deletions

src/graphql/typeDefs/objects.graphql

with 351 additions and 323 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