Commit Graph

825 Commits

Author SHA1 Message Date
Felix Hamann
855f618aa1 Merge branch 'feat/safari-fixes' into 'live'
fixes for safari browser

See merge request !55
2018-07-16 23:04:38 +02:00
Felix Hamann
b603c2facf fix for file_upload not getting validated in safari 2018-07-16 22:59:08 +02:00
Felix Hamann
058ad077ee increased browser-compatibility for borders in navbar 2018-07-16 22:58:57 +02:00
Felix Hamann
9c16ea6e95 fixed bold-looking fonts on mac-browsers 2018-07-16 22:58:10 +02:00
Steffen Jost
e4f75542f2 Merge branch 'master' into 'live'
Minor: uni2work in Rating File

See merge request !53
2018-07-10 18:45:48 +02:00
SJost
0a12fc5683 Bekannte bugs hinzugefügt zu versionHistory 2018-07-10 18:41:19 +02:00
SJost
e1c2e7efe0 Rating file: UniWorx -> Uni2work 2018-07-10 18:33:31 +02:00
Gregor Kleen
3560b2ae5e Merge branch 'master' into 'live'
Deploy submission cleanup

See merge request !52
2018-07-10 13:57:13 +02:00
Gregor Kleen
cacf065821 Restrict correctors more 2018-07-10 13:47:36 +02:00
Gregor Kleen
a7fb5a7d9e Only show submission form if authorized 2018-07-10 13:47:26 +02:00
Gregor Kleen
03a785abc2 Fix PathPiece for ZIPArchiveName & submission original archive link 2018-07-10 13:47:02 +02:00
Gregor Kleen
ce547088f2 Merge branch 'master' into 'live'
Deploy time format customization

See merge request !51
2018-07-10 12:45:32 +02:00
Gregor Kleen
86e28f6f52 Add dateTime-Format customization to Profile 2018-07-10 11:57:03 +02:00
Gregor Kleen
9975d33101 Fix utcTimeField 2018-07-10 11:49:14 +02:00
Gregor Kleen
ca20bb5921 Merge branch 'staging' into 'live'
Staging

See merge request !49
2018-07-10 11:22:34 +02:00
Gregor Kleen
770752e8f1 Merge branch 'feat/timezones' into 'staging'
Fix db.hs

See merge request !48
2018-07-10 11:11:40 +02:00
Gregor Kleen
6eb555c0fe Fix db.hs 2018-07-10 11:07:26 +02:00
Gregor Kleen
e28e32a14f Merge branch 'feat/timezones' into 'staging'
Split DateTimeFormat up into three fields

See merge request !47
2018-07-10 10:55:50 +02:00
Gregor Kleen
2882b02214 Split DateTimeFormat up into three fields 2018-07-10 10:51:31 +02:00
Gregor Kleen
0e6a8cc964 Merge branch 'feat/timezones' into 'staging'
Timezones, date formatting & minor cleanup

See merge request !45
2018-07-09 23:12:37 +02:00
Gregor Kleen
239c96d907 Timezones, date formatting & minor cleanup 2018-07-09 23:07:26 +02:00
Gregor Kleen
8588ab2385 Merge branch 'master' into 'live'
UI and other Updates for Live-System

See merge request !44
2018-07-09 09:05:51 +02:00
Felix Hamann
69c2e95d83 Merge branch 'master' into staging 2018-07-08 23:54:34 +02:00
Felix Hamann
0531502b7d dynamic height of asidenav to avoid over-long bodies 2018-07-08 23:53:33 +02:00
Gregor Kleen
4993c7994c Fix preference-order on parents 2018-07-08 22:31:11 +02:00
Gregor Kleen
71e57b767d Use comma-separated in AdminUsersR 2018-07-08 22:10:46 +02:00
Gregor Kleen
4c86306bfd Fix NavBar-Highlighting 2018-07-08 22:10:33 +02:00
Felix Hamann
7ba1c41843 fix for headline-spacings on breadcrumbs-less pages 2018-07-08 21:35:31 +02:00
Felix Hamann
4b4847d551 get rid of now unneeded messageRenderer in defaultLayout 2018-07-08 21:28:40 +02:00
Felix Hamann
9c6a4f86b9 add class for comma-separated list 2018-07-08 21:28:03 +02:00
Felix Hamann
4fe479f9f3 move HOME to the left in navbar 2018-07-08 20:51:39 +02:00
Felix Hamann
cb5d0f4762 fix for invisible text in alerts 2018-07-08 20:30:19 +02:00
Felix Hamann
61404a4c0c asidenav-cleanup and show-hide-classes 2018-07-08 20:29:36 +02:00
Gregor Kleen
506f704363 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-08 20:13:14 +02:00
Gregor Kleen
a02e2cdc98 Prevent admins elevating rights to more schools by session-hijacking 2018-07-08 20:12:07 +02:00
Gregor Kleen
fdbf926a2f Merge branch 'master' into 'live'
Deploy Master

See merge request !42
2018-07-08 19:37:00 +02:00
Felix Hamann
442c0a9a00 show-hide-settings now persistant 2018-07-08 18:37:57 +02:00
Felix Hamann
ad5b7b1892 Merge branch 'master' into 'staging'
Staging Update

See merge request !43
2018-07-08 17:31:56 +02:00
Felix Hamann
22fc5f3aaf remove underline from button-hover-state 2018-07-08 16:37:11 +02:00
Felix Hamann
8296417c1e links underlined now even in table-cells 2018-07-08 16:31:31 +02:00
Gregor Kleen
dc03afa84d Functionality to hijack users 2018-07-08 15:38:52 +02:00
Gregor Kleen
ed4df0ef4d Use dbTable in /users 2018-07-08 15:15:41 +02:00
Gregor Kleen
96eea52344 Introduce DBCell-Constructor and dbColonnade 2018-07-08 14:51:05 +02:00
Gregor Kleen
d0fcf2e9e3 Allow customizing behaviour of dbTable when empty
Resolves #104
2018-07-08 13:52:25 +02:00
Gregor Kleen
7da8d89a5c Course capacity now verified by route tag
Resolves #98
2018-07-08 10:44:09 +02:00
Gregor Kleen
d60ef89bca Revert "Course Capacity is verified now, in CRegister Handler that also checks secret"
This reverts commit 9fc50e8736.
2018-07-08 10:31:41 +02:00
Felix Hamann
c7b02f304b Merge branch 'master' into 'live'
Interactive Asidenav

See merge request !41
2018-07-08 00:05:43 +02:00
Felix Hamann
8f9ddd1137 show-hide cleanup and more interactive asidenav 2018-07-07 23:45:09 +02:00
Felix Hamann
ef4bfad40e refinement of lavender theme colors 2018-07-07 23:01:37 +02:00
Gregor Kleen
aaddb0fdf4 Merge branch 'master' into 'live'
Deploy master

See merge request !40
2018-07-07 22:27:41 +02:00