ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,559 Commits 6 Branches 42 Tags 64 MiB
24359450c7
Commit Graph

1033 Commits

Author SHA1 Message Date
Oskar Hahn
206eb9bcba decode only the needed data when calculating the required users 2019-03-29 22:38:12 +01:00
Norman Jäckel
35198f6e64 Fixed commands. 2019-03-20 08:50:57 +01:00
Norman Jäckel
baacda2b8e Hotfix for #4501: Skipped many to many related objects autoupdate signal during migrations. 2019-03-13 10:58:01 +01:00
Oskar Hahn
8409378e00 Fix a race condition when creating config.key_to_id 2019-03-09 18:55:58 +01:00
FinnStutzenstein
5fff7d24ec projector scroll and contdown offset 2019-03-08 13:17:43 +01:00
FinnStutzenstein
ecdfdf4b87 Resort python import for isort 4.3.11 (fixes #4467) 
One dot imports are again behind two dot imports since this new isort
release.
 2019-03-06 14:54:03 +01:00
Norman Jäckel
01a61ab292 Fixed autoupdate for m2m relation. Fixed #4055. 2019-03-06 08:58:52 +01:00
Oskar Hahn
dd4754d045 Disable the future-lock when updating the restircted data cache 
Before this commit, there where two different locks when updating the restricted
data cache. A future lock, what is faster but only works in the same thread. The
other lock is in redis, it is not so fast, but also works in many threads.

The future lock was buggy, because on a second call of update_restricted_data
the same future was reused. So on the second run, the future was already done.

I don't see any way to delete. The last client would have to delete it, but there
is no way to find out which client the last one is.
 2019-03-04 21:37:00 +01:00
FinnStutzenstein
d0e6681aad One global clos reference. More projector buttons for the clos view 2019-03-01 13:17:26 +01:00
FinnStutzenstein
ab0955d890 Fixed countdown model 2019-03-01 12:10:49 +01:00
Maximilian Krambach
44d16eb244 countdown: new title field, description optional 2019-03-01 11:22:09 +01:00
FinnStutzenstein
f039293c09 current speaker chyron 2019-02-26 21:56:59 +01:00
FinnStutzenstein
63f1802d7a (Current) list of speaker slide 2019-02-22 10:40:28 +01:00
Norman Jäckel
d06a4a5c6d Added new permission to see the history. 2019-02-21 11:45:40 +01:00
FinnStutzenstein
2801e28704 Countdown slide and controls 2019-02-15 12:21:23 +01:00
Maximilian Krambach
ee88dff41f Fixing csv export/import, add new config option for csv export encoding (utf-8 || iso-8895-15) 2019-02-08 12:37:02 +01:00
Emanuel Schütze
722a40779d Fixed login problem for non admin users. 2019-02-05 21:03:13 +01:00
FinnStutzenstein
582d4d7c4a Projector reference for CLOS 2019-02-01 09:47:59 +01:00
GabrielMeyer
30535dd21f OpenSlides theming (Fixes #4205) 
using 3 built-in themes (default, dark, green)
 2019-01-31 12:04:35 +01:00
Emanuel Schütze
42f8b74d8e Projector templates 
- Projector base template
- Projection button
- projection dialog
- motion slide (template and motions/projector.py)
- user slide (template and users/projector.py)
- motion and user list view with projector column permission check.
 2019-01-29 16:12:19 +01:00
FinnStutzenstein
965d23be50 more work on projector, countdowns, clos 
- splitted clos-slide and clos-overlay.
- Synchronize to server, more little changes
 2019-01-29 16:10:21 +01:00
Oskar Hahn
1a709a59a9 Projector V 
* Changed wording: element is one element on the projector. A slide is a functoin to render one element
* Use AllData as first argument all the time
* Render username on server
* Add exceptions for erros on projector
* Fix motion recommendation
* Only show state extension, if it is allowed by the state
* Add motion_change_recommendations to motion full_data
 2019-01-28 23:18:27 +01:00
Norman Jäckel
39244a0ec9 Reenable black. 2019-01-28 20:54:42 +01:00
Emanuel Schütze
cf29f39b9f Added missing projector migration. 2019-01-22 12:59:33 +01:00
Sean Engelhardt
e680ca38da Add PDF custom fonts 2019-01-22 11:59:16 +01:00
Oskar Hahn
209105efc3
Merge pull request #4103 from FinnStutzenstein/client-projector-ui 
Client projector ui (WIP)
 2019-01-20 11:39:49 +01:00
Emanuel Schütze
402fc37b99
Merge pull request #4155 from ostcar/activate_start_command 
activate start command
 2019-01-20 11:36:06 +01:00
Oskar Hahn
6b73c5bf1a activate start command 2019-01-20 11:24:42 +01:00
Emanuel Schütze
c704b90ecb Fix history migration. 2019-01-20 11:05:49 +01:00
Emanuel Schütze
251cc4acc1
Merge pull request #4147 from emanuelschuetze/history-table 
Improved history table.
 2019-01-20 10:35:23 +01:00
Emanuel Schütze
2c5d8ea29e Improved history table. 2019-01-20 09:46:41 +01:00
Emanuel Schütze
23f7dce6a2 Fixes for using pypi package 
- Fix static path for manifest and login logo.
- Use insecure=True (required to serve static files via development
  server with DEBUG=False).
 2019-01-20 09:37:42 +01:00
FinnStutzenstein
74e0bea108 Wirst work for the projector system on the client 2019-01-19 21:26:05 +01:00
Oskar Hahn
df85e01b16
Merge pull request #4145 from ostcar/logged_in_users 
logged in users
 2019-01-19 18:00:47 +01:00
Oskar Hahn
5ca2012c44 logged in users 2019-01-19 17:50:18 +01:00
Norman Jäckel
9db12293a3 Added history information for some motion views. 2019-01-19 16:41:58 +01:00
Oskar Hahn
7df842f2e2 delete wrong file 2019-01-19 14:48:01 +01:00
Oskar Hahn
11ba7b9841 Autoupdate on element deletion 
Make sure, that a related element gets an autoupdate, when the main object is deleted
 2019-01-19 14:46:59 +01:00
Oskar Hahn
7a64fb83eb
Merge pull request #4135 from ostcar/projector_http_view 
New projector III
 2019-01-19 14:04:28 +01:00
Oskar Hahn
b4c3ffe01f New projector III 
* Add a new view `project` to set the projector elements-fields
 2019-01-19 10:47:11 +01:00
Norman Jäckel
de7b531933 Used the same timestamp for multiple history objects. 2019-01-19 09:58:58 +01:00
Oskar Hahn
c37bf0fb4f New Projector 
* Change Projector model
* Remove old http requests
* Remove old config values
* Remove uuid from config field
* Remove projector broadcast
* Remove projector blank
* Fix serializer
 2019-01-19 08:19:40 +01:00
Finn Stutzenstein
8bd24d690d
Merge pull request #4118 from FinnStutzenstein/notify 
Make OS3 notify ready
 2019-01-18 17:55:24 +01:00
Oskar Hahn
b329115007 use f-string syntax for strings 2019-01-18 17:37:36 +01:00
FinnStutzenstein
47a09e4bce Make OS3 notify ready 2019-01-18 17:03:09 +01:00
Oskar Hahn
a0f554674b New projector system. Add first slides 2019-01-12 21:21:43 +01:00
Oskar Hahn
eddbd86d3a Run black 2019-01-08 21:51:52 +01:00
Oskar Hahn
8fd82434af Fix example data generator 
fix #4066
 2019-01-04 16:15:45 +01:00
Oskar Hahn
9bb77817dd Refactor assess_permission 
* Remove access_permission.get_full_data()
* Remove access_permission.gcet_serializer_class()
* get serializer class from model
 2018-12-16 09:10:52 +01:00
Norman Jäckel
060856628b OpenSlides history mode. 
Also containing auth check and viewpoint to clear history.
 2018-11-30 09:51:10 +01:00
Sean
10714bbbe4
Merge pull request #4032 from FinnStutzenstein/new_configs 
new configs for statute amendments; improved the majorityMethod confi…
 2018-11-23 11:15:07 +01:00
FinnStutzenstein
3d4bd67980 new configs for statute amendments; improved the majorityMethod config variable 
Removed none from os-search-value-selector; improved list of speakers
 2018-11-22 17:34:00 +01:00
FinnStutzenstein
8e59170b76 Do not try to access the database during migrations 2018-11-22 17:20:17 +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
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
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
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
b1fa3ca263 Merge remote-tracking branch 'upstream/OpenSlides-3' into new-master 2018-10-13 07:38:09 +02:00
Oskar Hahn
9af6bf1606 ensures test on startup 2018-09-23 16:57:49 +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
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
Jochen Saalfeld
b5366ea90f
fixing pytest version and continue if db not available 2018-09-07 10: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
6bae5cf87a Fixed translation strings and permission check. Updated Changelog. 2018-08-30 15:05:08 +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
FinnStutzenstein
22f7d84cae New websocket message format for both clients 2018-08-23 21:02:59 +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
FinnStutzenstein
cece35b3a5 Layout changes for motion detail view and PDF 2018-08-23 16:38:12 +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
e5dd857e87 New url schema 2018-08-22 22:05:06 +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
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
Oskar Hahn
92a39a3fc6 support python 3.7 
fix new pep8 stype
 2018-08-08 21:46:56 +02:00
Oskar Hahn
acceeff8f8 * Update python requirements 
* drop python 3.4
 2018-08-07 15:23:11 +02:00
Sean Engelhardt
6e4665041e Added page numbers and categories in TOC of motion PDF. 2018-07-13 14:26:29 +02:00
FinnStutzenstein
56cdfebe85 Added migrations for the available logos and move old values to new ones, remove old entries in the database 2018-07-13 13:20:22 +02:00
Sean Engelhardt
a6ed54eb92 Added new config options to show logos on the right side in motion PDF. 2018-07-13 13:19:55 +02:00
FinnStutzenstein
9e4cafd0f0 Custom workflows and states: 
- Added new workflow list view
 - Added state table for each workflow
 - Added new StateViewSet to handle states of workflows
 2018-07-13 10:29:06 +02:00
FinnStutzenstein
26d168110f make the privacy policy available for non logged in users (closes #3757) 2018-06-25 17:28:24 +02:00
Emanuel Schütze
5a5475299c
Merge pull request #3637 from CatoTH/Paragraph-Based-Amendments 
Paragraph based amendments / Diff
 2018-06-14 11:11:39 +02:00
Tobias Hößl
d9c08b65b7 New Feature: Paragraph based amendments 
With new amendment list table:
- Removed title from table, leadmotion can be selected now
- rename the new list, added the export dialog, multiselect actions and supporter badge in the amendment list view
- Moved collission detection to own factory, compute collissions in the amendment list view
- Delegates can now enter paragraph based amendments
- new amendment list as pdf/csv export
- improved caching of amendments
- Parse styles in headings and removed all double-quotes
- Performance improvements:
  * Removed ng-mouseover/mouseleave actions in amendment-list
  * disable collission detection in amendment list view.
  * Improved state/recommendation dropdown in amendment list.
 2018-06-14 11:01:03 +02:00
FinnStutzenstein
66c72f4345 Fixed remarks (closes #3760) 2018-06-14 07:24:55 +02:00
FinnStutzenstein
b0a42e19e1 Sort submitters 2018-06-13 14:16:25 +02:00
FinnStutzenstein
252ba02e86 Scroll projector to a given line 2018-06-12 13:02:22 +02:00
Emanuel Schütze
407b640f80
Merge pull request #3740 from FinnStutzenstein/voting-plugin 
Changes for the voting plugin and usability improvements
 2018-05-29 15:02:37 +02:00
Emanuel Schütze
e4e6becf02 Updated all translations for 2.2 release. 2018-05-23 16:43:17 +02:00
Emanuel Schütze
1b321fb680
Merge pull request #3750 from FinnStutzenstein/assignmentPollInputs 
no negative votes and better scrolling in forms with number inputs (c…
 2018-05-23 15:58:01 +02:00
Jochen Saalfeld
9e66f05603
adding working privacy policy 
In order to archive GDPR compliance we need a privacy policy.
 2018-05-23 15:13:05 +02:00
FinnStutzenstein
e4735b9437 no negative votes and better scrolling in forms with number inputs (closes #3739) 2018-05-22 14:30:25 +02:00
FinnStutzenstein
5833393268 Messaging docstring and user callback 
only hide votes for unpublished polls
 2018-05-22 09:20:19 +02:00
Emanuel Schütze
682a5eea5a Minor template improvements and fixes 
- Fix back-to-motion-block-link in item detail view.
- Show projector name in window title.
- Fix sorting for motion blocks and categories in motion list view.
- Fix missing permission check for editing motion block.
- Improved style of rejected CR in motionn detail view.
 2018-05-16 17:50:24 +02:00
FinnStutzenstein
ecb76fd888 Throw errors if pdf generation fails, if an image could not be loaded (fixes #3730) 2018-05-16 17:06:42 +02:00
FinnStutzenstein
f1ab2b3afc fixed #3708 2018-05-09 08:48:37 +02:00