Commit Graph

6184 Commits

Author SHA1 Message Date
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
Oskar Hahn f4cf9f30a1
Merge pull request #3959 from normanjaeckel/AutoupdateSplitUp
Split up autoupdate functions (sync and async).
2018-10-30 17:18:45 +01:00
Jochen Saalfeld e146bc9f71
updating Dockerfile for Version 3 2018-10-30 15:59:02 +01:00
Norman Jäckel 30c0773838 Split up autoupdate functions (sync and async). 2018-10-30 13:07:24 +01:00
Sean eeb29d140b
Merge pull request #3940 from CatoTH/OpenSlides-3-ChangeRecommendations-internal
Internal change recommendations
2018-10-30 10:02:04 +01:00
FinnStutzenstein e59497bc54
Setting change recommendations internal 2018-10-29 20:33:40 +01:00
Sean 3d65a244cc
Merge pull request #3952 from CatoTH/OpenSlides-3-Diff-Bugfixes
Diff bugfixes: port of #3946 & #3943 - fixes #3944
2018-10-29 18:06:52 +01:00
Oskar Hahn 4fb51d8e49
Merge pull request #3941 from ostcar/remove_projektor_code
Remove old projector code
2018-10-29 13:48:50 +01:00
Oskar Hahn b034839ac8 Remove old projector code 2018-10-29 13:10:15 +01:00
Oskar Hahn f0d60a6a96
Merge pull request #3955 from ostcar/websocket_protocol2
Move websocket protocoll in apps
2018-10-29 13:05:40 +01:00
Oskar Hahn 0229bb923d Move websocket protocoll in apps 2018-10-29 12:33:15 +01:00
Oskar Hahn 6ed5650262
Merge pull request #3956 from ostcar/use_typing_protocol
Use Protocol instead of ABC in cache_provicer
2018-10-29 12:33:01 +01:00
Norman Jäckel 6441347d10 Strip out response.data. 2018-10-29 08:52:52 +01:00
Oskar Hahn c405b4b323 Use Protocol instead of ABC in cache_provicer 2018-10-28 10:37:16 +01:00
Oskar Hahn 69e25a57e1
Merge pull request #3953 from ostcar/change_id_fixes
Add test for second getElement request
2018-10-27 15:06:11 +02:00
Oskar Hahn b9e24016c1 Add test for second getElement request 2018-10-27 14:56:22 +02:00
Tobias Hößl d5bd8761ee
Diff bugfixes: port of #3946 & #3943 - fixes #3944 2018-10-27 11:59:42 +02:00
Finn Stutzenstein 95fab6b991
Merge pull request #3947 from FinnStutzenstein/changeIdQuickfix
Client quickfix for autoupdates
2018-10-26 08:24:02 +02:00
FinnStutzenstein 654404f8f4 Client quickfix for autoupdates 2018-10-26 08:19:07 +02:00
Oskar Hahn bd8ea6fb5b
Merge pull request #3938 from ostcar/public_change_id_api
Public change id api
2018-10-26 06:37:12 +02:00
Oskar Hahn e7d14a8081 Change_id API
* Improve AutoUpdateFormat
* Receive autoupdate requested via websocket
* Support change_id in query string
* Disable autoupdate at default
* Add websocket protocoll to turn on or off autoupdate
2018-10-26 06:30:01 +02:00