 Matti LuukkainenandGitHub
|
5883c8a368
|
Merge pull request #2693 from UniversityOfHelsinkiCS/trunk
betterments in updater and diff script running
|
2021-03-11 22:04:06 +02:00 |
|
|
Matti Luukkainen
|
cfabc7db11
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2021-03-11 21:48:23 +02:00 |
|
|
Matti Luukkainen
|
3cd2028997
|
betterment in running diff:populations
|
2021-03-11 21:48:13 +02:00 |
|
|
Matti Luukkainen
|
f020f969a1
|
studyright cancellation in case status CANCELLED_BY_ADMINISTRATION
|
2021-03-11 20:25:09 +02:00 |
|
|
Matti Luukkainen
|
1564819cba
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2021-03-11 20:02:41 +02:00 |
|
|
Matti Luukkainen
|
23c5ef4bb5
|
fix the bug that caused some studyright to have a cancelled status
|
2021-03-11 20:02:09 +02:00 |
|
|
Matti Luukkainen
|
1d6b8db5dc
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2021-03-02 13:51:31 +02:00 |
|
|
Matti Luukkainen
|
18c7dd6b03
|
diffscript betterment
|
2021-03-02 13:51:24 +02:00 |
|
|
Matti LuukkainenandGitHub
|
1e645e0b5d
|
Merge pull request #2648 from UniversityOfHelsinkiCS/trunk
sis/oodi diff
|
2021-02-28 13:38:51 +02:00 |
|
|
Matti LuukkainenandGitHub
|
9c89f89940
|
Merge branch 'master' into trunk
|
2021-02-28 13:12:41 +02:00 |
|
|
Matti Luukkainen
|
28cecba134
|
diff betterment
|
2021-02-28 13:05:45 +02:00 |
|
|
Matti Luukkainen
|
81a1ec5e8d
|
population diff script betterment
|
2021-02-28 11:41:37 +02:00 |
|
|
Matti Luukkainen
|
0826ef5753
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2021-02-27 16:03:49 +02:00 |
|
|
Matti Luukkainen
|
f0dc30052f
|
moar programmes to sisoodi diff
|
2021-02-27 16:03:20 +02:00 |
|
|
Matti Luukkainen
|
56a8da9b9f
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2021-02-27 13:56:26 +02:00 |
|
|
Matti Luukkainen
|
f1600213d1
|
sis-oodi-diff
|
2021-02-27 13:56:13 +02:00 |
|
|
Matti LuukkainenandGitHub
|
bb3a3eba57
|
Merge pull request #2626 from UniversityOfHelsinkiCS/trunk
fix started later than ended -bug in some sis-based studyrights
|
2021-02-18 20:35:00 +02:00 |
|
|
Matti Luukkainen
|
1e9176d390
|
fix to datefukap
|
2021-02-18 19:44:50 +02:00 |
|
|
Matti LuukkainenandGitHub
|
7b921d2e93
|
Merge pull request #2617 from UniversityOfHelsinkiCS/trunk
Fix degree updating failing with updater, add UI for sis-oodi diff course and some UI fixes
|
2021-02-17 21:51:51 +02:00 |
|
|
Matti LuukkainenandGitHub
|
2514f44aa2
|
Merge branch 'master' into trunk
|
2021-02-17 21:30:06 +02:00 |
|
|
Matti LuukkainenandGitHub
|
b6972652ab
|
Merge pull request #2618 from UniversityOfHelsinkiCS/mluukkai-patch-2
Update config.yml
|
2021-02-17 21:29:08 +02:00 |
|
|
Matti LuukkainenandGitHub
|
7f0c7be375
|
Update config.yml
|
2021-02-17 21:13:05 +02:00 |
|
|
Matti LuukkainenandGitHub
|
65e9a79561
|
Merge pull request #2614 from UniversityOfHelsinkiCS/trunk
fix the fix in term registrations and other shit
|
2021-02-16 17:43:03 +02:00 |
|
|
Matti Luukkainen
|
94ba082113
|
fix the termregistration fox
|
2021-02-16 17:18:42 +02:00 |
|
|
Matti LuukkainenandGitHub
|
ac84b6f204
|
Merge pull request #2608 from UniversityOfHelsinkiCS/trunk
fix enrolment fukap
|
2021-02-15 18:05:23 +02:00 |
|
|
Matti LuukkainenandGitHub
|
f713cf470f
|
Merge branch 'master' into trunk
|
2021-02-15 17:51:50 +02:00 |
|
|
Matti Luukkainen
|
b62b8b6441
|
fix enrolment fukap
|
2021-02-15 17:34:17 +02:00 |
|
|
Matti LuukkainenandGitHub
|
1df2504169
|
Merge pull request #2604 from UniversityOfHelsinkiCS/trunk
include graduated to populations
|
2021-02-13 16:40:41 +02:00 |
|
|
Matti LuukkainenandGitHub
|
f963ddd4eb
|
Merge branch 'master' into trunk
|
2021-02-13 15:55:20 +02:00 |
|
|
Matti Luukkainen
|
28f641d849
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2021-02-13 15:41:48 +02:00 |
|
|
Matti Luukkainen
|
1322a09402
|
graduated to sis-based populations
|
2021-02-13 15:40:14 +02:00 |
|
|
Matti LuukkainenandGitHub
|
7de7986efb
|
Merge pull request #2600 from UniversityOfHelsinkiCS/trunk
studyright_elements dates to match oodi
|
2021-02-11 20:49:51 +02:00 |
|
|
Matti Luukkainen
|
e7371bc0b5
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2021-02-11 19:34:22 +02:00 |
|
|
Matti Luukkainen
|
8294ae988c
|
timestamp fix in studyright elements
|
2021-02-11 19:34:17 +02:00 |
|
|
Matti LuukkainenandGitHub
|
986427acfc
|
Merge pull request #2585 from UniversityOfHelsinkiCS/trunk
fix the shit
|
2021-02-09 17:33:31 +02:00 |
|
|
Matti Luukkainen
|
12825472b9
|
fix
|
2021-02-09 17:03:20 +02:00 |
|
|
Matti LuukkainenandGitHub
|
494f930af4
|
Merge pull request #2583 from UniversityOfHelsinkiCS/trunk
studyrightbetterments in sis-updater
|
2021-02-09 15:25:17 +02:00 |
|
|
Matti Luukkainen
|
83c4866298
|
betterment in updater
|
2021-02-09 14:32:06 +02:00 |
|
|
Matti LuukkainenandOtto Ahoniemi
|
4ef95c014d
|
tring to fix stydyright startdate
|
2021-02-08 09:09:16 +02:00 |
|
|
Matti LuukkainenandGitHub
|
fac388e471
|
Merge pull request #2572 from UniversityOfHelsinkiCS/mluukkai-patch-1
Update README.md
|
2021-02-04 17:19:25 +02:00 |
|
|
Matti Luukkainen
|
8042dd0d9a
|
tring to fix stydyright startdate
|
2021-02-04 17:17:17 +02:00 |
|
|
Matti LuukkainenandGitHub
|
b6b72f3bf1
|
Update README.md
|
2021-02-04 13:47:00 +02:00 |
|
|
Matti LuukkainenandGitHub
|
9383f8a02b
|
Merge pull request #2542 from UniversityOfHelsinkiCS/trunk
ignore enrollments without a date
|
2021-01-22 00:24:36 +02:00 |
|
|
Matti LuukkainenandGitHub
|
b5c30edd17
|
Merge branch 'master' into trunk
|
2021-01-22 00:02:42 +02:00 |
|
|
Matti Luukkainen
|
28c70874be
|
ignore enrollments without a date
|
2021-01-21 23:55:08 +02:00 |
|
|
Matti LuukkainenandGitHub
|
fc31e0b3be
|
Merge pull request #2537 from UniversityOfHelsinkiCS/trunk
Kludge to exclude noshow students from SIS populations
|
2021-01-21 21:25:23 +02:00 |
|
|
Matti Luukkainen
|
252f037fed
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2021-01-21 19:08:40 +02:00 |
|
|
Matti Luukkainen
|
4fd14120b6
|
remove cacelled students from populations
|
2021-01-21 19:07:52 +02:00 |
|
|
Matti LuukkainenandGitHub
|
fb77fea625
|
Update README.md
|
2020-09-22 10:54:48 +03:00 |
|
|
Matti Luukkainen
|
160e6ba967
|
betterment
|
2020-04-27 22:45:49 +03:00 |
|
|
Matti Luukkainen
|
ae192b8903
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2020-04-27 22:39:29 +03:00 |
|
|
Matti Luukkainen
|
c6925d09b7
|
betterment
|
2020-04-27 22:30:08 +03:00 |
|
|
Matti Luukkainen
|
9e37d1218f
|
disable lint
|
2020-04-27 22:07:13 +03:00 |
|
|
Matti Luukkainen
|
711cc96bad
|
mandatory cources from sis POC
|
2020-04-27 22:04:20 +03:00 |
|
|
Matti Luukkainen
|
00cb2ed36f
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2020-04-24 09:13:39 +03:00 |
|
|
Matti Luukkainen
|
7580850bc1
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2020-04-16 16:36:00 +03:00 |
|
|
Matti Luukkainen
|
01e7eccdd2
|
README minthified
|
2020-04-16 14:24:07 +03:00 |
|
|
Matti LuukkainenandGitHub
|
8491840a44
|
Merge pull request #855 from UniversityOfHelsinkiCS/trunk
Minthify README
|
2019-05-04 13:30:56 +03:00 |
|
|
Matti LuukkainenandGitHub
|
63ef07647b
|
Merge branch 'master' into trunk
|
2019-05-04 13:07:15 +03:00 |
|
|
Matti LuukkainenandGitHub
|
82c749be78
|
Minthify README
|
2019-05-04 13:06:37 +03:00 |
|
|
Matti LuukkainenandGitHub
|
4eaf2759ec
|
Merge branch 'master' into trunk
|
2019-05-04 12:52:49 +03:00 |
|
|
Matti LuukkainenandGitHub
|
5c0dbddb4a
|
Update .travis.yml
|
2019-05-04 12:46:57 +03:00 |
|
|
Matti LuukkainenandGitHub
|
cc690e20db
|
Update .travis.yml
|
2019-05-04 12:44:17 +03:00 |
|
|
Matti Luukkainen
|
9e3d74bce0
|
newline to README
|
2019-05-03 23:27:40 +03:00 |
|
|
Matti LuukkainenandGitHub
|
6ea17ed067
|
Merge branch 'master' into trunk
|
2019-05-03 23:20:19 +03:00 |
|
|
Matti LuukkainenandGitHub
|
6c6c00429f
|
Update README.md
|
2019-05-03 23:17:01 +03:00 |
|
|
Matti LuukkainenandGitHub
|
3a9d107c48
|
Merge pull request #835 from UniversityOfHelsinkiCS/trunk
fix course participation limit
|
2019-04-25 19:53:36 +03:00 |
|
|
Matti Luukkainen
|
aea7b32735
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-04-25 19:36:12 +03:00 |
|
|
Matti Luukkainen
|
caead96d67
|
fix course participation limit
|
2019-04-25 19:36:06 +03:00 |
|
|
Matti LuukkainenandGitHub
|
0154d55f8a
|
Merge pull request #826 from UniversityOfHelsinkiCS/trunk
fix e2e test
|
2019-04-24 17:27:51 +03:00 |
|
|
Matti Luukkainen
|
860740d595
|
fix test
|
2019-04-24 17:24:43 +03:00 |
|
|
Matti LuukkainenandGitHub
|
2bf7bafa34
|
Merge pull request #822 from UniversityOfHelsinkiCS/trunk
fix course filter limit
|
2019-04-24 11:41:00 +03:00 |
|
|
Matti Luukkainen
|
99d3b925da
|
fix course filter limit
|
2019-04-24 11:32:25 +03:00 |
|
|
Matti LuukkainenandGitHub
|
d0249cca43
|
Merge pull request #820 from UniversityOfHelsinkiCS/trunk
better info tooltips
|
2019-04-24 01:10:56 +03:00 |
|
|
Matti Luukkainen
|
afad1dac6e
|
better info tooltips
|
2019-04-24 01:06:46 +03:00 |
|
|
Matti LuukkainenandGitHub
|
c3c1e953f2
|
Merge pull request #819 from UniversityOfHelsinkiCS/trunk
fixed mandatory course table crash on course refresh
|
2019-04-24 00:20:01 +03:00 |
|
|
Matti Luukkainen
|
4d4447b206
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-04-24 00:15:13 +03:00 |
|
|
Matti Luukkainen
|
e1af2d49f8
|
fixed mandatory course table crash on course refresh, proptype fix
|
2019-04-23 23:59:35 +03:00 |
|
|
Matti LuukkainenandGitHub
|
c90da863fa
|
Merge pull request #815 from UniversityOfHelsinkiCS/trunk
betterments
|
2019-04-23 21:29:47 +03:00 |
|
|
Matti Luukkainen
|
9c6cfb2cce
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-04-23 21:03:59 +03:00 |
|
|
Matti Luukkainen
|
3714ada146
|
back to old names
|
2019-04-23 21:03:55 +03:00 |
|
|
Matti LuukkainenandGitHub
|
fe4c51839c
|
Merge pull request #812 from UniversityOfHelsinkiCS/trunk
course filter stays when updated
|
2019-04-23 19:19:12 +03:00 |
|
|
Matti Luukkainen
|
d7fbcb779a
|
find out taken madatory courses properly
|
2019-04-23 18:58:09 +03:00 |
|
|
Matti Luukkainen
|
fc2626f94d
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-04-23 17:54:19 +03:00 |
|
|
Matti Luukkainen
|
05ccf90670
|
remove hat from package.json
|
2019-04-23 17:54:15 +03:00 |
|
|
Matti LuukkainenandGitHub
|
b5eaff3349
|
Update package.json
|
2019-04-23 17:53:29 +03:00 |
|
|
Matti Luukkainen
|
8c8bbe9297
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-04-23 17:46:33 +03:00 |
|
|
Matti LuukkainenandGitHub
|
161123701f
|
Merge branch 'master' into trunk
|
2019-04-23 17:41:00 +03:00 |
|
|
Matti Luukkainen
|
0da14f77ce
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-04-23 17:36:37 +03:00 |
|
|
Matti Luukkainen
|
1156d5a61e
|
wording
|
2019-04-23 17:36:33 +03:00 |
|
|
Matti Luukkainen
|
a84155bed6
|
proper sequelize import
|
2019-04-23 16:13:07 +03:00 |
|
|
Matti LuukkainenandGitHub
|
ff3d7c2264
|
Merge pull request #806 from UniversityOfHelsinkiCS/mluukkai-patch-1
Update README.md
|
2019-04-23 00:32:44 +03:00 |
|
|
Matti LuukkainenandGitHub
|
d3ce25293c
|
Update README.md
|
2019-04-22 20:49:31 +03:00 |
|
|
Matti LuukkainenandGitHub
|
4356d865b2
|
Merge pull request #805 from UniversityOfHelsinkiCS/trunk
month count to population courses query on refresh, sequelize Op fix
|
2019-04-22 20:45:33 +03:00 |
|
|
Matti Luukkainen
|
a23c17137d
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone into trunk
|
2019-04-22 20:38:35 +03:00 |
|
|
Matti Luukkainen
|
f917c7a61d
|
include months to populaton courses query
|
2019-04-22 20:35:23 +03:00 |
|
|
Matti LuukkainenandGitHub
|
6420e4d35b
|
Merge pull request #247 from UniversityOfHelsinkiCS/trunk
panik fixing route for mandatory courses
|
2019-01-22 06:23:36 +02:00 |
|
|
Matti Luukkainen
|
a21f43176d
|
panik fixing route for mandatory courses
|
2019-01-22 06:18:16 +02:00 |
|
|
Matti LuukkainenandGitHub
|
e05b1a7049
|
Merge pull request #237 from UniversityOfHelsinkiCS/trunk
login to use userservice
|
2018-12-12 19:35:07 +02:00 |
|
|
Matti Luukkainen
|
c3920ae846
|
Merge branch 'trunk' of github.com:UniversityOfHelsinkiCS/oodikone2-backend into trunk
|
2018-12-12 19:29:54 +02:00 |
|