ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,911 Commits 6 Branches 42 Tags 64 MiB
11ba7b9841
Commit Graph

4006 Commits

Author SHA1 Message Date
Tobias Hößl
ffc0cd9423
Change default of change recommendation internal value to public 2018-11-15 13:16:43 +01:00
Jochen Saalfeld
41caddd976
Merge pull request #4002 from FinnStutzenstein/aufrufliste 
first work on the call list
 2018-11-09 10:28:03 +01:00
FinnStutzenstein
c78de2138f planar call list and HTML cleanup 2018-11-09 10:11:57 +01:00
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
Emanuel Schütze
128f17e7a4 Updated German translations and translatable strings 2018-11-08 18:50:06 +01:00
FinnStutzenstein
b25b5dc928 can_manage_metadata and categories on motion create 2018-11-08 15:51:26 +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
Finn Stutzenstein
cf533d1174
Merge pull request #3914 from normanjaeckel/PasswordResetEMail 
Added PasswordResetView.
 2018-11-08 08:53:59 +01:00
Jochen Saalfeld
87dbf90922
fixing #3987 - postgreSQL migration possible again 2018-11-06 12:47:47 +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
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
Sean
a098e5c5c9
Merge pull request #3929 from FinnStutzenstein/motionComment 
motion comments in the motion detail view
 2018-11-02 18:46:16 +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
Finn Stutzenstein
72e3df8b65
Merge pull request #3928 from normanjaeckel/StripResponse 
Strip out response.data.
 2018-11-01 07:59:59 +01:00
Norman Jäckel
30c0773838 Split up autoupdate functions (sync and async). 2018-10-30 13:07:24 +01:00
FinnStutzenstein
e59497bc54
Setting change recommendations internal 2018-10-29 20:33:40 +01:00
Oskar Hahn
b034839ac8 Remove old projector code 2018-10-29 13:10:15 +01:00
Oskar Hahn
0229bb923d Move websocket protocoll in apps 2018-10-29 12:33:15 +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
b9e24016c1 Add test for second getElement request 2018-10-27 14:56:22 +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
Oskar Hahn
9eef4da21c remove old client 2018-10-25 16:04:28 +02:00
Maximilian Krambach
126a16b553 Implement tags 2018-10-24 11:23:34 +02:00
Oskar Hahn
5b5d0e395a new autoupdate format 2018-10-19 07:35:59 +02:00
Oskar Hahn
bc442210fb Improve redis cache 
* delete only keys with prefix
* Make redis_provider atomic with transactions and lua scripts
* improve lock
* generate change_id in redis to make sure it is uniq
* use miliseconds as starttime
* add argument use max_change_id to get_{full|resticted}_data
 2018-10-15 23:37:26 +02:00
Oskar Hahn
b1fa3ca263 Merge remote-tracking branch 'upstream/OpenSlides-3' into new-master 2018-10-13 07:38:09 +02:00
FinnStutzenstein
1e4eacecfd New superadmin group 2018-10-12 07:58:18 +02:00
FinnStutzenstein
f7d392f1fc New motion features 
- Added weight and sort_parent fields to the motion model
- Added motion sort view (adapted from agenda)
- Added statute-paragraph model and tests for it
- Added statute_paragraph foreign key to the motion model
- Created migrations for sorting and statute-paragraph
 2018-10-12 07:15:58 +02:00
FinnStutzenstein
b1ea59ea28 Motion comment section list 2018-10-09 13:57:55 +02:00
Emanuel Schütze
d4f9da9cdb
Merge pull request #3889 from FinnStutzenstein/fixImagePlugin 
Fix image plugin
 2018-09-24 13:06:50 +02:00
Oskar Hahn
9af6bf1606 ensures test on startup 2018-09-23 16:57:49 +02:00
FinnStutzenstein
eebd7a1fce Fix image plugin 2018-09-20 13:06:02 +02:00
Emanuel Schütze
dca94333e8 Update version to 2.3.1-dev 2018-09-20 09:27:03 +02:00
Emanuel Schütze
772c032357 Release 2.3 2018-09-20 09:24:34 +02:00
Emanuel Schütze
7b9d84dabd
Merge pull request #3886 from FinnStutzenstein/export-filename 
Fixed filenames in motion export dialog
 2018-09-18 19:37:02 +02:00
FinnStutzenstein
2815d5f62c Fixed filenames in motion export dialog 2018-09-18 15:03:55 +02:00
Emanuel Schütze
7a9921a85f Updated German translations. 2018-09-18 10:42:57 +02:00
FinnStutzenstein
f17951f363 Little fixes for current master (fixes #3883, fixes #3882, fixes #3880) 2018-09-18 09:49:40 +02:00
FinnStutzenstein
180dedfc38 Moved the collection of config variables before the generation of angular constants 2018-09-18 07:50:33 +02:00
FinnStutzenstein
1ee76de417 Handling of titles, projection and content objects in items 
Restructure the titles for motion, motion-block, assignment and topic.
Less possibilities for more clear code. Added mote base models enabling
functionalities of projection and being a content object for items
 2018-09-14 08:36:35 +02:00
FinnStutzenstein
3e0618063b Routing for the privacy policy and legal notice. 
Save those values in a new service, that will also watch for changes in
config variables. UI is not good; this can be done later

Share legal notice and privacy policy

Created some containers for them
 2018-09-10 11:39:46 +02:00
FinnStutzenstein
f1ddd16dc6 Motion rework 
- remove motion version
- migrations for versions and change recommendations
- Redone motion comments. Wording changed from comment fields to comment
  sections
- fixed test order, tests are not atomic
- introduce get_group_model. Just use OpenSlides Groups and not the
django's ones.
 2018-09-10 09:00:55 +02:00
Finn Stutzenstein
befbaba525
Merge pull request #3853 from FinnStutzenstein/workflowId 
Expose the workflow id during motion serialization
 2018-09-07 11:12:07 +02:00
Jochen Saalfeld
b5366ea90f
fixing pytest version and continue if db not available 2018-09-07 10:39:16 +02:00
FinnStutzenstein
9226874010 Expose the workflow id during motion serialization 2018-09-06 13:39:16 +02:00
FinnStutzenstein
ea71d0a942 moved privacy policy to users, adapt client 2018-09-04 08:57:54 +02:00
Oskar Hahn
732de97ec2 Make Consumer real async again 2018-09-04 08:57:50 +02:00
FinnStutzenstein
8adaa6118a Angular constants via WebSocket 
- new format for constants on the server
- adaptions for the old client
 2018-09-04 08:57:11 +02:00
Emanuel Schütze
865940bd12 Update version to 2.3b2-dev 2018-08-30 15:24:42 +02:00
Emanuel Schütze
90370ea628 Release 2.3b1 2018-08-30 15:24:42 +02:00
Emanuel Schütze
48537dbfbf Updated all translations. 2018-08-30 15:08:51 +02:00
Emanuel Schütze
6bae5cf87a Fixed translation strings and permission check. Updated Changelog. 2018-08-30 15:05:08 +02:00
Emanuel Schütze
1dd1a4bac8
Merge pull request #3832 from FinnStutzenstein/hideSortInAgenda 
Hide Sort button in agenda (closes #3812)
 2018-08-27 12:14:26 +02:00
FinnStutzenstein
d1b52a9302 Hide Sort button in agenda (closes #3812) 2018-08-27 11:24:52 +02:00
Emanuel Schütze
702bc67334 Change default for motion export dialog. 2018-08-24 16:14:01 +02:00
Emanuel Schütze
6c2fbf7389 Enable/disable category in motion PDF. 2018-08-24 14:00:53 +02:00
Oskar Hahn
dc7ca5e2c4 fix empty values in rest 2018-08-24 12:14:02 +02:00
Oskar Hahn
401e7821ae Merge remote-tracking branch 'upstream/master' into OpenSlides-3 2018-08-23 21:31:24 +02:00
Norman Jäckel
7dd7bb1b8d
Merge pull request #3807 from ostcar/websocket_protocol 
Add a protocol for websocket
 2018-08-23 21:15:48 +02:00
Norman Jäckel
39e27c740e
Merge pull request #3817 from ostcar/extra_requirements 
Add an easier way to install big_mode
 2018-08-23 21:05:31 +02:00
FinnStutzenstein
22f7d84cae New websocket message format for both clients 2018-08-23 21:02:59 +02:00
Oskar Hahn
fed6d6f435 Add a protocol for websocket 
{'type': STRING, 'content': ANY}
 2018-08-23 21:02:52 +02:00
Oskar Hahn
d21d7dc49e Add an easier way to install big_mode 2018-08-23 20:58:56 +02:00
Oskar Hahn
aac9dcabf5 drop python 3.5 2018-08-23 17:51:30 +02:00
Emanuel Schütze
96637e18c4
Merge pull request #3804 from normanjaeckel/ChangeCollectStatic 
Fixed collectstattic command so that it does not write into openslide…
 2018-08-23 17:38:26 +02:00
Emanuel Schütze
7d24066be7 Updated German translations. 2018-08-23 17:20:40 +02:00
Emanuel Schütze
c49eb8bf64
Merge pull request #3808 from FinnStutzenstein/diverses 
Layout changes for motion detail view and PDF
 2018-08-23 16:49:30 +02:00
FinnStutzenstein
cece35b3a5 Layout changes for motion detail view and PDF 2018-08-23 16:38:12 +02:00
Norman Jäckel
e012589ab0
Merge pull request #3814 from emanuelschuetze/fix3813 
Fixed TypeError in Motion and Assignment Slides (Fixed#3813)
 2018-08-23 15:48:15 +02:00
Emanuel Schütze
8ed043bbe8
Merge pull request #3806 from normanjaeckel/FixAgenda 
Fixed agenda get_restricted_data() if no agenda items exist.
 2018-08-23 15:47:34 +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
Emanuel Schütze
c852f72c20
Merge pull request #3811 from normanjaeckel/ElectionBar 
Fixed assignment election bar for votes mode. Fixed #3598.
 2018-08-23 15:42:50 +02:00
Emanuel Schütze
0036567f7d Fixed TypeError in Motion and Assignment Slides (Fixed#3813) 
in MotionPollDecimalPlaces and AssignmentPollDecimalPlaces
 2018-08-23 15:39:15 +02:00
Finn Stutzenstein
172f1ed890
Merge pull request #3810 from emanuelschuetze/workflow-sorting 
Fix sorting of states in workflow detail view.
 2018-08-23 14:35:04 +02:00
Norman Jäckel
cbd970ba9d Fixed assignment election bar for votes mode. Fixed #3598. 2018-08-23 11:30:46 +02:00
Norman Jäckel
123b7c702b
Merge pull request #3803 from FinnStutzenstein/voting_decimal_places 
Support for decimal places in motion and assignment polls
 2018-08-23 11:28:26 +02:00
Emanuel Schütze
2cd8262025 Fix sorting of states in workflow detail view. 2018-08-23 11:12:53 +02:00
Norman Jäckel
dc4fd6a93e Fixed agenda get_restricted_data() if no agenda items exist. 2018-08-23 09:48:47 +02:00
Emanuel Schütze
768c97e89c
Merge pull request #3785 from FinnStutzenstein/no-changeable-first-state 
Do not allow changing a workflow's first state (closes #3778)
 2018-08-23 09:24:29 +02:00
FinnStutzenstein
9c1290ee0b Do not allow changing a workflow's first state (closes #3778) 2018-08-23 09:09:18 +02:00
FinnStutzenstein
9bac396b67 Support for decimal places in motion and assignment polls 2018-08-23 08:53:59 +02:00
Oskar Hahn
d09086f08c
Merge pull request #3798 from ostcar/url-schema 
New url schema
 2018-08-22 22:14:05 +02:00
Oskar Hahn
e5dd857e87 New url schema 2018-08-22 22:05:06 +02:00
Norman Jäckel
27e0564a23 Changed default agenda type for new topics. 2018-08-22 17:27:21 +02:00
Norman Jäckel
48a2a3fe53 Fixed settings creation for windows. 2018-08-22 16:51:46 +02:00
Norman Jäckel
07ffb3b6c5 Fixed settings creation for windows. 2018-08-22 12:39:59 +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
Emanuel Schütze
6bbaf39bce Updated German translations. 2018-08-17 09:13:09 +02:00
FinnStutzenstein
65ec9cbf73 Layout changes, config for enabling amendments in motions table 
- fixed update form bug, explicit link to parent motion
- br space in pdf and motion-text (restrict to linenumbermode none)
 2018-08-17 08:38:41 +02:00