5704 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jochen Saalfeld	8b9cbda178	Merge pull request #3978 from ostcar/websocket_url ... Set websocket url to /ws/	2018-11-09 10:02:32 +01:00
Oskar Hahn	8ee9fb1742	Set websocket url to /ws ... The routing is desided by protocol	2018-11-09 09:15:59 +01:00
Sean	acce79a1c6	Merge pull request #3989 from emanuelschuetze/i18n ... Updated German translations and translatable strings	2018-11-08 20:47:59 +01:00
Emanuel Schütze	128f17e7a4	Updated German translations and translatable strings	2018-11-08 18:50:06 +01:00
Jochen Saalfeld	11a5335777	Merge pull request #3970 from FinnStutzenstein/refineCategories ... refine category editing and motion numbering. Fixes the current behav…	2018-11-08 16:12:13 +01:00
FinnStutzenstein	8f939fa933	refine category editing and motion numbering. Fixes the current behavior of double-saving to take effect.	2018-11-08 16:01:08 +01:00
Jochen Saalfeld	a2d736bae9	Merge pull request #3996 from FinnStutzenstein/client_perms_for_motion ... can_manage_metadata and categories on motion create	2018-11-08 15:56:28 +01:00
FinnStutzenstein	b25b5dc928	can_manage_metadata and categories on motion create	2018-11-08 15:51:26 +01:00
Jochen Saalfeld	23b0965ff2	Merge pull request #3961 from tsiegleauq/create_angeda_items ... Create agenda topics	2018-11-08 15:05:40 +01:00
Sean	55d279ca4e	Create agenda topics ... Also: Enhanced DragNDrop Component List Of Speakers	2018-11-08 14:54:13 +01:00
Finn Stutzenstein	080b6f52ad	Merge pull request #3968 from FinnStutzenstein/ErrorHandling ... error handling	2018-11-08 11:37:48 +01:00
Finn Stutzenstein	9692c2b92e	Merge pull request #3913 from normanjaeckel/NewMotionMetadataPerm ... Added new permission to manage metadata	2018-11-08 10:21:52 +01:00
FinnStutzenstein	788beaae2a	error handling	2018-11-08 09:32:39 +01:00
Finn Stutzenstein	cf533d1174	Merge pull request #3914 from normanjaeckel/PasswordResetEMail ... Added PasswordResetView.	2018-11-08 08:53:59 +01:00
Finn Stutzenstein	85b91e7101	Merge pull request #3948 from FinnStutzenstein/changeIdClient ... ChangeId for the client	2018-11-08 08:38:42 +01:00
FinnStutzenstein	445aeb0cb4	change id client	2018-11-08 08:04:41 +01:00
Sean	321bdeaa46	Merge pull request #3994 from tsiegleauq/corner-button ... Enhanced head bar no 3	2018-11-07 16:32:37 +01:00
Sean Engelhardt	41f2adbc33	Enhanced head bar no 3	2018-11-07 16:21:29 +01:00
Jochen Saalfeld	22d436b6b6	Merge pull request #3988 from jsaalfeld/fix_postgres_migration ... fixing #3987 - postgreSQL migration possible again	2018-11-07 08:34:11 +01:00
Jochen Saalfeld	87dbf90922	fixing #3987 - postgreSQL migration possible again	2018-11-06 12:47:47 +01:00
Emanuel Schütze	3fde4dc81f	Merge pull request #3986 from tsiegleauq/set_motion_states ... Add motion states	2018-11-05 20:48:45 +01:00
Sean Engelhardt	5d06b8c417	Add motion states	2018-11-05 17:58:30 +01:00
Sean	7bfb097f12	Merge pull request #3967 from FinnStutzenstein/collectionStringModelMapperServiceCleanup ... Remove the deprecation warning in the CollectionStringModelMapperService	2018-11-05 11:40:27 +01:00
Norman Jäckel	e8a141387b	Merge pull request #3976 from ostcar/update_requirements.txt ... Update requirements	2018-11-04 20:10:46 +01:00
Oskar Hahn	f56da44606	Merge pull request #3974 from ostcar/remove_collection_element ... Remove CollectionElement	2018-11-04 13:55:11 +01:00
Oskar Hahn	57758bed15	Update requirements ... * Use a flake8 release again	2018-11-04 13:35:54 +01:00
Oskar Hahn	eead4efe6a	Remove CollectionElement ... * Use user_id: int instead of Optional[CollectionElment] in utils * Rewrote autoupdate system without CollectionElement	2018-11-04 01:06:01 +01:00
Oskar Hahn	93dfd9ef67	Merge pull request #3973 from ostcar/test_with_redis ... add possebility to run tests with redis	2018-11-03 20:54:55 +01:00
Oskar Hahn	f4f3ab9c49	Merge pull request #3972 from ostcar/websocket_use_restricted_data ... Fix error, that user get full_data when restricted_data_cache was enabled	2018-11-03 20:53:52 +01:00
Oskar Hahn	edbde302df	Merge pull request #3966 from ostcar/remove_collection_class ... Remove utils.collections.Collection class and other cleanups	2018-11-03 20:53:34 +01:00
Oskar Hahn	cd34d30866	Remove utils.collections.Collection class and other cleanups ... * Activate restricted_data_cache on inmemory cache * Use ElementCache in rest-api get requests * Get requests on the restapi return 404 when the user has no permission * Added async function for has_perm and in_some_groups * changed Cachable.get_restricted_data to be an ansync function * rewrote required_user_system * changed default implementation of access_permission.check_permission to check a given permission or check if anonymous is enabled	2018-11-03 20:48:19 +01:00
FinnStutzenstein	621b0471f2	Client: password reset view and reset password confirm view	2018-11-03 20:43:49 +01:00
Norman Jäckel	e03d715602	Added PasswordResetView.	2018-11-03 20:43:49 +01:00
Emanuel Schütze	2abf8e27ca	Added missing migration file. Added permission to admin and staff group.	2018-11-03 20:17:41 +01:00
Norman Jäckel	af26dedfaf	Added new permission to manage metadata.	2018-11-03 20:17:41 +01:00
Oskar Hahn	d11c7bbad7	add possebility to run tests with redis	2018-11-03 16:59:21 +01:00
Oskar Hahn	6480f1cee9	Fix error, that user got full_data when restricted_data_cache was enabled	2018-11-03 14:37:47 +01:00
Emanuel Schütze	f48410024e	Merge pull request #3931 from MaximilianKrambach/os3/export ... CSV export (example implementation in user list)	2018-11-02 20:09:34 +01:00
Sean	a098e5c5c9	Merge pull request #3929 from FinnStutzenstein/motionComment ... motion comments in the motion detail view	2018-11-02 18:46:16 +01:00
Maximilian Krambach	86b6296205	saving as CSV implemented (user list)	2018-11-02 17:57:44 +01:00
Sean	8aca83a6bf	Merge pull request #3964 from jsaalfeld/fix_urlPrefix ... fixing urlPrefix in prod environment	2018-11-02 10:14:21 +01:00
Jochen Saalfeld	8b191e9e0a	fixing urlPrefix in prod environment	2018-11-02 08:49:02 +01:00
FinnStutzenstein	b749231213	Remove the deprecation warning in the CollectionStringModelMapperService	2018-11-02 08:36:03 +01:00
Finn Stutzenstein	5b3e63ac82	Merge pull request #3960 from jsaalfeld/update_dockerfile ... updating Dockerfile for Version 3	2018-11-02 08:16:30 +01:00
Finn Stutzenstein	0b1d11f03f	Merge pull request #3965 from ostcar/fix_change_id_on_connection ... Fix error on to big change id on websocket connection	2018-11-02 07:48:24 +01:00
Oskar Hahn	b97e643b33	Fix error on to big change id on websocket connection	2018-11-02 05:12:20 +01:00
FinnStutzenstein	430dbc1dff	motion comments and personal note in the motion detail view	2018-11-01 13:09:09 +01:00
Sean	4f7d860280	Merge pull request #3950 from FinnStutzenstein/refineHttpService ... Refine the HTTP Service.	2018-11-01 11:30:20 +01:00
FinnStutzenstein	060e68844d	Refine the HTTP Service.	2018-11-01 11:22:41 +01:00
Finn Stutzenstein	72e3df8b65	Merge pull request #3928 from normanjaeckel/StripResponse ... Strip out response.data.	2018-11-01 07:59:59 +01:00