Commit Graph

1322 Commits

Author SHA1 Message Date
SJost
9fc052d9bb AuthTag Empty implemented. 2018-11-30 15:57:57 +01:00
Gregor Kleen
f7d66a37b5 Merge branch 'patch-1' into 'master'
Patch 1

See merge request !115
2018-11-30 15:18:12 +01:00
Gregor Kleen
eabdb6eb43 Update ChangeLog.md 2018-11-30 15:10:33 +01:00
Gregor Kleen
c5fc4ac816 Merge branch 'master' into 'live'
Fix #239

Closes #239

See merge request !114
2018-11-30 13:37:02 +01:00
Gregor Kleen
8e4afc554b Fix #239 2018-11-30 13:28:20 +01:00
Gregor Kleen
57db03b770 Merge branch 'master' into 'live'
Minor cleanup

See merge request !113
2018-11-29 14:23:22 +01:00
Gregor Kleen
887ef31c44 Don't send table-only 2018-11-29 14:09:37 +01:00
Gregor Kleen
bb4140fa3d avoid weird override by sending db-table-shortcircuit as header 2018-11-29 14:07:47 +01:00
Gregor Kleen
4cccf42727 Merge branch 'master' into 'live'
Master

See merge request !112
2018-11-29 12:57:06 +01:00
Gregor Kleen
f126246a23 Fix build 2018-11-29 12:52:02 +01:00
Gregor Kleen
910d7a90fe Fix multiple js-initialization issues 2018-11-29 12:43:10 +01:00
Gregor Kleen
997403d6be Send pagination data in dbTable-Forms 2018-11-29 12:30:42 +01:00
Gregor Kleen
6c0f031c4e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-29 11:02:58 +01:00
Gregor Kleen
3ad8505489 Generalize encrypted error messages to encoded SecretBoxes 2018-11-29 11:01:49 +01:00
SJost
7ea7b6f0fc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-28 09:27:37 +01:00
Felix Hamann
1085dc1df1 page actions more prominent 2018-11-27 22:05:23 +01:00
Gregor Kleen
431eb45a94 Log to file during tests 2018-11-27 19:11:28 +01:00
Gregor Kleen
77d03348e8 Fix tests 2018-11-27 16:03:48 +01:00
Gregor Kleen
03fa874e05 Account for jitter in determining whether CronLastExec is acceptable 2018-11-27 15:38:07 +01:00
SJost
160ec5a8dc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-27 14:11:37 +01:00
Gregor Kleen
dbb69e1817 Merge branch 'master' into 'live'
Fix check for existingSubUsers; no longer produces false positives

See merge request !111
2018-11-27 10:20:33 +01:00
Gregor Kleen
0c3cf631a5 Fix check for existingSubUsers; no longer produces false positives 2018-11-27 10:12:44 +01:00
Gregor Kleen
5d9fb0967a Merge branch 'master' into 'live'
Adjust authorisation

See merge request !110
2018-11-27 08:51:02 +01:00
Gregor Kleen
8db8f91720 Adjust authorisation
Don't have correctors see SAssignR-links
2018-11-27 08:43:42 +01:00
Gregor Kleen
23e6385f6a Merge branch 'master' into 'live'
Cleanup fuzzy pseudonym handling

See merge request !109
2018-11-26 17:36:32 +01:00
Gregor Kleen
52467723b8 Cleanup fuzzy pseudonym handling 2018-11-26 17:24:19 +01:00
Gregor Kleen
3b12f060de Merge branch 'master' into 'live'
Fix #232

Closes #232

See merge request !108
2018-11-24 21:56:56 +01:00
Gregor Kleen
52e99bae53 Fix #232 2018-11-24 21:50:04 +01:00
Gregor Kleen
6f239e7aa8 Merge branch 'master' into 'live'
minor cleanup

See merge request !107
2018-11-24 15:38:54 +01:00
Gregor Kleen
92da5a3123 minor cleanup 2018-11-24 15:30:18 +01:00
Gregor Kleen
076e8e2f34 Merge branch 'master' into 'live'
Ajax'ed authpreds

See merge request !106
2018-11-22 22:45:16 +01:00
Gregor Kleen
179f003c32 Ajax'ed authpreds 2018-11-22 22:18:39 +01:00
Gregor Kleen
c466a6fa05 Merge branch 'master' into 'live'
Master

Closes #230

See merge request !105
2018-11-22 21:46:45 +01:00
Gregor Kleen
58ed6b87a3 Address hlint 2018-11-22 21:40:03 +01:00
Gregor Kleen
3d62a1e4b9 Fix #230 2018-11-22 21:07:24 +01:00
Gregor Kleen
67f6103f87 Debug javascript setup 2018-11-22 20:56:49 +01:00
Gregor Kleen
213f3a39cc Fully ajaxified modals 2018-11-22 17:25:56 +01:00
Gregor Kleen
a627b7be72 Globally defined get parameters & headers 2018-11-22 14:55:27 +01:00
Gregor Kleen
8d012005d3 Merge branch 'master' into 'live'
General js-setup framework & revert to fetch-based modals

See merge request !104
2018-11-22 12:38:19 +01:00
Gregor Kleen
cffc7f9ad3 General js-setup framework & revert to fetch-based modals 2018-11-22 12:31:11 +01:00
SJost
aa6617e8a9 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-21 10:31:45 +03:00
Gregor Kleen
b64ab904e8 Merge branch 'master' into 'live'
Fix modal resizing

See merge request !103
2018-11-20 19:57:54 +01:00
Gregor Kleen
fe2786c533 Fix modal resizing 2018-11-20 19:43:57 +01:00
Gregor Kleen
7544d2fc34 Merge branch 'master' into 'live'
Revert setting modal non-scrolling

See merge request !102
2018-11-20 19:35:05 +01:00
Gregor Kleen
bb672c7085 Revert setting modal non-scrolling 2018-11-20 19:28:28 +01:00
Gregor Kleen
afd6cbc8d0 Merge branch 'master' into 'live'
Minor design touch-ups

See merge request !101
2018-11-20 19:04:08 +01:00
Gregor Kleen
f58327eeb1 Slightly touched up tooltips 2018-11-20 18:45:48 +01:00
Gregor Kleen
deeba675fa Slightly touched up modals 2018-11-20 18:28:07 +01:00
SJost
5a4ef4e13c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-20 15:49:10 +03:00
SJost
b0732ae6c6 Mino 2018-11-20 15:48:29 +03:00