Commits · f5d9618cff83e7bcee6e87e2143b7c6e27eccd67 · TE-TEAM1 / conduit-backend

Nov 26, 2020
- Merge branch 'fix-logger-type' into 'master' · f5d9618c
  AA6135 authored 4 years ago
  
  Fix typo See merge request !15
  f5d9618c
- Fix typo · 3f0c4051
  Jukka Veijanen authored 4 years ago
  
  3f0c4051
- Merge branch 'npm-audit-as-nodeuser' into 'master' · c36db595
  P1375 authored 4 years ago
  
  Remove run audit command See merge request !14
  c36db595
Nov 25, 2020
- Remove run audit command · 66045d16
  Jukka Veijanen authored 4 years ago
  
  66045d16
- Merge branch 'npm-audit' into 'master' · 42de8843
  P1375 authored 4 years ago
  
  Remove -g parameter to able to run as nodeuser See merge request !13
  42de8843
- Merge branch 'master' into 'npm-audit' · 84fda65c
  P1375 authored 4 years ago
  
  # Conflicts: # Dockerfile
  84fda65c
- Remove -g parameter to able to run as nodeuser · de38b39e
  Jukka Veijanen authored 4 years ago
  
  de38b39e
- Merge branch 'revert-01faadd2 ' into 'master' · 02b73590
  P1375 authored 4 years ago
  
  Revert "Merge branch 'npm-audit' into 'master'" See merge request !12
  02b73590
- Revert "Merge branch 'npm-audit' into 'master'" · 13192e6f
  P1375 authored 4 years ago
  
  This reverts merge request !11
  13192e6f
- Merge branch 'npm-audit' into 'master' · 01faadd2
  P1375 authored 4 years ago
  
  Add npm audit See merge request !11
  01faadd2
- Add npm audit · cd4d1be7
  Jukka Veijanen authored 4 years ago
  
  cd4d1be7
- Merge branch 'logger' into 'master' · 8dec4c90
  P1375 authored 4 years ago
  
  Added logger. See merge request !10
  8dec4c90
- Added logger. · 409f9ae0
  Konsta authored 4 years ago
  
  409f9ae0
- Merge branch 'logger-dependencies' into 'master' · 5d36b542
  P1375 authored 4 years ago
  
  Add dependencies to winston logging See merge request !9
  5d36b542
- Add dependencies to winston logging · a91e2f52
  Jukka Veijanen authored 4 years ago
  
  a91e2f52
- Merge branch 'revert-8c96988f ' into 'master' · 594956b7
  P1375 authored 4 years ago
  
  Revert "Merge branch 'loggers' into 'master'" See merge request !8
  594956b7
- Revert "Merge branch 'loggers' into 'master'" · 39b14651
  P1375 authored 4 years ago
  
  This reverts merge request !7
  39b14651
Nov 24, 2020
- Merge branch 'loggers' into 'master' · 8c96988f
  P1375 authored 4 years ago
  
  Added logger. See merge request !7
  8c96988f
- Added logger. · 07ee5f4c
  Konsta authored 4 years ago
  
  07ee5f4c
- Merge branch 'docker-compose' into 'master' · d709c1e0
  P1375 authored 4 years ago
  
  Added port definitions. See merge request !6
  d709c1e0
- Added port definitions. · 311d865d
  Konsta authored 4 years ago
  
  311d865d
Nov 23, 2020
- Merge branch 'docker-compose' into 'master' · c6547a7f
  P1375 authored 4 years ago
  
  Removed mongo dependency See merge request !5
  c6547a7f
- Removed depends_on: - mongo. · 30a6cf73
  Konsta authored 4 years ago
  
  30a6cf73
- Merge branch 'docker-compose' into 'master' · 91cf5b61
  P1375 authored 4 years ago
  
  Added docker-compose files for backfront and front. See merge request !4
  91cf5b61
- Added docker-compose files for backfront and front. · 02a88a27
  Konsta authored 4 years ago
  
  02a88a27
Nov 20, 2020
- Merge branch 'base' into 'master' · 053abe56
  P1375 authored 4 years ago
  
  docker-compose.yml updated. See merge request !3
  053abe56
- docker-compose.yml updated. · e62aa5f4
  Konsta authored 4 years ago
  
  e62aa5f4
- Update Article.js · c73c4f0e
  P1384 authored 4 years ago
  
  c73c4f0e
Nov 18, 2020
- Add new file · 1d3e1425
  P1384 authored 4 years ago
  
  1d3e1425
- Add new file · bc199990
  P1384 authored 4 years ago
  
  bc199990
- Update Dockerfile · d67eb16a
  P1384 authored 4 years ago
  
  d67eb16a
- added · b2c9abc9
  P1384 authored 4 years ago
  
  b2c9abc9
- Update package.json, so package works with new version of Mongo · c67089e9
  P1384 authored 4 years ago
  
  c67089e9
- Update User.js, line 16 · 7618248e
  P1384 authored 4 years ago
  
  7618248e
- Update Comment.js, line 7 · e1a86084
  P1384 authored 4 years ago
  
  e1a86084
- Update Article.js, line 15 · 52e8ee48
  P1384 authored 4 years ago
  
  52e8ee48
Nov 06, 2020
- Merge branch 'base' into 'master' · 19582d3e
  AA6130 authored 4 years ago
  
  gitlab-ci.yml -> .gitlab-ci.yml See merge request !2
  19582d3e
- gitlab-ci.yml -> .gitlab-ci.yml · 7574b15a
  Konsta authored 4 years ago
  
  7574b15a
- Merge branch 'base' into 'master' · 64a975cb
  AA6130 authored 4 years ago
  
  Added backendfiles, Dockerfile and gitlab-ci.yml See merge request !1
  64a975cb
- Added backendfiles, Dockerfile and gitlab-ci.yml · 1d3d572e
  Konsta authored 4 years ago
  
  1d3d572e