Commit Graph

123 Commits

Author SHA1 Message Date
Felix Hamann
07e5ca8b79 Merge branch 'master' into feat/datepicker 2018-06-09 19:20:47 +02:00
Felix Hamann
694ce90551 added themes and experimental theme-switcher 2018-06-09 11:59:15 +02:00
SJost
ae64b10d5c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-07 17:04:33 +02:00
SJost
b558d8d314 Access tags isWrite isRead added 2018-06-07 17:04:17 +02:00
Felix Hamann
38b879eab8 Merge branch 'ui_optis_0606' 2018-06-07 11:48:30 +02:00
Felix Hamann
8c4b2d62d3 got rid of comments and added header for termsList 2018-06-07 11:48:14 +02:00
SJost
c5beac0eb1 Minor commenting 2018-06-07 11:46:01 +02:00
Gregor Kleen
18c3840276 Fix build 2018-06-07 11:39:08 +02:00
Gregor Kleen
f4b6d1e3f5 Introduce pageHeading function 2018-06-07 11:39:08 +02:00
Felix Hamann
0d2c5696c5 slight refinments for inputs and 2018-06-07 11:39:08 +02:00
Felix Hamann
2883dedff7 input field styles and less navigation items 2018-06-07 11:39:08 +02:00
Felix Hamann
99643ff089 page title above page actions -wip 2018-06-07 11:39:08 +02:00
SJost
f00d2765c0 SheetMarking prohibited now for students. 2018-06-07 10:45:30 +02:00
SJost
ea6c7b7761 Fix for SheetMarking visible to students 2018-06-07 10:39:43 +02:00
Gregor Kleen
168e8bacb3 Merge branch 'feat/routes' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/routes 2018-06-07 10:29:44 +02:00
Gregor Kleen
44776e1506 refactor SubmissionR 2018-06-07 10:29:27 +02:00
SJost
5e5c980459 minor refactors 2018-06-05 08:34:14 +02:00
SJost
e418ad2c91 Merge branch 'feat/routes' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/routes 2018-05-30 23:46:51 +02:00
Gregor Kleen
aea5ef41d1 (Preliminarily) Finish knownTags 2018-05-29 17:42:02 +02:00
SJost
87ab470072 Minor refactor andAP and adminAP 2018-05-29 10:49:46 +02:00
Gregor Kleen
69ee7b1a81 Work on knownTags 2018-05-29 10:27:35 +02:00
SJost
e3566d9832 asidenav.hamlet restored to previous version, bug in Foundation fixed. 2018-05-28 18:36:56 +02:00
SJost
c45fea6df3 New Rights Managament compiles and seems to work (apart from TODOs); Problem with ASIDENAV 2018-05-28 18:27:30 +02:00
SJost
ad998b53d8 knownTags increased 2018-05-25 13:12:09 +02:00
SJost
59423832e6 evalAccess is complete now 2018-05-25 11:54:27 +02:00
SJost
d5edf5ee7b liftAR refactored to avoid unnecessary DB access 2018-05-25 10:11:06 +02:00
SJost
f4964dcb55 after Discussion today 2018-05-23 20:01:52 +02:00
SJost
f14bea4015 AccessScaffold 2018-05-23 15:43:12 +02:00
SJost
03f9bc4f89 Merge branch 'master' into feat/exercises 2018-05-17 09:32:04 +02:00
Felix Hamann
8634ad6ada readded removed JavaScript libraries 2018-05-08 22:59:46 +02:00
SJost
38e438b774 correctorForm just a stub 2018-05-04 12:55:23 +02:00
SJost
fcc2f68cea Merged new pageActions from master 2018-05-04 10:01:05 +02:00
SJost
afc022eee7 Merge branch 'master' into feat/exercises 2018-05-04 09:52:17 +02:00
Gregor Kleen
6644af809e Migrate everything to new system of pageActions 2018-04-29 13:49:31 +02:00
Gregor Kleen
ad6f1ab199 Introduce pageActions and use in favourites 2018-04-29 13:48:40 +02:00
SJost
e98cf70400 MODEL REFACTOR: dropped ID suffixes throughout 2018-04-26 11:29:42 +02:00
SJost
56476ccb3e Uniwory und PageAction ExerciseSheet 2018-04-26 09:41:57 +02:00
Gregor Kleen
917d767d30 Cleanup SubmissionDownloadArchive 2018-04-19 13:31:47 +02:00
SJost
8725f935d0 Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-19 09:29:41 +02:00
Felix Hamann
e27a88c237 Merge branch 'feat/pagination' into 'master'
Feat/pagination

See merge request !23
2018-04-14 22:36:44 +02:00
Gregor Kleen
c78184a946 Automatically check isAuthorized for MenuItems 2018-04-13 15:49:26 +02:00
Felix Hamann
a0d5589777 added static flatpickr js and css 2018-04-13 14:37:23 +02:00
Felix Hamann
2a1c805d85 Merge branch 'master' into feat/pagination
merged master into this to avoid databas conflicts when switching between master and feat/pagination
2018-04-12 21:38:25 +02:00
SJost
a544c61be2 Submission upload (Sitzung mit Gregor) 2018-04-10 12:50:20 +02:00
SJost
4a7d35144a Merge remote-tracking branch 'origin/feat/pagination' into feat/exercises 2018-04-10 10:40:10 +02:00
SJost
380c57c578 Favourites working now (without PageActions). 2018-04-10 10:38:21 +02:00
Felix Hamann
4896330737 removed pure-JS sorting for sortable tables 2018-04-09 22:23:12 +02:00
Felix Hamann
dc45702f32 added JS and CSS for sortable tables 2018-04-09 22:22:38 +02:00
SJost
272c61b512 Favourites are pruned now 2018-04-04 09:17:26 +02:00
SJost
2dde6c67bc Favourites are tracked, but not yet used 2018-04-04 08:45:14 +02:00