5 Commits

Author	SHA1	Message	Date
Oskar Hahn	401e7821ae	Merge remote-tracking branch 'upstream/master' into OpenSlides-3	2018-08-23 21:31:24 +02:00
Norman Jäckel	3578d0e850	Fixed collectstattic command so that it does not write into openslides app dir.	2018-08-23 15:47:19 +02:00
Oskar Hahn	10b3bb6497	Update to channels 2 ... * geis does not work with channels2 and never will be (it has to be python now) * pytest * rewrote cache system * use username instead of pk for admin user in tests	2018-08-22 06:30:11 +02:00
FinnStutzenstein	5f45e2d748	Fixed all remarks	2017-10-13 12:02:23 +02:00
FinnStutzenstein	46364a84e1	Generate webclient-realm.js while collecting staticfiles (fixes #3422)	2017-10-04 12:26:30 +02:00