 Rochet2andGitHub
|
2fa30e51c6
|
Update config.yml
|
2019-08-13 14:25:20 +03:00 |
|
 Rochet2andGitHub
|
d536279e33
|
Update config.yml
|
2019-08-13 14:22:06 +03:00 |
|
 Rochet2andGitHub
|
8be8f15054
|
Disable spamming logs with every request in CI
|
2019-08-10 17:19:10 +03:00 |
|
 Rochet2andGitHub
|
dd1733afbe
|
Update connection.js
|
2019-08-10 12:32:43 +03:00 |
|
 Rochet2andGitHub
|
7e501549aa
|
Update connection.js
|
2019-08-10 11:15:46 +03:00 |
|
 Rochet2andGitHub
|
1c05e6d935
|
Update index.js
|
2019-08-10 11:02:45 +03:00 |
|
 Rochet2andGitHub
|
d38a238f16
|
Update connection.js
|
2019-08-10 11:01:24 +03:00 |
|
 Rochet2andRochet2
|
89da5a16bd
|
Update docker-compose.dev.real.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
3f8d70e527
|
Update docker-compose.dev.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
13006e7675
|
Update docker-compose.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
dbea8338a4
|
Update config.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
18b497b1ec
|
Update config.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
d05064fcb2
|
Update config.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
e100f054d9
|
Update config.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
714587ce5f
|
Update docker-compose.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
8f4d1a7e84
|
Update docker-compose.lateste2e.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
843f4a1aa2
|
Update config.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
30c8a41bde
|
Update config.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
dad6f2be82
|
Update config.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andRochet2
|
5bc60b3933
|
Update config.yml
|
2019-08-10 03:25:47 +03:00 |
|
 Rochet2andGitHub
|
42df481259
|
Merge pull request #883 from UniversityOfHelsinkiCS/trunk
Docker improvements
|
2019-05-13 20:03:44 +03:00 |
|
 Rochet2andGitHub
|
288cf29c2c
|
Merge branch 'master' into trunk
|
2019-05-13 17:33:15 +03:00 |
|
 Rochet2andGitHub
|
ac28ddc16f
|
Merge pull request #853 from UniversityOfHelsinkiCS/fixci
Fix ci
|
2019-05-04 02:04:17 +03:00 |
|
 Rochet2andGitHub
|
a6a165abf5
|
Merge branch 'master' into trunk
|
2019-04-24 16:45:42 +03:00 |
|
 Rochet2andGitHub
|
c8cceefdba
|
Merge pull request #803 from UniversityOfHelsinkiCS/trunk
deprecate dockerhub webhooks
|
2019-04-20 13:14:09 +03:00 |
|
 Rochet2andGitHub
|
f9024eacee
|
Merge pull request #802 from UniversityOfHelsinkiCS/toskawatch
Deprecate toskawatch travis and dockerhub webhooks
|
2019-04-20 13:10:55 +03:00 |
|
 Rochet2andGitHub
|
9f9dcf3c3a
|
Merge pull request #799 from UniversityOfHelsinkiCS/trunk
Mandatory courses view, updater api, fixes
|
2019-04-18 16:39:56 +03:00 |
|
 Rochet2andGitHub
|
a3b1170501
|
Merge pull request #795 from UniversityOfHelsinkiCS/monorepo
Monorepo
|
2019-04-18 09:17:16 +03:00 |
|
 Rochet2andGitHub
|
7ede877717
|
Merge pull request #276 from UniversityOfHelsinkiCS/trunk
Update updater
|
2019-04-02 15:42:55 +03:00 |
|
 Rochet2andGitHub
|
23066897d9
|
Merge pull request #773 from UniversityOfHelsinkiCS/trunk
studyprogrammes to public
|
2019-04-02 15:35:48 +03:00 |
|
 Rochet2andGitHub
|
e52cd41b1c
|
Merge branch 'master' into trunk
|
2019-04-02 15:34:36 +03:00 |
|
 Rochet2andGitHub
|
8be91cf236
|
Merge branch 'master' into trunk
|
2019-04-02 15:33:12 +03:00 |
|
 Rochet2andGitHub
|
f9501de2f2
|
Merge pull request #5 from UniversityOfHelsinkiCS/trunk
Add bluebird and redis
|
2019-04-01 15:40:00 +03:00 |
|
 Rochet2andGitHub
|
65b5034fcd
|
Merge pull request #268 from UniversityOfHelsinkiCS/sasumaki-patch-1
Update README.md
|
2019-04-01 14:55:49 +03:00 |
|
 Rochet2andGitHub
|
90a19cecd0
|
Merge branch 'master' into sasumaki-patch-1
|
2019-04-01 14:51:16 +03:00 |
|
 Rochet2andGitHub
|
4ed924d6af
|
Merge pull request #4 from UniversityOfHelsinkiCS/trunk
Use redis
|
2019-04-01 14:50:41 +03:00 |
|
 Rochet2andGitHub
|
dde5c384bf
|
Merge pull request #274 from UniversityOfHelsinkiCS/trunk
Implement throughput analytics cache
|
2019-03-27 21:33:35 +02:00 |
|
 Rochet2andGitHub
|
505d154508
|
Merge pull request #3 from UniversityOfHelsinkiCS/trunk
Fix data format
|
2019-03-27 19:24:11 +02:00 |
|
 Rochet2andGitHub
|
544efc7f9a
|
Merge pull request #757 from UniversityOfHelsinkiCS/trunk
add analytics cache
|
2019-03-27 19:23:45 +02:00 |
|
 Rochet2andGitHub
|
3dc607ef43
|
Merge branch 'master' into trunk
|
2019-03-27 19:23:04 +02:00 |
|
 Rochet2andGitHub
|
fc41688f45
|
Merge pull request #273 from UniversityOfHelsinkiCS/trunk
Implement productivity stats thesis calculation, add analytics cache
|
2019-03-27 18:14:14 +02:00 |
|
 Rochet2andGitHub
|
3748f7ba4f
|
Merge pull request #2 from UniversityOfHelsinkiCS/trunk
Implement basic analytics store for now
|
2019-03-27 18:05:29 +02:00 |
|
 Rochet2andGitHub
|
f14ffbe45a
|
Merge branch 'master' into trunk
|
2019-03-27 17:56:10 +02:00 |
|
 Rochet2andGitHub
|
c0e1bcc312
|
Merge branch 'master' into trunk
|
2019-03-27 17:54:59 +02:00 |
|
 Rochet2andGitHub
|
aa2d90f033
|
Merge pull request #1 from UniversityOfHelsinkiCS/trunk
Initial
|
2019-03-27 13:07:17 +02:00 |
|
 Rochet2andGitHub
|
38ccd3e2ac
|
Initial commit
|
2019-03-27 09:35:21 +02:00 |
|
 Rochet2andGitHub
|
db40e31e3f
|
Merge pull request #756 from UniversityOfHelsinkiCS/trunk
Remove header banner
|
2019-03-26 17:52:31 +02:00 |
|
 Rochet2andGitHub
|
aa1cbf989a
|
Merge branch 'master' into trunk
|
2019-03-26 17:50:39 +02:00 |
|
 Rochet2andGitHub
|
48cb4f4f67
|
Merge pull request #272 from UniversityOfHelsinkiCS/trunk
CRUD endpoints
|
2019-03-26 17:03:59 +02:00 |
|
 Rochet2andGitHub
|
fcd4642d97
|
Merge pull request #720 from UniversityOfHelsinkiCS/trunk
Trunk
|
2019-03-07 16:41:39 +02:00 |
|
 Rochet2andGitHub
|
d9bb342a44
|
Merge branch 'master' into trunk
|
2019-03-07 16:27:03 +02:00 |
|
 Rochet2andGitHub
|
ab047efe71
|
Merge pull request #718 from UniversityOfHelsinkiCS/trunk
Comment out basepath for now, trying to release hy-groups
|
2019-03-07 15:57:38 +02:00 |
|
 Rochet2andGitHub
|
0e4b37913a
|
Merge branch 'master' into trunk
|
2019-03-07 15:34:44 +02:00 |
|
 Rochet2andGitHub
|
dd52a6cf9c
|
Merge pull request #266 from UniversityOfHelsinkiCS/trunk
Update oodikone enabled mail
|
2019-03-07 15:10:02 +02:00 |
|
 Rochet2andGitHub
|
3d0413dab3
|
Merge pull request #10 from UniversityOfHelsinkiCS/trunk
Separate schema instead DB for tests
|
2019-03-07 15:08:25 +02:00 |
|
 Rochet2andGitHub
|
adc4870aea
|
Merge pull request #713 from UniversityOfHelsinkiCS/trunk
Fix white page on refresh
|
2019-03-07 15:08:23 +02:00 |
|
 Rochet2andGitHub
|
3bb0b51219
|
Merge branch 'master' into trunk
|
2019-03-07 15:05:19 +02:00 |
|
 Rochet2andGitHub
|
b605787590
|
Merge branch 'master' into trunk
|
2019-03-07 13:04:49 +02:00 |
|
 Rochet2andGitHub
|
f7884d0a71
|
Merge branch 'master' into trunk
|
2019-03-07 13:03:39 +02:00 |
|
 Rochet2andGitHub
|
db706a34f0
|
Merge pull request #265 from UniversityOfHelsinkiCS/trunk
Trunk
|
2019-03-06 12:29:25 +02:00 |
|
 Rochet2andGitHub
|
1372cc962f
|
Merge branch 'master' into trunk
|
2019-03-06 12:22:46 +02:00 |
|
 Rochet2andGitHub
|
996a0a9270
|
Merge pull request #264 from UniversityOfHelsinkiCS/trunk
Fix enabled check
|
2019-03-06 12:05:07 +02:00 |
|
 Rochet2andGitHub
|
feec2c47d2
|
Merge branch 'master' into trunk
|
2019-03-06 12:00:36 +02:00 |
|
 Rochet2andGitHub
|
ab1edf10cd
|
Merge pull request #9 from UniversityOfHelsinkiCS/trunk
Implement hy-group enabling
|
2019-03-06 11:09:01 +02:00 |
|
 Rochet2andGitHub
|
1b48f385eb
|
Merge pull request #707 from UniversityOfHelsinkiCS/trunk
Implement hy-group enabling
|
2019-03-06 11:08:57 +02:00 |
|
 Rochet2andGitHub
|
a618592b43
|
Merge pull request #263 from UniversityOfHelsinkiCS/trunk
Implement hy-group enabling
|
2019-03-06 11:08:53 +02:00 |
|
 Rochet2andGitHub
|
36106fbaa6
|
Merge branch 'master' into trunk
|
2019-03-05 17:31:25 +02:00 |
|
 Rochet2andGitHub
|
9cbb164a53
|
Merge branch 'master' into trunk
|
2019-03-05 17:30:57 +02:00 |
|
 Rochet2andGitHub
|
24be7a521b
|
Merge branch 'master' into trunk
|
2019-03-05 17:30:01 +02:00 |
|
 Rochet2andGitHub
|
1d5bb4e6e8
|
Merge pull request #706 from UniversityOfHelsinkiCS/trunk
nondegree filtering
|
2019-03-05 14:17:43 +02:00 |
|
 Rochet2andGitHub
|
984aa28295
|
Merge pull request #262 from UniversityOfHelsinkiCS/trunk
implement nondegree filter
|
2019-03-05 14:15:38 +02:00 |
|
 Rochet2andGitHub
|
c0e4642044
|
Merge branch 'master' into trunk
|
2019-03-05 14:08:20 +02:00 |
|
 Rochet2andGitHub
|
a536069b53
|
Merge branch 'master' into trunk
|
2019-03-05 14:07:34 +02:00 |
|
 Rochet2andGitHub
|
778c1e3a90
|
Merge pull request #705 from UniversityOfHelsinkiCS/trunk
Add tests, try fix white page on reload, hide settings..
|
2019-03-05 11:20:23 +02:00 |
|
 Rochet2andGitHub
|
c850f5efd9
|
Merge branch 'master' into trunk
|
2019-03-05 10:55:45 +02:00 |
|
 Rochet2andGitHub
|
099893562a
|
Merge pull request #703 from UniversityOfHelsinkiCS/trunk
Fix course groups redirect
|
2019-03-04 10:52:44 +02:00 |
|
 Rochet2andGitHub
|
bffb242c3b
|
Merge pull request #701 from UniversityOfHelsinkiCS/trunk
Revert logout base path changes
|
2019-02-26 14:56:01 +02:00 |
|
 Rochet2andGitHub
|
ecca4d6acb
|
Merge branch 'master' into trunk
|
2019-02-26 14:40:05 +02:00 |
|
 Rochet2andGitHub
|
caf6005ba1
|
Merge pull request #700 from UniversityOfHelsinkiCS/trunk
Revert staging to prepare for release
|
2019-02-26 14:34:12 +02:00 |
|
 Rochet2andGitHub
|
0bfc00a290
|
Merge pull request #698 from UniversityOfHelsinkiCS/trunk
Trunk
|
2019-02-26 13:40:34 +02:00 |
|
 Rochet2andGitHub
|
606891cd29
|
Merge pull request #696 from UniversityOfHelsinkiCS/trunk
Trunk
|
2019-02-26 10:48:26 +02:00 |
|
 Rochet2andGitHub
|
ffb2e24176
|
Merge branch 'master' into trunk
|
2019-02-26 10:33:20 +02:00 |
|
 Rochet2andGitHub
|
3a8bd8e8cf
|
Merge pull request #695 from UniversityOfHelsinkiCS/trunk
Fix white page on refresh
|
2019-02-25 19:22:42 +02:00 |
|
 Rochet2andGitHub
|
f540d45974
|
Merge pull request #259 from UniversityOfHelsinkiCS/trunk
New blacklist implementation
|
2019-02-25 19:16:26 +02:00 |
|
 Rochet2andGitHub
|
952cd2c409
|
Merge pull request #5 from UniversityOfHelsinkiCS/trunk
New blacklist implementation
|
2019-02-25 19:15:15 +02:00 |
|
 Rochet2andGitHub
|
a40298102d
|
Merge branch 'master' into trunk
|
2019-02-25 18:57:56 +02:00 |
|
 Rochet2andGitHub
|
018068083c
|
Merge branch 'master' into trunk
|
2019-02-25 18:57:51 +02:00 |
|
 Rochet2andGitHub
|
640dfdfb61
|
Merge branch 'master' into trunk
|
2019-02-25 18:56:53 +02:00 |
|
 Rochet2andGitHub
|
17b8089c5e
|
Merge pull request #258 from UniversityOfHelsinkiCS/trunk
Fix associations using wrong enrollment year when server uses UTC
|
2019-02-18 15:00:34 +02:00 |
|
 Rochet2andGitHub
|
d5c7535e3f
|
Merge branch 'master' into trunk
|
2019-02-18 14:56:40 +02:00 |
|
 Rochet2andGitHub
|
70540b8700
|
Merge pull request #257 from UniversityOfHelsinkiCS/trunk
Panik fix for 404
|
2019-02-18 11:22:32 +02:00 |
|
 Rochet2andGitHub
|
d93926a47d
|
Merge branch 'master' into trunk
|
2019-02-18 11:18:34 +02:00 |
|
 Rochet2andGitHub
|
028773f66c
|
Merge pull request #256 from UniversityOfHelsinkiCS/trunk
Change blacklist from token to username, blacklist edited user
|
2019-02-16 16:33:03 +02:00 |
|
 Rochet2andGitHub
|
1858fa6896
|
Merge pull request #4 from UniversityOfHelsinkiCS/trunk
Fully mock user
|
2019-02-16 13:09:58 +02:00 |
|
 Rochet2andGitHub
|
b9c9296b15
|
Merge pull request #684 from UniversityOfHelsinkiCS/trunk
Enable pop stats dropdown even if has single option
|
2019-02-16 13:06:19 +02:00 |
|
 Rochet2andGitHub
|
1637120fa5
|
Merge pull request #255 from UniversityOfHelsinkiCS/trunk
Try fix staging, Asuser improvements
|
2019-02-15 15:34:27 +02:00 |
|
 Rochet2andGitHub
|
e1e9290a1c
|
Merge branch 'master' into trunk
|
2019-02-15 15:27:58 +02:00 |
|
 Rochet2andGitHub
|
dae3b78694
|
Merge pull request #682 from UniversityOfHelsinkiCS/trunk
Improve asuser
|
2019-02-15 15:27:24 +02:00 |
|
 Rochet2andGitHub
|
0a090ab386
|
Merge pull request #254 from UniversityOfHelsinkiCS/trunk
Improve role authentication
|
2019-02-15 11:35:58 +02:00 |
|
 Rochet2andGitHub
|
2523aa193f
|
Merge pull request #678 from UniversityOfHelsinkiCS/trunk
Fix users page crashing when user has no rights
|
2019-02-15 11:35:56 +02:00 |
|