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
|
4a6bbfed09
|
more form-styling
|
2018-03-05 02:01:59 +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
|
f17d1875c8
|
Fix fill-db.hs for new model
|
2018-02-21 13:20:01 +01:00 |
|
Gregor Kleen
|
2fa247826f
|
Add support for internationalization
|
2018-02-21 13:19:27 +01:00 |
|
Gregor Kleen
|
31ad9932c1
|
Cleanup build
|
2018-02-21 13:02: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 |
|
Felix Hamann
|
a2739df985
|
sortable tables
|
2018-02-18 23:04:11 +01:00 |
|
Gregor Kleen
|
a10ece2f81
|
Merge branch 'feat/implicit-cryptoids' into 'master'
implicit cryptoids & uuid dispatch
See merge request !9
|
2018-02-09 14:24:31 +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
|
4a2076171f
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2018-01-30 15:10:05 +01:00 |
|
Gregor Kleen
|
3c12f0bb31
|
Fix build on Nix
|
2018-01-30 15:09:44 +01:00 |
|
Gregor Kleen
|
3829bc6220
|
Merge branch 'feat/fill-db-button' into 'master'
fill-db.hs
See merge request !8
|
2018-01-30 15:09:04 +01:00 |
|
Gregor Kleen
|
324c78c7fb
|
Add sheet
|
2018-01-30 14:51:50 +01:00 |
|
Felix Hamann
|
8c792c9243
|
media-queries and sticky refinements
|
2018-01-25 17:55:41 +01:00 |
|
Gregor Kleen
|
7d9dc39da4
|
Start work on fill-db.hs
|
2018-01-25 10:30:06 +01:00 |
|
Felix Hamann
|
e6fadd1986
|
more uniworxy design
|
2018-01-25 01:56:55 +01:00 |
|
Felix Hamann
|
4dfa03e990
|
file cleanup
|
2018-01-24 23:09:53 +01:00 |
|
Felix Hamann
|
0859b28c07
|
sanity in frontend-land
|
2018-01-24 22:11:31 +01:00 |
|