SJost
|
1c052087fd
|
Merge branch 'master' into feat/exercises
|
2018-03-07 15:47:54 +01:00 |
|
SJost
|
43cb2cfa73
|
Term template angepasst
|
2018-03-07 15:28:18 +01:00 |
|
SJost
|
f36d048dac
|
Merge branch 'master' into feat/exercises
|
2018-03-07 14:17:02 +01:00 |
|
SJost
|
a29cefe7d2
|
MV: generic_form.hamlet -> formPage.hamlet
|
2018-03-07 14:16:08 +01:00 |
|
SJost
|
70a95b3e0b
|
Beispiel Internationalisierung in Handler.Term
|
2018-03-07 13:59:50 +01:00 |
|
Felix Hamann
|
56d949d57f
|
Merge branch 'master' into initial_thoughts_on_frontend
|
2018-03-07 13:47:34 +01:00 |
|
SJost
|
dead99d194
|
Merge remote-tracking branch 'origin/master' into feat/exercises
|
2018-03-07 13:44:46 +01:00 |
|
Gregor Kleen
|
df76f62ad5
|
Merge branch 'feat/i18n'
|
2018-03-07 13:44:21 +01:00 |
|
Felix Hamann
|
3f11dab6ab
|
Merge branch 'master' into initial_thoughts_on_frontend
|
2018-03-07 13:35:58 +01:00 |
|
SJost
|
4c65d379af
|
Merge branch 'master' into feat/exercises
|
2018-03-07 13:31:08 +01:00 |
|
Gregor Kleen
|
2fb478e8ff
|
Merge branch 'feat/custom-renderers'
|
2018-03-07 13:30:06 +01:00 |
|
SJost
|
27507906d1
|
Minor comments
|
2018-03-07 13:01:23 +01:00 |
|
Felix Hamann
|
cd8b6d985b
|
introduced BEM for CSS and aside-navigation
|
2018-03-06 22:29:17 +01:00 |
|
Felix Hamann
|
b9b5496ca7
|
added reactive input labels and general form styling
|
2018-03-05 00:40:10 +01:00 |
|
Felix Hamann
|
0a7328f969
|
added sortable tables
|
2018-03-04 22:48:54 +01:00 |
|
Felix Hamann
|
7b3915fa95
|
moved sticky navbar to StaticR and added show-hide-elements (only HomeR)
|
2018-03-04 22:19:25 +01:00 |
|
Felix Hamann
|
50cebd92bf
|
Merge branch 'master' into initial_thoughts_on_frontend
|
2018-03-02 18:33:22 +01:00 |
|
Gregor Kleen
|
fe73d6cc22
|
Start work on customizable form renderer
|
2018-03-01 12:54:22 +01:00 |
|
Felix Hamann
|
349938b0e7
|
added navbar widget and did some cleanup to eventually get rid of bootstrap
|
2018-02-22 22:44:54 +01:00 |
|
Gregor Kleen
|
a548652b52
|
Bump yesod-colonnade
|
2018-02-21 13:33:28 +01:00 |
|
Gregor Kleen
|
2fa247826f
|
Add support for internationalization
|
2018-02-21 13:19:27 +01:00 |
|
Gregor Kleen
|
937db06db2
|
Remove backup
|
2018-02-20 15:54:25 +01:00 |
|
SJost
|
c8c968a7e4
|
minor merge conflict resolved
|
2018-02-19 18:10:41 +01:00 |
|
SJost
|
a3f71a474b
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/exercises
|
2018-02-19 18:06:54 +01:00 |
|
SJost
|
8d221600d3
|
TermIdentifier -> TermId in routes
|
2018-02-19 17:58:55 +01:00 |
|
Felix Hamann
|
7cb64b765a
|
introduced menu-widget
|
2018-02-19 17:28:28 +01:00 |
|
SJost
|
499315432a
|
SheetFile Up/Download added
|
2018-02-19 16:57:12 +01:00 |
|
SJost
|
6070c9231b
|
sheet display extended, not yet complete
|
2018-02-19 16:57:12 +01:00 |
|
SJost
|
3575e69123
|
Bug with SheetInfo Form fixed
|
2018-02-19 16:57:12 +01:00 |
|
SJost
|
06a29205cd
|
Fileinfo in AForm type troubles :(
|
2018-02-19 16:57:12 +01:00 |
|
SJost
|
bc094dc813
|
Sheets still incomplete, show sheet list and working. sheetAdmin template is not yet working
|
2018-02-19 16:57:12 +01:00 |
|
SJost
|
2f47f12832
|
User Overview page added, no user-editing yet
|
2018-02-19 16:55:20 +01:00 |
|
SJost
|
9bad1b42ec
|
Forgotten minor bugfixes that belong to master, but slipped into this branch.
|
2018-02-19 16:55:20 +01:00 |
|
SJost
|
272bc7f6c5
|
schoolField & termField in Utils
|
2018-02-19 16:54:10 +01:00 |
|
Gregor Kleen
|
a94a8e3f81
|
Support for partial templates
|
2018-02-19 16:08:50 +01:00 |
|
Gregor Kleen
|
fddd8bef4c
|
Make CryptoIDKey implicit using new cryptoids-class
|
2018-02-09 14:22:01 +01:00 |
|
Gregor Kleen
|
b6dbd27eb0
|
Cleanup
|
2018-02-09 12:35:10 +01:00 |
|
Gregor Kleen
|
d37ee331f6
|
Use correct status header
|
2018-02-09 12:35:10 +01:00 |
|
Gregor Kleen
|
7c5c12dc6b
|
Fix type error
|
2018-02-09 12:35:10 +01:00 |
|
Gregor Kleen
|
6bf0f321cf
|
Check decryption before redirecting (as was intended)
|
2018-02-09 12:35:10 +01:00 |
|
Gregor Kleen
|
db92528884
|
Framework & dispatch submissions
|
2018-02-09 12:35:10 +01:00 |
|
Gregor Kleen
|
cc7ec519bc
|
Revert: fix development default values
|
2017-12-08 14:20:09 +01:00 |
|
Gregor Kleen
|
9fca36b07f
|
Cleanup build & fix development default values
|
2017-12-08 14:05:05 +01:00 |
|
SJost
|
14ccdb1e35
|
Bugfix: Infinite Loop in Authorization Code; Stubs for Exercise Sheet; Fixed several compiler warnings
|
2017-11-29 17:26:32 +01:00 |
|
SJost
|
b363c05c95
|
AdminSchool no longer nullable; Profile page displays granted rights
|
2017-11-29 15:17:31 +01:00 |
|
SJost
|
4686c63fd9
|
BUGFIX, Attempt 2: Authorization for Admins without schools fixed.
|
2017-11-27 16:54:12 +01:00 |
|
SJost
|
5886b99bfc
|
BUGFIX: Authorization for Admins without schools fixed. cd /home/jost/programming/Haskell/Yesod/uniworx/src
|
2017-11-27 16:17:51 +01:00 |
|
SJost
|
05dcad6fa6
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-11-27 15:59:40 +01:00 |
|
SJost
|
e3906672aa
|
BUGFIXES: 1) Message status codes 2) Course editing could have cause uniqueness constraint violation, resulting in db exception.
|
2017-11-27 15:59:28 +01:00 |
|
Gregor Kleen
|
c004a65b32
|
Authorization checks
|
2017-11-27 14:52:54 +01:00 |
|
SJost
|
70ad55f565
|
Course participant count working now, albeit inefficient through runDB per Collonade-Row
|
2017-11-27 13:21:11 +01:00 |
|
Gregor Kleen
|
c09b0d8619
|
Cleanup
|
2017-11-27 12:37:56 +01:00 |
|
Gregor Kleen
|
aa1e10e3e9
|
Remove redundant import
|
2017-11-27 09:24:28 +01:00 |
|
Gregor Kleen
|
e6f6e8c621
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-11-26 22:00:38 +01:00 |
|
Gregor Kleen
|
0293363e13
|
Copy more information from LDAP on login
|
2017-11-26 21:59:47 +01:00 |
|
SJost
|
10608b6256
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-11-24 15:20:31 +01:00 |
|
SJost
|
39b3cd0bec
|
defaultHandler gained argument for page navigation
|
2017-11-24 15:20:26 +01:00 |
|
Gregor Kleen
|
57cac79d69
|
Synchronise matrikelnummer from LDAP
|
2017-11-22 18:33:24 +01:00 |
|
Gregor Kleen
|
2c188926a6
|
I haz a login \o/
|
2017-11-22 16:47:50 +01:00 |
|
Gregor Kleen
|
94f419394f
|
Nonfunctional LDAP auth
|
2017-11-22 15:58:49 +01:00 |
|
SJost
|
1b272c6ee8
|
Form-Identifiers introduced
|
2017-11-17 16:59:48 +01:00 |
|
SJost
|
52be9e3198
|
Link-Buttons via CSS
|
2017-11-17 16:17:16 +01:00 |
|
SJost
|
05b912179f
|
Buttons for Links utility added
|
2017-11-17 15:24:38 +01:00 |
|
SJost
|
4121b49c25
|
Minor changes to buttons
|
2017-11-16 13:23:50 +01:00 |
|
SJost
|
4bcbf963f1
|
Button CSS style added.
|
2017-11-15 18:04:32 +01:00 |
|
SJost
|
88e123f405
|
Button form cleaning
|
2017-11-15 16:37:19 +01:00 |
|
SJost
|
6b0f380808
|
Pure button Forms working
|
2017-11-15 16:27:15 +01:00 |
|
Gregor Kleen
|
8bffe66a6d
|
Handle all cases in button accumulation
|
2017-11-15 13:38:06 +01:00 |
|
Gregor Kleen
|
725e00cf68
|
Really fix button accumulation, this time
|
2017-11-15 13:17:33 +01:00 |
|
Gregor Kleen
|
261f064d4e
|
Accumulate button result correctly
|
2017-11-15 13:06:50 +01:00 |
|
SJost
|
faf5c1b2dc
|
Fix for buttons does not work either
|
2017-11-15 12:16:14 +01:00 |
|
SJost
|
c71910f22e
|
Buttons reworked after call; not yet working
|
2017-11-15 11:22:52 +01:00 |
|
SJost
|
25547be0fc
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-11-15 10:38:14 +01:00 |
|
Gregor Kleen
|
1b42873f12
|
Cleanup
Fixes #15
|
2017-11-15 10:10:24 +01:00 |
|
SJost
|
e138e42ae0
|
Button Stubs
|
2017-11-15 09:41:19 +01:00 |
|
Gregor Kleen
|
5070403ce8
|
Switch to newly released 'filepath-crypto'
|
2017-10-25 22:43:19 +02:00 |
|
SJost
|
772a5ee02c
|
Esqueleto for Term Overview
|
2017-10-18 15:57:55 +02:00 |
|
Gregor Kleen
|
0cd0425903
|
Zip UTF8-support
|
2017-10-18 15:30:02 +02:00 |
|
Gregor Kleen
|
377d8667c2
|
Multiple submission upload
|
2017-10-16 15:52:20 +02:00 |
|
Gregor Kleen
|
b0e5f54b4d
|
Download of multiple Submissions & Additional colonnade wrapper
|
2017-10-14 00:20:47 +02:00 |
|
Gregor Kleen
|
1afc2b4bad
|
Clean up structure
|
2017-10-12 19:43:41 +02:00 |
|
Gregor Kleen
|
cb27038c6b
|
Allow upload of single files
|
2017-10-12 16:58:59 +02:00 |
|
Gregor Kleen
|
d01404047f
|
Graceful handling of undone corrections
|
2017-10-12 15:47:18 +02:00 |
|
Gregor Kleen
|
f6e7b3fe25
|
Include rating files again
|
2017-10-12 04:43:50 +02:00 |
|
Gregor Kleen
|
76c9e61167
|
Deletion within Submissions
|
2017-10-12 04:37:29 +02:00 |
|
Gregor Kleen
|
264ea52b58
|
Cleanup
Closes #14
|
2017-10-12 02:21:08 +02:00 |
|
Gregor Kleen
|
37a9836193
|
Submission Upload
|
2017-10-12 02:14:23 +02:00 |
|
Gregor Kleen
|
02c034b14a
|
Support multiple messages and statuses
|
2017-10-12 02:13:42 +02:00 |
|
Gregor Kleen
|
252168e61c
|
Download ratings
|
2017-10-11 22:47:26 +02:00 |
|
Gregor Kleen
|
b552e2a0e3
|
Download of submission files (single & as archive)
|
2017-10-11 18:02:04 +02:00 |
|
SJost
|
68b3e578b4
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-10-11 10:13:12 +02:00 |
|
SJost
|
70ad7474fe
|
PostButton Helpers added to HomeR
|
2017-10-11 10:13:03 +02:00 |
|
Gregor Kleen
|
b514ee3c92
|
Minor cleanup
|
2017-10-11 00:29:31 +02:00 |
|
Gregor Kleen
|
845369a27a
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-10-11 00:18:15 +02:00 |
|
Gregor Kleen
|
f7f7c7c592
|
Dump submissions
|
2017-10-11 00:18:09 +02:00 |
|
SJost
|
a11c542d64
|
Registering for courses works now.
|
2017-10-11 00:11:04 +02:00 |
|
Gregor Kleen
|
11895f6709
|
Bump CryptoID
|
2017-10-11 00:00:20 +02:00 |
|
Gregor Kleen
|
6bb8f1b49e
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-10-10 19:21:02 +02:00 |
|
Gregor Kleen
|
28a65913cf
|
Finish filtering of ratings from a stream of Files
|
2017-10-10 19:20:46 +02:00 |
|
SJost
|
2b78bce646
|
Temporary Homepage and Breadcrumbs working.
|
2017-10-10 18:35:43 +02:00 |
|
SJost
|
e85b130a0d
|
Model changed according to discussion (compiles, but runs only after non-safe SQL migration)
|
2017-10-10 17:41:10 +02:00 |
|
SJost
|
586d411162
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-10-10 14:46:24 +02:00 |
|
SJost
|
1fe7362a30
|
Course display etwas erweitert.
|
2017-10-10 14:46:20 +02:00 |
|
Gregor Kleen
|
9de9032916
|
Bind to cryptoids
|
2017-10-10 14:30:48 +02:00 |
|
Gregor Kleen
|
62c2320aef
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2017-10-10 12:37:30 +02:00 |
|
Gregor Kleen
|
9dfe26b6c9
|
minor cleanup
|
2017-10-10 12:37:24 +02:00 |
|
SJost
|
3fbeed2682
|
Warning: some routes renamed; otherwise minor commit.
|
2017-10-10 07:42:24 +02:00 |
|
SJost
|
77e7e77e74
|
Course editing works now, deletion not due to SQLconstraints (lecturers need deletion).
|
2017-10-10 00:24:25 +02:00 |
|
SJost
|
00c0e1fbfe
|
Course Edit compiles, but deletion/edit does not work yet. I think I need to separate Post/Get Handlers again.
|
2017-10-09 23:54:14 +02:00 |
|
SJost
|
26efab4506
|
Course Edit compiles, but deletion/edit does not work yet. I think I need to separate Post/Get Handlers again.
|
2017-10-09 23:28:21 +02:00 |
|
Gregor Kleen
|
0a40a8bf70
|
extractRatings
|
2017-10-09 23:19:51 +02:00 |
|
Gregor Kleen
|
710fec9b18
|
Test for rating formatting/parsing
|
2017-10-09 22:57:06 +02:00 |
|
Gregor Kleen
|
57ee32cc9c
|
Instances for Rating
|
2017-10-09 22:42:02 +02:00 |
|
Gregor Kleen
|
674a17acbe
|
Formatting & parsing of rating files
|
2017-10-09 22:40:05 +02:00 |
|
SJost
|
b980bab1b1
|
Course Form works; display not yet.
|
2017-10-09 22:17:49 +02:00 |
|
Gregor Kleen
|
59f4c0c74a
|
Unify sheet type with grading schema
|
2017-10-09 19:46:45 +02:00 |
|
Gregor Kleen
|
3cebf133bf
|
Merge branch 'zip-stream'
|
2017-10-09 19:26:58 +02:00 |
|
Gregor Kleen
|
93b2c72a7b
|
Move Zip to Utils
|
2017-10-09 19:00:39 +02:00 |
|
SJost
|
d10a629fa2
|
Term Handler cleaned again; small changes to Model (Maybe added for some Text Types, courseOwner dropped).
|
2017-10-09 16:16:00 +02:00 |
|
Gregor Kleen
|
332be4d9ce
|
Switch Zip to work on 'File's
|
2017-10-09 16:08:02 +02:00 |
|
Gregor Kleen
|
5742d21406
|
Address date confusion
|
2017-10-09 14:07:27 +02:00 |
|
Gregor Kleen
|
2eae90d1f8
|
Fix dummy auth
|
2017-10-09 13:53:04 +02:00 |
|
SJost
|
df1398f756
|
JSON for showTerms
|
2017-10-09 07:47:34 +02:00 |
|
SJost
|
98c945b443
|
Numbering for colonnade tables provided.
|
2017-10-08 21:05:55 +02:00 |
|
SJost
|
930a478ee3
|
TermTable properly realised with Colonnade now. Additional dependencies were required.
|
2017-10-08 19:57:08 +02:00 |
|
SJost
|
99edd912dc
|
Multi-Field Form Validation added.
|
2017-10-08 17:04:43 +02:00 |
|
SJost
|
b472f2ca27
|
Generic form button utility
|
2017-10-08 10:31:15 +02:00 |
|
SJost
|
e6ee9070ea
|
Model change: term aware of lecturing times now
|
2017-10-08 08:51:22 +02:00 |
|
SJost
|
6d1c3bad06
|
MultiButton: Term deletion working
|
2017-10-08 08:42:59 +02:00 |
|
SJost
|
34df734b5e
|
Bootstrap changes, gGeneric Form refined, Basic Term Sanity Checks
|
2017-10-07 19:22:21 +02:00 |
|
SJost
|
1bca71b720
|
Ord TermIdentifier changed
|
2017-10-06 23:43:12 +02:00 |
|
SJost
|
a71c7326a8
|
DateTimeLocale added and used
|
2017-10-06 23:19:54 +02:00 |
|
SJost
|
40fab9a362
|
Term Handler moved to its own module
|
2017-10-06 22:22:30 +02:00 |
|
SJost
|
d9c6380807
|
Term editing required third route :(
|
2017-10-06 18:38:18 +02:00 |
|
SJost
|
a871725d9c
|
Creating and editing terms: basic functionality, still bery ugly
|
2017-10-06 17:14:56 +02:00 |
|
SJost
|
6d3df4f30b
|
Term creation half-ways, problems with Custom Primary key for Terms
|
2017-10-06 16:49:43 +02:00 |
|
SJost
|
fcec208936
|
termField stub created, needs to be moved to common utils
|
2017-10-06 11:22:43 +02:00 |
|
Gregor Kleen
|
88493d34a0
|
Bugfixes
|
2017-10-06 04:09:45 +02:00 |
|
Gregor Kleen
|
6c1afb6919
|
more detailed tests
|
2017-10-05 20:17:37 +02:00 |
|
Gregor Kleen
|
15bd70f10a
|
Test suite for zip handling
|
2017-10-05 19:11:05 +02:00 |
|
Gregor Kleen
|
4191d65fc5
|
More polymorphism.
|
2017-10-05 14:13:51 +02:00 |
|
Gregor Kleen
|
0f0f77344f
|
consumeZip
|
2017-10-05 14:10:32 +02:00 |
|
Gregor Kleen
|
104b3ad397
|
produceZip
|
2017-10-05 13:37:54 +02:00 |
|
Gregor Kleen
|
1d8e10566e
|
Fix build when using nix & minor cleanup
|
2017-10-05 11:30:49 +02:00 |
|
SJost
|
7209b69859
|
new course handler stub
|
2017-10-04 23:20:26 +02:00 |
|
SJost
|
6260addc02
|
Settings restored.
|
2017-10-04 22:55:14 +02:00 |
|
Gregor Kleen
|
1877fb81b4
|
Structured TermIdentifier & tests for it
|
2017-10-04 16:20:29 +02:00 |
|
Gregor Kleen
|
514829dc25
|
Store user plugin in db & allow bypassing when using dummy-auth
|
2017-10-04 15:07:22 +02:00 |
|
Gregor Kleen
|
b86e60843f
|
Minor cleanup
|
2017-10-04 14:38:09 +02:00 |
|
Gregor Kleen
|
76aa7da3ab
|
Fix generation of temporary files´ names
|
2017-10-04 14:33:59 +02:00 |
|
Gregor Kleen
|
ef3be262aa
|
Rename foundation type
|
2017-10-04 14:17:10 +02:00 |
|
Gregor Kleen
|
e2e6ab3798
|
Have yesod load correct config files when developing
|
2017-10-04 14:12:27 +02:00 |
|
Gregor Kleen
|
2d2b1a2ed3
|
Fix file structure for yesod devel
|
2017-10-04 14:12:19 +02:00 |
|
Gregor Kleen
|
b058fd84ba
|
Drop Handler.Comment
|
2017-10-04 13:59:58 +02:00 |
|
Gregor Kleen
|
bb2dbc3b79
|
Move files around
|
2017-10-04 13:59:49 +02:00 |
|
SJost
|
8fc45cfd23
|
Compiles again. Model complete enough for initial run; exam support missing
|
2017-10-03 10:04:23 +02:00 |
|
SJost
|
8a03284e07
|
Does not compile. Initial Model
|
2017-10-02 23:41:02 +02:00 |
|
SJost
|
bb946e1b11
|
Initial PostgreSQL Template
|
2017-09-11 09:53:42 +02:00 |
|