Commit Graph
100 Commits
Author SHA1 Message Date
Otto Ahoniemi 5a985b60ba Replace old docker composes with new stuff 2021-06-10 10:24:10 +03:00
Otto Ahoniemi c5e66eb46f Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk 2021-06-10 10:23:59 +03:00
Otto Ahoniemi 9aad69cf46 Don't use anon or CI yet 2021-06-07 10:25:03 +03:00
Otto Ahoniemi 787bd7a544 Finalize run.sh 2021-06-07 10:17:32 +03:00
Otto Ahoniemi cdb3ab71c3 Add base for new dev env script 2021-06-07 09:29:50 +03:00
Otto Ahoniemi 70f3a41aaf Add missing dot for cli opt 2 2021-06-03 13:50:12 +03:00
Otto Ahoniemi d2f8dfa00d Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk 2021-06-03 13:22:16 +03:00
Otto Ahoniemi ec35493814 Fix logic when adding course provider for course made from CustomCourseUnitAttainment 2021-06-03 13:22:07 +03:00
Otto Ahoniemi 3eec1f762a Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk 2021-06-02 13:04:33 +03:00
Otto Ahoniemi 40013d87ce Fix credits with null studymodule not being counted to trends over time 2021-06-02 13:03:39 +03:00
Otto AhoniemiandGitHub c1eb2c42d4 Merge branch 'master' into trunk 2021-06-02 12:49:36 +03:00
Otto Ahoniemi 7f15e966f2 cleanup 2021-06-02 12:46:50 +03:00
Otto Ahoniemi 333da43a8e Fix credits with null studymodule not being counted to trends 2021-06-02 12:45:12 +03:00
Otto AhoniemiandGitHub 705c3420c4 Merge pull request #3002 from UniversityOfHelsinkiCS/trunk
Add note to notification about not working trends tabs
2021-06-02 10:03:23 +03:00
Otto Ahoniemi 6929eaee97 Add note to notification about not working trends tabs 2021-06-02 09:47:52 +03:00
Otto AhoniemiandGitHub 925d1caeb4 Merge pull request #3000 from UniversityOfHelsinkiCS/trunk
Fixes in CI-putki, course anonymisation and trends V2
2021-06-02 08:53:21 +03:00
Otto Ahoniemi 20915026f5 Don't alter variables passed to function 2021-06-02 08:29:58 +03:00
Otto Ahoniemi 182ead621c Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk 2021-06-02 08:17:45 +03:00
Otto Ahoniemi 93e913a4dd Fix bug where faculty was not initialized 2021-06-02 08:15:08 +03:00
Otto Ahoniemi 181dd7406d Some more logic fixes 2021-06-02 01:11:56 +03:00
Otto Ahoniemi 1bdb7deab9 Render change without percentage when start value is zero 2021-06-02 00:59:42 +03:00
Otto Ahoniemi 1c11aa14cc Fix bug where undefined current and previous resulted NaN in title 2021-06-02 00:27:00 +03:00
Otto Ahoniemi a933608e8c Fix linting errors and move protoc away from index 2021-06-01 23:40:55 +03:00
Otto Ahoniemi ddb4a19344 Rename status to attainments 2021-06-01 23:22:33 +03:00
Otto Ahoniemi acfc883e01 Minor typo fixes 2021-06-01 23:20:11 +03:00
Otto Ahoniemi e8a661c9ee Change filenames to reflect their content 2021-06-01 22:55:10 +03:00
Otto Ahoniemi aefd0fb0b0 Refactor uber away from index.js 2021-06-01 22:52:53 +03:00
Otto Ahoniemi f09a4c1a20 Export only used functions from trends 2021-06-01 22:51:53 +03:00
Otto Ahoniemi ab899e2b50 Continue refactoring 2021-06-01 22:38:13 +03:00
Otto Ahoniemi 57a0a9eecb Refactor protoc from index.js 2021-06-01 16:20:47 +03:00
Otto Ahoniemi 75f48b00b4 Refactor shared stuff to shared.js 2021-06-01 15:59:09 +03:00
Otto Ahoniemi 11e67c792d Refactor getStatus away from trends.js 2021-06-01 15:32:31 +03:00
Otto Ahoniemi 543bb4cdcd Set script to give rights recursively for docker entrypoint folder 2021-06-01 11:19:04 +03:00
Otto Ahoniemi 89a179a6f5 Move trends service to folder 2021-06-01 10:59:54 +03:00
Otto Ahoniemi f0210a63f9 Remove unused featuretoggleprovider abstraction 2021-06-01 08:23:15 +03:00
Otto Ahoniemi 2a16fc558b Only lint backend instead of running jest against old oodikone tests 2021-06-01 07:59:06 +03:00
Otto Ahoniemi 1be30ab07f Temp disable nginx in ci pipeline, since cypress isn't running 2021-06-01 07:47:59 +03:00
Otto Ahoniemi 884f74e314 Trying to fix failing circleci 2021-05-31 23:07:23 +03:00
Otto Ahoniemi a10c20df4f Remove anon setup from circle 2021-05-31 15:13:47 +03:00
Otto Ahoniemi d0110901f8 Comment old updater out from ci docker-compose as well 2021-05-31 14:59:01 +03:00
Otto Ahoniemi 473c54e784 Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk 2021-05-31 13:29:03 +03:00
Otto Ahoniemi a649e210da Comment old updater out from docker-composes 2021-05-31 13:28:10 +03:00
Otto Ahoniemi 934c297589 Restore init dirs in scripts 2021-05-31 13:24:50 +03:00
Otto Ahoniemi 1fed6ab895 Only run npm ci if packages not already installed 2021-05-31 13:11:08 +03:00
Otto AhoniemiandGitHub 25e8c06856 Merge pull request #2954 from UniversityOfHelsinkiCS/dependabot/npm_and_yarn/browserslist-4.16.6
Bump browserslist from 4.14.0 to 4.16.6
2021-05-31 12:59:43 +03:00
Otto AhoniemiandGitHub 1f9e3b639a Merge pull request #2955 from UniversityOfHelsinkiCS/dependabot/npm_and_yarn/services/backend/oodikone2-backend/browserslist-4.16.6
Bump browserslist from 4.16.4 to 4.16.6 in /services/backend/oodikone2-backend
2021-05-31 12:59:30 +03:00
Otto AhoniemiandGitHub 4e709b39a6 Merge pull request #2986 from UniversityOfHelsinkiCS/dependabot/npm_and_yarn/trunk/concurrently-6.2.0
Bump concurrently from 6.0.2 to 6.2.0
2021-05-31 12:59:04 +03:00
Otto AhoniemiandGitHub cf3cacc8c5 Merge pull request #2987 from UniversityOfHelsinkiCS/dependabot/npm_and_yarn/trunk/cypress-7.4.0
Bump cypress from 7.2.0 to 7.4.0
2021-05-31 12:57:17 +03:00
Otto Ahoniemi 501c135996 Fix some typos 2021-05-31 12:48:14 +03:00
Otto Ahoniemi 2de93c21d4 Setup new simplified functions for cli 2021-05-31 12:33:17 +03:00
Otto Ahoniemi 94e62f2495 Add new options for oodikone setup 2021-05-31 12:25:32 +03:00
Otto Ahoniemi a432ac4e8a Refactor setup script, drop unnecessary stuff 2021-05-31 12:15:48 +03:00
Otto Ahoniemi d85357d4d9 Remove unused functions from scripts 2021-05-31 11:48:41 +03:00
Otto Ahoniemi 7e0dce4796 Fix some basic shellcheck issues 2021-05-31 11:43:01 +03:00
Otto Ahoniemi be32c80e04 Update instructions 2021-05-31 11:33:10 +03:00
Otto Ahoniemi ada166734a Remove oodi db setup from setup-all-data option 2021-05-31 11:22:49 +03:00
Otto Ahoniemi 832bc21e17 Prevent word splitting errors in run.sh 2021-05-31 10:14:43 +03:00
Otto AhoniemiandGitHub a0d0c5f7b0 Merge pull request #2985 from UniversityOfHelsinkiCS/trunk
Finalized sis change notification, ready for 🚀
2021-05-31 00:45:20 +03:00
Otto AhoniemiandGitHub b3fc6d4ffd Merge branch 'master' into trunk 2021-05-31 00:36:53 +03:00
Otto Ahoniemi 66341ac4be Fix some typos and message formatting 2021-05-31 00:35:00 +03:00
Otto Ahoniemi 60bb44b0b7 Add some tailored info messages for users 2021-05-31 00:25:35 +03:00
Otto Ahoniemi 6f0dbb3796 Disable proptype validations in sischangemessage component 2021-05-31 00:25:19 +03:00
Otto Ahoniemi 3c17fa055b Create better sis transfer info notification 2021-05-30 23:58:34 +03:00
Otto AhoniemiandGitHub 698ef08fe9 Merge pull request #2980 from UniversityOfHelsinkiCS/trunk
Change SIS as default backend in oodikone
2021-05-28 15:16:37 +03:00
Otto AhoniemiandGitHub 5ebdaa1a28 Merge branch 'master' into trunk 2021-05-28 15:08:26 +03:00
Otto AhoniemiandGitHub 8b53e39b16 Merge pull request #2978 from UniversityOfHelsinkiCS/set-sis-as-default
Set SIS as default
2021-05-28 15:03:04 +03:00
Otto Ahoniemi d24577677b Temporarily disable cypress in circle ci 2021-05-28 14:50:35 +03:00
Otto Ahoniemi 51e5846903 Remove unused population funcs 2021-05-28 14:30:19 +03:00
Otto Ahoniemi 0cb13e2476 Set backend to return 403 if asking for old oodi data without admin rights 2021-05-28 13:36:25 +03:00
Otto Ahoniemi fe1a25282c No need to cast to boolean in if-else test 2021-05-28 13:12:44 +03:00
Otto Ahoniemi 203e31edc3 Remove unnecessary sis feature toggle 2021-05-28 13:11:33 +03:00
Otto Ahoniemi 3d3da1c322 Switch logic to set sis as default 2021-05-28 12:56:27 +03:00
Otto Ahoniemi ca6f843b52 Lintfixes 2021-05-28 12:22:29 +03:00
Otto Ahoniemi 0886c52094 Set sis as default and show message about moving to sis 2021-05-28 12:22:29 +03:00
Otto Ahoniemi 02b7557c68 Add warning colours to couple of other places when using oodi data 2021-05-28 12:22:29 +03:00
Otto Ahoniemi b0c79b19b0 Swap oodi & sis warnings 2021-05-28 12:22:29 +03:00
Otto Ahoniemi 153d1dca74 Remove unused sidebar abstraction 2021-05-28 12:22:29 +03:00
Otto Ahoniemi bda4c4ae28 Change feedback header 2021-05-28 12:22:29 +03:00
Otto Ahoniemi ade9433149 Add message about oodi sis change 2021-05-28 12:22:29 +03:00
Otto Ahoniemi acb0b979fc Lintfixes 2021-05-28 12:15:51 +03:00
Otto Ahoniemi af9b9fad4b Better printing for trends diff 2021-05-28 12:13:21 +03:00
Otto Ahoniemi 19b639717f Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk 2021-05-28 11:57:37 +03:00
Otto Ahoniemi 4e49861335 Add oikis & lääkis diffs to trends 2021-05-28 11:56:39 +03:00
Otto Ahoniemi b132e9c303 Create course provider if course doesn't have one 2021-05-28 11:56:23 +03:00
Otto Ahoniemi fc2ff43659 Add some comments for custom courses created by updater and add correct courseprovider methods 2021-05-28 10:23:05 +03:00
Otto Ahoniemi 145f6facdc Add option to print all courses in trends diff 2021-05-28 10:16:36 +03:00
Otto Ahoniemi 39275559a8 Also count credits where studymodule is null 2021-05-28 09:56:33 +03:00
Otto Ahoniemi 97877e892c Remove degree mappings from studyrightelement updaters 2021-05-28 08:52:53 +03:00
Otto Ahoniemi 12b14f507a Add first version of course provider mapper for courses updater creates 2021-05-28 08:34:56 +03:00
Otto Ahoniemi 7c639c4719 Add better diffing options for trends 2021-05-27 12:58:20 +03:00
Otto Ahoniemi 41368790a9 Take organisation of last course unit instead of first 2021-05-27 12:22:32 +03:00
Otto Ahoniemi 2bcdfbcc46 Try to parse valid organisation from course units 2021-05-27 11:16:23 +03:00
Otto Ahoniemi 4939f7c22a Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk 2021-05-26 17:19:22 +03:00
Otto Ahoniemi 92b4a42837 Fix horrible variable name 2021-05-26 16:14:45 +03:00
Otto Ahoniemi 22ac3748db Remove unnecessary commented code 2021-05-26 15:56:08 +03:00
Otto Ahoniemi e6a2bf4c42 Add some printing to trends diff 2021-05-26 14:54:33 +03:00
Otto Ahoniemi f9db54eda9 Add first recursive differ for trends 2021-05-26 14:39:36 +03:00
Otto Ahoniemi 960db16e1f Add trends diff script 2021-05-26 14:09:13 +03:00
Otto AhoniemiandGitHub 5bf2c91fa9 Merge pull request #2962 from UniversityOfHelsinkiCS/trunk
Hide degrees on student studyright page
2021-05-25 16:29:39 +03:00
Otto AhoniemiandGitHub 7b70d0d0f9 Merge branch 'master' into trunk 2021-05-25 15:45:34 +03:00