 Rochet2
|
d22a99a980
|
return timeouts
|
2019-05-16 12:48:25 +03:00 |
|
|
Rochet2
|
5cc8b01758
|
remove cypress timeouts
|
2019-05-16 12:34:08 +03:00 |
|
|
Rochet2
|
0b7bb6cac9
|
fix travis
|
2019-05-16 12:23:21 +03:00 |
|
|
Rochet2
|
b971f8ef3f
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-16 10:06:39 +03:00 |
|
|
Rochet2
|
9e7a0b5ab6
|
Fix travis compose ymls
|
2019-05-16 10:06:33 +03:00 |
|
|
Rochet2
|
16dc43951f
|
ignore shared models and migrations
|
2019-05-16 09:35:56 +03:00 |
|
|
Rochet2
|
a8abe07ade
|
dont use explicit paths to run tests
|
2019-05-16 09:26:10 +03:00 |
|
|
Rochet2
|
afc8bf88f9
|
Enable updater_writer and backend to use shared folder, fix dockerignores
|
2019-05-16 09:25:25 +03:00 |
|
|
Rochet2andGitHub
|
05944f7706
|
Merge pull request #901 from UniversityOfHelsinkiCS/fixci
Fix CMD in dockerfiles
|
2019-05-15 20:14:35 +03:00 |
|
|
Rochet2
|
718148c4dd
|
Fix CMD in dockerfiles
|
2019-05-15 19:54:58 +03:00 |
|
|
Rochet2
|
ac2d73bbd3
|
Try fix wait
|
2019-05-15 18:07:43 +03:00 |
|
|
Rochet2
|
c72ce21d17
|
Enable cron events in backend
|
2019-05-15 18:05:34 +03:00 |
|
|
Rochet2
|
6606f1a09f
|
Merge branch 'master' of github.com:UniversityOfHelsinkiCS/oodikone into fixci
|
2019-05-15 17:18:29 +03:00 |
|
|
Rochet2
|
93d00abfa2
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-15 15:32:14 +03:00 |
|
|
Rochet2
|
e49df9dd8c
|
Delete orphans from course duplicates
|
2019-05-15 15:31:53 +03:00 |
|
|
Rochet2
|
ed2a1d14a7
|
Update course code mapper
|
2019-05-15 15:31:19 +03:00 |
|
|
Rochet2
|
15cbd243c6
|
Fix course statistics
|
2019-05-15 13:20:48 +03:00 |
|
|
Rochet2
|
ac091631fa
|
Updater is not ready yet and tests fail
|
2019-05-15 12:24:53 +03:00 |
|
|
Rochet2
|
cbd812bd35
|
Fix code mapper css screwing stuff up
|
2019-05-15 12:19:29 +03:00 |
|
|
Rochet2
|
e668f4a5f0
|
Add nats to backend, but keep the event handling disabled for now
|
2019-05-15 12:10:47 +03:00 |
|
|
Rochet2
|
5132cb852b
|
Re enable cypress (deleted account and recreated)
|
2019-05-15 10:30:50 +03:00 |
|
|
Rochet2
|
0bdd3c0d53
|
Skip frontend build in development
|
2019-05-15 10:28:35 +03:00 |
|
|
Rochet2
|
908e539cc5
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-14 17:02:44 +03:00 |
|
|
Rochet2
|
63faae4ea9
|
Fix usage service setup in tests
|
2019-05-14 17:02:22 +03:00 |
|
|
Rochet2
|
793e974bf9
|
Name updater containers
|
2019-05-14 15:43:32 +03:00 |
|
|
Rochet2
|
bdd8e55da4
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-14 15:23:51 +03:00 |
|
|
Rochet2
|
97fa88ae0c
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-14 14:34:03 +03:00 |
|
|
Rochet2
|
95392a64aa
|
update dockerfile to match others
|
2019-05-14 13:21:52 +03:00 |
|
|
Rochet2
|
d47178cef3
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-14 13:03:16 +03:00 |
|
|
Rochet2
|
381830a1ae
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-14 11:47:51 +03:00 |
|
|
Rochet2
|
eeab4296c1
|
make dockerfiles to be more efficient and faster
|
2019-05-14 11:47:45 +03:00 |
|
|
Rochet2
|
4607bddbad
|
Unused dockerfile
|
2019-05-13 17:19:22 +03:00 |
|
|
Rochet2
|
d9dc92a2e4
|
Revert "Use volume locally but in prod copy shared to cont"
This reverts commit be06aeaf1a.
|
2019-05-13 17:18:09 +03:00 |
|
|
Rochet2
|
a27558da98
|
Define image only in dockerfile
|
2019-05-13 17:17:37 +03:00 |
|
|
Rochet2
|
be06aeaf1a
|
Use volume locally but in prod copy shared to cont
|
2019-05-13 16:06:04 +03:00 |
|
|
Rochet2
|
24465bd500
|
webpack
|
2019-05-13 15:05:38 +03:00 |
|
|
Rochet2
|
7ee4014399
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-13 14:20:50 +03:00 |
|
|
Rochet2
|
7570f25216
|
Rewrite node_modules handling according to https://stackoverflow.com/a/52092711
|
2019-05-13 14:20:35 +03:00 |
|
|
Rochet2
|
19c441c6bd
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-13 13:47:44 +03:00 |
|
|
Rochet2
|
3ca0601866
|
Always install dev dependencies
|
2019-05-13 13:37:33 +03:00 |
|
|
Rochet2
|
469307abb5
|
Add some dockerignore files
|
2019-05-13 13:03:19 +03:00 |
|
|
Rochet2
|
9a9bd00ae7
|
move dotenv from devdeps to deps
|
2019-05-13 13:01:59 +03:00 |
|
|
Rochet2
|
5ca61268d6
|
Fix production build
|
2019-05-13 12:16:51 +03:00 |
|
|
Rochet2
|
24cf6d3582
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-13 12:07:19 +03:00 |
|
|
Rochet2
|
6ce925e1bd
|
Fix production build
|
2019-05-13 12:07:14 +03:00 |
|
|
Rochet2
|
47ef3eed75
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-13 10:57:16 +03:00 |
|
|
Rochet2
|
f80f04a237
|
Deprecate dev.Dockerfile
|
2019-05-13 10:56:23 +03:00 |
|
|
Rochet2
|
555707a2ba
|
linfix
|
2019-05-10 23:12:38 +03:00 |
|
|
Rochet2andGitHub
|
1cdc43379d
|
Merge branch 'master' into trunk
|
2019-05-10 22:05:16 +03:00 |
|
|
Rochet2
|
610827b61b
|
Make content fullscreen - Feel free to revert
|
2019-05-10 21:31:48 +03:00 |
|
|
Rochet2
|
218f76e8f2
|
Fix crashes, enable logging, improve small screen compat
|
2019-05-10 21:31:20 +03:00 |
|
|
Rochet2andGitHub
|
93396dea01
|
Merge pull request #877 from UniversityOfHelsinkiCS/trunk
Fix volume stuff in staging (pls no volumes)
|
2019-05-10 00:08:45 +03:00 |
|
|
Rochet2
|
d1ea8f9610
|
Fix volume stuff in staging (pls no volumes)
|
2019-05-09 23:52:34 +03:00 |
|
|
Rochet2andGitHub
|
b83e6ebf13
|
Merge pull request #876 from UniversityOfHelsinkiCS/trunk
Disable cypress record until cypress dashboard allows upload again
|
2019-05-09 22:16:55 +03:00 |
|
|
Rochet2andGitHub
|
78326e458b
|
Merge branch 'master' into trunk
|
2019-05-09 21:51:57 +03:00 |
|
|
Rochet2andGitHub
|
fc5fb5ab59
|
Remove record from cypress:record Revert when cypress works again
|
2019-05-09 21:33:03 +03:00 |
|
|
Rochet2
|
035878b307
|
upload video only on fail
|
2019-05-09 21:09:39 +03:00 |
|
|
Rochet2
|
f2fdb015b9
|
Revert "Remove cypress record"
This reverts commit c0f25ac00a.
|
2019-05-09 21:07:13 +03:00 |
|
|
Rochet2
|
fd1d6d3965
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-09 20:56:23 +03:00 |
|
|
Rochet2
|
c0f25ac00a
|
Remove cypress record
|
2019-05-09 20:56:15 +03:00 |
|
|
Rochet2andGitHub
|
9d099f9207
|
Merge pull request #874 from UniversityOfHelsinkiCS/trunk
Code mapper improvements, other stuff
|
2019-05-09 20:21:45 +03:00 |
|
|
Rochet2andGitHub
|
4c8a0131b1
|
Merge branch 'master' into trunk
|
2019-05-09 19:56:30 +03:00 |
|
|
Rochet2
|
62c8672f86
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-09 19:49:27 +03:00 |
|
|
Rochet2
|
c1f6bb725c
|
Course code mapping improvements
|
2019-05-09 19:43:38 +03:00 |
|
|
Rochet2andGitHub
|
0ae688162f
|
Merge pull request #873 from UniversityOfHelsinkiCS/travis
Fix tests by reverting removing of old stuff (temp fix)
|
2019-05-09 18:58:21 +03:00 |
|
|
Rochet2
|
609db378a0
|
Revert "Was moved to monorepo/shared/models"
This reverts commit 29b015744c.
|
2019-05-09 17:54:27 +03:00 |
|
|
Rochet2
|
4bfbd50bc1
|
ci on any branch
|
2019-05-09 17:53:30 +03:00 |
|
|
Rochet2
|
cfd865dcdb
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-05-09 13:47:50 +03:00 |
|
|
Rochet2andGitHub
|
596f0b043d
|
Merge pull request #872 from UniversityOfHelsinkiCS/trunk
Implement recalculation to overview
|
2019-05-09 13:45:49 +03:00 |
|
|
Rochet2
|
29b015744c
|
Was moved to monorepo/shared/models
|
2019-05-09 13:42:15 +03:00 |
|
|
Rochet2andGitHub
|
27a6c105c3
|
Build prod on trunk push
|
2019-05-09 13:32:23 +03:00 |
|
|
Rochet2andGitHub
|
d3198ffe8a
|
Make tests run on every push to trunk
|
2019-05-09 13:29:30 +03:00 |
|
|
Rochet2andGitHub
|
a74175abaf
|
Merge branch 'master' into trunk
|
2019-05-09 13:06:53 +03:00 |
|
|
Rochet2
|
5f3ccd54e5
|
Fix CI tests
|
2019-05-09 13:03:53 +03:00 |
|
|
Rochet2
|
eea935f1a6
|
Skip cleanup, we like it dirty
|
2019-05-08 23:27:44 +03:00 |
|
|
Rochet2
|
a9c53ddaac
|
Implement Overview Recalculate buttons, last updated and calculation status
|
2019-05-08 20:02:18 +03:00 |
|
|
Rochet2
|
1a7eb452a4
|
deprecate oldschool bash
|
2019-05-08 15:31:42 +03:00 |
|
|
Rochet2
|
6e386c3999
|
Remove weird dependency
|
2019-05-08 15:25:34 +03:00 |
|
|
Rochet2
|
4b5ab3b83a
|
comment out mongodb
|
2019-05-06 11:39:00 +03:00 |
|
|
Rochet2andGitHub
|
717094afbc
|
Merge pull request #859 from UniversityOfHelsinkiCS/trunk
Set up production testing in travis
|
2019-05-04 21:10:47 +03:00 |
|
|
Rochet2andGitHub
|
1ad7ff7733
|
Merge branch 'master' into trunk
|
2019-05-04 19:30:06 +03:00 |
|
|
Rochet2andGitHub
|
8caeccbb04
|
Merge pull request #858 from UniversityOfHelsinkiCS/testprod
Set up production test run in travis
|
2019-05-04 19:29:03 +03:00 |
|
|
Rochet2andGitHub
|
c7c6077d1f
|
time e2e setup instead of source
|
2019-05-04 19:11:31 +03:00 |
|
|
Rochet2
|
06917b5921
|
Remove concurrency from travis (no benefit)
|
2019-05-04 18:59:37 +03:00 |
|
|
Rochet2andGitHub
|
5012b861ed
|
Remove sudo required
|
2019-05-04 18:43:26 +03:00 |
|
|
Rochet2andGitHub
|
0bf1d7a424
|
Update .travis.yml
|
2019-05-04 18:25:01 +03:00 |
|
|
Rochet2andGitHub
|
f887bdef80
|
Update .travis.yml
|
2019-05-04 18:22:27 +03:00 |
|
|
Rochet2andGitHub
|
25fef6ff97
|
Update .travis.yml
|
2019-05-04 17:55:28 +03:00 |
|
|
Rochet2andGitHub
|
bb8786d687
|
Use newer docker-compose in travis for parallel building
|
2019-05-04 17:50:22 +03:00 |
|
|
Rochet2
|
61b99ef5d8
|
simplify, parallelize travis
|
2019-05-04 17:36:00 +03:00 |
|
|
Rochet2
|
5376c46664
|
remove unused file
|
2019-05-04 16:32:18 +03:00 |
|
|
Rochet2andGitHub
|
361f807002
|
Test release image before push
|
2019-05-04 16:24:04 +03:00 |
|
|
Rochet2andGitHub
|
96cc21a5b6
|
Fix auth for CI tests on produciton image
|
2019-05-04 16:16:27 +03:00 |
|
|
Rochet2andGitHub
|
0db0234c0e
|
Update Population_statistics.js
|
2019-05-04 16:03:01 +03:00 |
|
|
Rochet2andGitHub
|
b295facd03
|
dump logs after build
|
2019-05-04 14:49:48 +03:00 |
|
|
Rochet2andGitHub
|
0cd76e9a90
|
rename nginx.conf for staging
|
2019-05-04 14:23:49 +03:00 |
|
|
Rochet2andGitHub
|
3175b9e7d8
|
rename nginx.conf for production
|
2019-05-04 14:23:25 +03:00 |
|
|
Rochet2andGitHub
|
fb97aa3768
|
Create nginx.production.conf
|
2019-05-04 14:22:31 +03:00 |
|
|
Rochet2andGitHub
|
63ed151cc9
|
Rename nginx.conf to nginx.staging.conf
|
2019-05-04 14:21:35 +03:00 |
|
|
Rochet2andGitHub
|
b6c23843fa
|
Use env variables to signal which image is being built in travis
|
2019-05-04 14:16:22 +03:00 |
|