100 Commits
Author SHA1 Message Date
Warro 8b757ac9b2 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-05-13 14:44:52 +03:00
Warro 8ca7f7a5df added sis option to cli 2020-05-13 14:44:41 +03:00
Warro 26ca0c84fb Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-05-13 12:57:33 +03:00
Warro 873215e813 updated README 2020-05-13 12:57:26 +03:00
OlliandGitHub b6d23df941 Merge pull request #2109 from UniversityOfHelsinkiCS/trunk
updated text and removed modifying of decoded token
2020-05-12 13:05:52 +03:00
Warro 3d858b1970 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-05-12 12:39:50 +03:00
Warro 2dcc0c5292 remove modifying of decoded token directly 2020-05-12 12:39:45 +03:00
OlliandGitHub c0c86deaa7 Merge branch 'master' into trunk 2020-05-12 10:58:59 +03:00
Warro 044574f1e5 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-05-12 10:49:12 +03:00
Warro 49107db326 updated text 2020-05-12 10:49:07 +03:00
OlliandGitHub 7728e65e6a Merge pull request #2108 from UniversityOfHelsinkiCS/trunk
trying to fix circle ci failure when checking pre-existing releases f…
2020-05-11 12:18:24 +03:00
OlliandGitHub 58b34a167f Merge branch 'master' into trunk 2020-05-11 12:03:05 +03:00
Warro bf70c5525c trying to fix circle ci failure when checking pre-existing releases for sentry 2020-05-11 12:02:36 +03:00
OlliandGitHub e4538b1ad2 Merge pull request #2107 from UniversityOfHelsinkiCS/trunk
Population page remember user accordion preferences & fix duplicate sentry releases
2020-05-11 11:42:45 +03:00
Warro 4a7ba16637 fix duplicate sentry releases 2020-05-11 11:21:13 +03:00
Warro 3a20ad4190 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-05-08 14:46:00 +03:00
Warro f6bbe0f47c remember user opened accordions in pop page 2020-05-08 14:45:55 +03:00
Warro 28e1cd43ee Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-05-06 10:48:50 +03:00
Warro 3f086ef647 fulfill Joona's legacy 2020-05-06 10:48:45 +03:00
OlliandGitHub 948a7e27aa Merge branch 'master' into trunk 2020-05-06 10:34:37 +03:00
Warro 5ec1039aa5 cds status show yearly default open for new users 2020-05-06 09:37:16 +03:00
OlliandGitHub d3a75a195d Merge pull request #2077 from UniversityOfHelsinkiCS/trunk
CDS clickable labels that also highlight and remember user settings (for status at least) and moved status to be the initial view
2020-04-30 12:19:09 +03:00
Warro 2e27dc640c Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-30 12:00:05 +03:00
Warro 0a971ad077 moved Status to initial view in CDS 2020-04-30 11:59:47 +03:00
OlliandGitHub 3f15fb2f49 Merge branch 'master' into trunk 2020-04-30 11:00:47 +03:00
Warro 1560cb045e Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-30 10:59:42 +03:00
Warro 635052204e remember user CDS status settings 2020-04-30 10:59:37 +03:00
Warro 9645a6f57c Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-29 15:33:07 +03:00
Warro c7ce4dba95 filter btn to credits table 2020-04-29 15:33:00 +03:00
Warro e35c28ac97 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-29 11:38:00 +03:00
Warro 2e098d5e74 i hate timezones 2020-04-29 11:37:52 +03:00
OlliandGitHub e4e80ff549 Merge pull request #2062 from UniversityOfHelsinkiCS/trunk
SIS mandatory course stuff & preparing for Trends release
2020-04-28 14:29:03 +03:00
OlliandGitHub 7da6f048e1 Merge branch 'master' into trunk 2020-04-28 14:11:18 +03:00
Warro 0fd634477b Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-28 14:09:58 +03:00
Warro 2aef24a73c finishing touches before Trends release 2020-04-28 14:09:53 +03:00
OlliandGitHub 3aee8c4241 Merge pull request #2056 from UniversityOfHelsinkiCS/trunk
Moved infobox to bottom
2020-04-27 13:45:43 +03:00
Warro 2c64984c18 moved infobox to bottom 2020-04-27 13:25:53 +03:00
OlliandGitHub 4a92397fca Merge pull request #2055 from UniversityOfHelsinkiCS/trunk
More infobox content
2020-04-27 10:23:56 +03:00
Warro 6320337213 more infobox content 2020-04-27 09:58:10 +03:00
OlliandGitHub ff2770005e Merge pull request #2054 from UniversityOfHelsinkiCS/trunk
Info box into markdown
2020-04-27 09:18:31 +03:00
OlliandGitHub 0c0767d606 Merge branch 'master' into trunk 2020-04-27 09:00:40 +03:00
Warro 5553414c24 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-27 08:59:54 +03:00
Warro e3ba1bedb4 info box into markdown 2020-04-27 08:59:49 +03:00
OlliandGitHub ecdc160992 Merge pull request #2049 from UniversityOfHelsinkiCS/trunk
Show by year option to CDS status, general betterments & protoG info
2020-04-24 14:29:25 +03:00
OlliandGitHub bfc6ddc7c3 Merge branch 'master' into trunk 2020-04-24 13:48:20 +03:00
Warro 2576429353 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-24 13:46:02 +03:00
Warro 2730b7d88a Show by year option to CDS status 2020-04-24 13:36:50 +03:00
Warro f53da9898a Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-23 13:01:37 +03:00
Warro d424b47a2d CDS status - change date 2020-04-23 13:01:32 +03:00
OlliandGitHub 4402725bae Merge branch 'master' into trunk 2020-04-23 09:44:52 +03:00
Warro f86d64b563 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-23 09:36:34 +03:00
Warro 5cad76290c info box to cds status 2020-04-23 09:36:27 +03:00
Warro bcd0a1206c Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-22 12:13:27 +03:00
Warro e8541d8e6a trends tab 2020-04-22 12:13:23 +03:00
OlliandGitHub b11be6580b Merge pull request #2027 from UniversityOfHelsinkiCS/trunk
Added neater settings to CDS status
2020-04-21 11:54:10 +03:00
Warro 24618875cb Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-21 11:09:24 +03:00
Warro 6bd7b7a37c bettermented CDS status settings styles 2020-04-21 11:09:14 +03:00
OlliandGitHub c9dd86085d Merge branch 'master' into trunk 2020-04-21 10:44:54 +03:00
Warro 6e56cdf426 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-21 10:33:39 +03:00
Warro f931ec313f added neater settings to CDS status 2020-04-21 10:33:34 +03:00
OlliandGitHub 5eeea4ae71 Merge pull request #2020 from UniversityOfHelsinkiCS/trunk
totals to cds status
2020-04-17 11:51:47 +03:00
OlliandGitHub 43a20801f2 Merge branch 'master' into trunk 2020-04-17 11:30:47 +03:00
Warro faaabb7a32 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-17 11:22:39 +03:00
Warro 4a4a2cd560 totals to cds status 2020-04-17 11:22:32 +03:00
Warro d79a98a2bc Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-16 15:20:31 +03:00
Warro 48b86325f9 CDS status betterments 2020-04-16 15:20:27 +03:00
OlliandGitHub 33116c04d4 Merge pull request #2011 from UniversityOfHelsinkiCS/trunk
CDS status fixed long course name overflow
2020-04-16 09:52:11 +03:00
Warro 9eac98fa86 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-16 09:17:01 +03:00
Warro 6a0f7b93b3 CDS status fixed long course name overflow 2020-04-16 09:16:55 +03:00
OlliandGitHub 36f2b27344 Merge pull request #2010 from UniversityOfHelsinkiCS/trunk
CDS: Added courses to status
2020-04-15 15:59:45 +03:00
OlliandGitHub cb37f6b2a2 Merge branch 'master' into trunk 2020-04-15 15:40:52 +03:00
Warro 97e2718e68 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-15 15:40:04 +03:00
Warro 73d8f66e48 Added courses to status 2020-04-15 15:39:58 +03:00
OlliandGitHub f4f1abf76e Merge pull request #2008 from UniversityOfHelsinkiCS/trunk
updater hourly update fixerino
2020-04-15 09:51:01 +03:00
OlliandGitHub bc0ff98fce Merge branch 'master' into trunk 2020-04-15 09:07:04 +03:00
Warro b0404f0e9c Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-15 08:58:02 +03:00
Warro 16e56537ef updater hourly update fixerino 2020-04-15 08:57:26 +03:00
OlliandGitHub eebaebbd98 Merge pull request #1996 from UniversityOfHelsinkiCS/trunk
CDS status - don't show yearly stats by default
2020-04-09 17:07:52 +03:00
OlliandGitHub f4e5fd91d7 Merge branch 'master' into trunk 2020-04-09 16:50:29 +03:00
Warro 0aae8969a0 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-09 16:49:49 +03:00
Warro 567ff0c068 fixed a whoopsie 2020-04-09 16:49:44 +03:00
OlliandGitHub b43b758e2b Merge pull request #1995 from UniversityOfHelsinkiCS/trunk
cds status yearly mode
2020-04-09 16:35:13 +03:00
OlliandGitHub 2867b74137 Merge branch 'master' into trunk 2020-04-09 16:17:53 +03:00
Warro c4664469dd Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-09 16:17:04 +03:00
Warro babdceab9c cds status yearly mode 2020-04-09 16:16:59 +03:00
OlliandGitHub 99477641a4 Merge pull request #1991 from UniversityOfHelsinkiCS/trunk
Cool data science updates
2020-04-09 11:08:46 +03:00
OlliandGitHub d8a7fa27ea Merge branch 'master' into trunk 2020-04-09 10:50:15 +03:00
Warro 42ce54df7f Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-09 10:47:44 +03:00
Warro 538b72c807 memo + neato animation 2020-04-09 10:47:00 +03:00
Warro a9bcd53fab Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-08 16:32:40 +03:00
Warro 1d699c97ec initial cool data science status view 2020-04-08 16:32:35 +03:00
OlliandGitHub e9f7e0120c Merge pull request #1981 from UniversityOfHelsinkiCS/trunk
bugs & filters
2020-04-07 13:53:00 +03:00
OlliandGitHub 3919b9c08d Merge branch 'master' into trunk 2020-04-07 13:31:33 +03:00
Warro 600757f7b8 filter btn 2020-04-07 13:22:09 +03:00
OlliandGitHub 31b4c40532 Merge pull request #1977 from UniversityOfHelsinkiCS/trunk
info box & added sanity check to purge
2020-04-06 13:06:36 +03:00
OlliandGitHub 472b868963 Merge branch 'master' into trunk 2020-04-06 12:48:48 +03:00
Warro 56d384b938 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-06 12:48:10 +03:00
Warro d60f9c4f7e Added sanity check to purge 2020-04-06 12:48:03 +03:00
Warro 3487378434 Merge branch 'trunk' of https://github.com/UniversityOfHelsinkiCS/oodikone into trunk 2020-04-02 17:08:31 +03:00
Warro 9638c1f47d added anon_db to populate-db 2020-04-02 17:08:20 +03:00