Warro
|
a705743c83
|
Fixed scripts
|
2019-07-26 14:12:07 +03:00 |
|
Warro
|
47e9ce7ef9
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-26 14:09:51 +03:00 |
|
Warro
|
e377154bcd
|
Fixed travis
|
2019-07-26 14:09:40 +03:00 |
|
Warro
|
22d7c7e102
|
Added npm run lint to root that runs lint in all services & moved script files from root into the scripts folder
|
2019-07-26 13:35:57 +03:00 |
|
Warro
|
4e042508f3
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-26 10:50:38 +03:00 |
|
Warro
|
4862ff2ad3
|
fix lint
|
2019-07-26 10:41:25 +03:00 |
|
Warro
|
93de530920
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-26 10:38:00 +03:00 |
|
Warro
|
aa3f3dc914
|
Added 'Courses passed' and 'Courses failed' columns to faculties stat table and edited backend to return these values as well
|
2019-07-26 10:37:53 +03:00 |
|
Warro
|
fcb8c50d31
|
Fixed test error
|
2019-07-25 16:21:17 +03:00 |
|
Warro
|
93cc50223c
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-25 15:53:52 +03:00 |
|
Warro
|
2e972c2da1
|
fixed lint errors
|
2019-07-25 15:53:48 +03:00 |
|
Warro
|
9e0043e244
|
Updated frontend to show faculty stats, added faculty stats to analytics DB, added cron job to update faculty stats
|
2019-07-25 15:11:24 +03:00 |
|
Warro
|
8919a468df
|
Refactored code, added a lock just in case
|
2019-07-25 10:55:00 +03:00 |
|
Warro
|
1486ee0876
|
Edited faculty page, added endpoint to userservice for faculty programmes, added function that calculates yearly stats for faculty programmes
|
2019-07-25 10:17:33 +03:00 |
|
Warro
|
982559a296
|
fixed cypress
|
2019-07-23 14:34:05 +03:00 |
|
Warro
|
8a8e459154
|
Fixed auth issue, apparently ErrorBoundary needs to be the one that dispatched the initial login action
|
2019-07-23 14:13:58 +03:00 |
|
Warro
|
dc14ecb47f
|
lint and clean code
|
2019-07-23 13:27:27 +03:00 |
|
Warro
|
6f7b952d5d
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-23 13:22:27 +03:00 |
|
Warro
|
493661a573
|
Fixed warnings caused by async componentdidmounts
|
2019-07-23 13:22:23 +03:00 |
|
Warro
|
f9435d5ad9
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-22 15:39:54 +03:00 |
|
Warro
|
26f675066d
|
Closed some open handles that were left after backend jest tests
|
2019-07-22 15:39:50 +03:00 |
|
 OlliandGitHub
|
ef9de1fd82
|
Merge pull request #1148 from UniversityOfHelsinkiCS/trunk
Tables' styles seem be the worst thing that has ever happened to the human race
|
2019-07-22 13:33:29 +03:00 |
|
Warro
|
91b98f7719
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-22 12:41:23 +03:00 |
|
Warro
|
a1b8cbb9a6
|
Added styles for a fixed header for tables
|
2019-07-22 12:41:15 +03:00 |
|
Warro
|
8a2fd452db
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-19 10:41:08 +03:00 |
|
Warro
|
14761eb411
|
Deleted 20190710_00_delete_me_after_release.js migration
|
2019-07-19 10:39:05 +03:00 |
|
Warro
|
ecc5333071
|
Fixed an issue in the student graph where tooltip of courses with same id only showed info about the first of those courses
|
2019-07-19 10:18:05 +03:00 |
|
Warro
|
5ee0410e78
|
lint
|
2019-07-18 16:51:38 +03:00 |
|
Warro
|
a5382438e0
|
refactored useTabs hook
|
2019-07-18 16:42:49 +03:00 |
|
Warro
|
002966e95f
|
Changed push to replace in useTabs hook because that's neater
|
2019-07-18 16:20:35 +03:00 |
|
Warro
|
bdbdaf7b4d
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-18 16:05:24 +03:00 |
|
Warro
|
b88b0c9845
|
✨ LI-LI-LI-LINT ✨
|
2019-07-18 16:05:17 +03:00 |
|
Warro
|
b9b1cedef0
|
Created hook useTabs that remembers which tab the user was using before a page reload and returns that tab
|
2019-07-18 15:44:32 +03:00 |
|
 OlliandGitHub
|
506aa21d90
|
Merge pull request #1133 from UniversityOfHelsinkiCS/trunk
✨Improved graph ✨ & ❗️ERROR HANDLING ❗️
|
2019-07-17 14:54:35 +03:00 |
|
Warro
|
35d20d5952
|
Fixed an unhandled exception in updater that was thrown when the updater tried to fetch information about a student number which doesn't exist in oodi
|
2019-07-17 14:34:44 +03:00 |
|
Warro
|
7c18eac302
|
Added possibility to see tooltips over overlapping courses in student statistics by hovering the cursor over the target point
|
2019-07-17 10:17:48 +03:00 |
|
Warro
|
916ac12547
|
Added a migration that drops mandatory_course_labels from backend DB
|
2019-07-16 16:35:03 +03:00 |
|
Warro
|
7c6d942837
|
✨ LINT ✨
|
2019-07-16 16:01:59 +03:00 |
|
Warro
|
52aa9fb01d
|
Added the dispatchment of clearCourseStats to componentDidMount of course statistics search form, because course statistic didn't fetch new course if back button was used
|
2019-07-16 15:54:13 +03:00 |
|
Warro
|
68d13b0cad
|
Fixed an error where student page crashed if the student had zero courses marked
|
2019-07-16 15:09:57 +03:00 |
|
Warro
|
9eeaa2d8bf
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-16 14:34:37 +03:00 |
|
Warro
|
a8e72a440d
|
linted linter lint mint
|
2019-07-16 14:34:32 +03:00 |
|
Warro
|
1788ae67d2
|
removed npm packages highcharts-react-official and recharts from use, made AccessDenied page responsive ✨
|
2019-07-16 14:08:19 +03:00 |
|
Warro
|
fbfb0cedb1
|
refactored multicolor barchart to use highcharts instead of recharts
|
2019-07-16 13:43:45 +03:00 |
|
Warro
|
dd1dd7105f
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-16 12:48:29 +03:00 |
|
Warro
|
816ddfcc12
|
Made reference line more precise
|
2019-07-16 12:44:17 +03:00 |
|
Warro
|
ab0bb3f1a5
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-16 12:41:02 +03:00 |
|
Warro
|
24a95dc494
|
Deleted old credit accumulation graph
|
2019-07-16 12:34:11 +03:00 |
|
Warro
|
0dd2d28194
|
Replaced credit accumulation graph in student details page with highcharts graph
|
2019-07-16 12:10:45 +03:00 |
|
Warro
|
3978f4d8ea
|
vitun lint
|
2019-07-12 16:41:43 +03:00 |
|
Warro
|
8f6f930cf7
|
vitun progress bar
|
2019-07-12 15:59:25 +03:00 |
|
Warro
|
549970b01b
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-12 15:36:16 +03:00 |
|
Warro
|
f01a3dd9f6
|
Fixed cypress tests, added lock to backend, fixed a bug caused by discipline type filter
|
2019-07-12 15:36:11 +03:00 |
|
Warro
|
b06fc42f71
|
got rid of recalculate course table button
|
2019-07-12 10:18:24 +03:00 |
|
Warro
|
7e2b33d923
|
removed unnecessary imports
|
2019-07-11 16:05:19 +03:00 |
|
Warro
|
053d8edfeb
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-11 11:51:59 +03:00 |
|
Warro
|
23b0a83430
|
Fixed overview cypress test
|
2019-07-11 11:51:54 +03:00 |
|
Warro
|
b0428bd723
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-10 14:57:21 +03:00 |
|
Warro
|
bf5aa0d840
|
Fixed rounding in teacher statistics
|
2019-07-10 14:53:08 +03:00 |
|
Warro
|
e8d1eda23e
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-10 14:21:30 +03:00 |
|
Warro
|
dbd4acf003
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-10 14:09:26 +03:00 |
|
Warro
|
423959c42d
|
Check user access rights from db instead of token
|
2019-07-10 14:09:21 +03:00 |
|
Warro
|
282a65e45f
|
Fixed issue where clearing 'ALL' option from comparison group in course statistic didn't clear the dropdown input
|
2019-07-09 12:58:09 +03:00 |
|
Warro
|
82c5757e31
|
fixed another syntax error in .travis.yml
|
2019-07-09 10:51:10 +03:00 |
|
Warro
|
18efe8cc87
|
fixed syntax error in .travis.yml
|
2019-07-09 10:48:24 +03:00 |
|
Warro
|
702d698361
|
changed prod to latest
|
2019-07-09 10:45:01 +03:00 |
|
Warro
|
568e363a02
|
fixed typo
|
2019-07-09 10:41:47 +03:00 |
|
Warro
|
ff20298949
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-09 10:41:16 +03:00 |
|
Warro
|
61d8e53924
|
Combined stages so that data can be shared in different deploy stages
|
2019-07-09 10:41:13 +03:00 |
|
Warro
|
93f0bb6f93
|
Added stages to travis
|
2019-07-09 10:22:56 +03:00 |
|
Warro
|
68dcb1e49e
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-09 10:02:33 +03:00 |
|
Warro
|
642ef51ec2
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-09 09:50:09 +03:00 |
|
Warro
|
32e907885f
|
Refactored Travis so that it only does one build
|
2019-07-09 09:48:51 +03:00 |
|
Warro
|
a19fccb369
|
Removed volume usageservice in docker-compose root file
|
2019-07-08 14:00:12 +03:00 |
|
Warro
|
ec9644efdb
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-08 13:23:14 +03:00 |
|
Warro
|
23cf18859b
|
Use extend in travis docker-compose files
|
2019-07-08 13:22:21 +03:00 |
|
Warro
|
3d1a13c987
|
Reverted all commits, will be back on it on monday
|
2019-07-05 16:27:00 +03:00 |
|
Warro
|
d63a6ebcc3
|
fixing travis...........................................................
|
2019-07-05 16:15:01 +03:00 |
|
Warro
|
ec7b7ab42a
|
fixing travis...........................................................
|
2019-07-05 16:06:18 +03:00 |
|
Warro
|
a937844793
|
fixing travis...........................................................
|
2019-07-05 15:54:24 +03:00 |
|
Warro
|
70df7335e6
|
fixing travis..................................................
|
2019-07-05 15:15:43 +03:00 |
|
Warro
|
b985231da7
|
fixing travis...............................................
|
2019-07-05 15:14:52 +03:00 |
|
Warro
|
a5235d91ec
|
fixing travis.....................................
|
2019-07-05 15:01:10 +03:00 |
|
Warro
|
a1105191d0
|
fixing travis........................
|
2019-07-05 14:52:57 +03:00 |
|
Warro
|
3fb883ee8c
|
fixing travis................
|
2019-07-05 14:33:50 +03:00 |
|
Warro
|
70d896543b
|
fixing travis....
|
2019-07-05 14:22:04 +03:00 |
|
Warro
|
d9bb76cd4a
|
fixing travis
|
2019-07-05 14:03:35 +03:00 |
|
Warro
|
706131906a
|
fixing travis
|
2019-07-05 13:37:58 +03:00 |
|
Warro
|
c2daf1e2ca
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-05 12:38:31 +03:00 |
|
Warro
|
a8e07b7435
|
Use extend in travis docker-compose files
|
2019-07-05 12:38:25 +03:00 |
|
Warro
|
0108f1a2aa
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-05 09:04:41 +03:00 |
|
Warro
|
3551943af6
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-04 16:51:05 +03:00 |
|
Warro
|
38563a782d
|
Added access token to redux
|
2019-07-04 16:50:33 +03:00 |
|
Warro
|
bd84d447b5
|
Changed pg_restore commands to use docker instead and edited ping_psql so that it also drops existing databases before creating new ones
|
2019-07-03 15:56:10 +03:00 |
|
Warro
|
936ac639ed
|
Fixed percentage rounding bug
|
2019-07-02 16:33:14 +03:00 |
|
Warro
|
a3735ae889
|
fixed lint errors
|
2019-07-02 13:25:55 +03:00 |
|
Warro
|
120c24e059
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-02 13:17:34 +03:00 |
|
Warro
|
f85a2e7045
|
Added possibility to filter course statistics by year
|
2019-07-02 13:17:20 +03:00 |
|
Warro
|
0f39bad726
|
Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk
|
2019-07-02 08:59:47 +03:00 |
|
Warro
|
525e645429
|
Fixed docker hot reload for mac
|
2019-07-01 16:20:32 +03:00 |
|