Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

stationnement
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c4b73303

Commit c4b73303 authored 3 years ago by Adem Aber Aouni

Downloads
- Plain Diff

Merge branch 'develop' of git.step.polymtl.ca:STEP/dev/stationnement into develop

parents b95673e0 966815c2

No related branches found

No related tags found

Loading

Changes 78

Hide whitespace changes

Inline Side-by-side

Showing

.env.dist 1 addition, 0 deletions

.env.dist
.gitlab-ci.yml 2 additions, 2 deletions

.gitlab-ci.yml
cron/Dockerfile 11 additions, 0 deletions

cron/Dockerfile
cron/crontab 2 additions, 0 deletions

cron/crontab
cron/entrypoint.sh 7 additions, 0 deletions

cron/entrypoint.sh
docker-compose.prod.yml 19 additions, 13 deletions

docker-compose.prod.yml
docker-compose.yml 26 additions, 13 deletions

docker-compose.yml
nginx/Dockerfile.prod 1 addition, 1 deletion

nginx/Dockerfile.prod
site/.env 2 additions, 0 deletions

site/.env
site/assets/bootstrap.js 8 additions, 0 deletions

site/assets/bootstrap.js
site/assets/controllers.json 14 additions, 0 deletions

site/assets/controllers.json
site/assets/controllers/.gitempty 0 additions, 0 deletions

site/assets/controllers/.gitempty
site/assets/styles/admin.scss 1 addition, 2 deletions

site/assets/styles/admin.scss
site/assets/styles/base.scss 6 additions, 3 deletions

site/assets/styles/base.scss
site/assets/styles/custom.scss 3 additions, 1 deletion

site/assets/styles/custom.scss
site/assets/styles/maps.scss 1 addition, 0 deletions

site/assets/styles/maps.scss
site/assets/styles/newRequest.scss 1 addition, 2 deletions

site/assets/styles/newRequest.scss
site/assets/ts/adminHome.ts 2 additions, 3 deletions

site/assets/ts/adminHome.ts
site/assets/ts/base.ts 1 addition, 0 deletions

site/assets/ts/base.ts
site/assets/ts/darkmode.ts 4 additions, 4 deletions

site/assets/ts/darkmode.ts

with 112 additions and 44 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