Commit Graph

549 Commits

Author SHA1 Message Date
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
Oskar Hahn 9af6bf1606 ensures test on startup 2018-09-23 16:57:49 +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 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
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
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
Oskar Hahn fed6d6f435 Add a protocol for websocket
{'type': STRING, 'content': ANY}
2018-08-23 21:02:52 +02:00
Oskar Hahn aac9dcabf5 drop python 3.5 2018-08-23 17:51:30 +02:00
FinnStutzenstein 9c1290ee0b Do not allow changing a workflow's first state (closes #3778) 2018-08-23 09:09:18 +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 1a17862d6b New item type internal.
The old hidden type was used as internal, so everything is changed to
not be shown if the item is internal. hidden is "new", and actually
behaves as hidden now.
2018-08-16 15:28:30 +02:00
Oskar Hahn acceeff8f8 * Update python requirements
* drop python 3.4
2018-08-07 15:23:11 +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
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 b0a42e19e1 Sort submitters 2018-06-13 14:16:25 +02:00
FinnStutzenstein fa5b81dad8 Protect numbering of the agenda 2018-04-13 10:09:22 +02:00
Tobias Hößl 76fd094ddc OL Offsets - fixes #3643 2018-03-15 12:38:18 +01:00
Emanuel Schütze 4e1c7b7497 New admin user group 2018-03-06 11:21:00 +01:00
FinnStutzenstein ca8ee3edd6 Splitup comment see and manage permissions for motion comments 2018-02-16 14:09:32 +01:00
Emanuel Schütze 8042beda60
Merge pull request #3577 from CatoTH/Issue3563-Escaping-Ampersands
Escape Ampersands - fixes #3563
2018-02-15 08:23:54 +01:00
FinnStutzenstein 3ba39c37c1 Agenda DOCX export, motion log message when comment edited, motion sequential number in detail view and PDF, save pagination state to session storage (fixes #3558). 2018-02-14 10:25:51 +01:00
Tobias Hößl a345815b57 Escape Ampersands - fixes #3563 2018-02-13 16:43:07 +01:00
FinnStutzenstein 5fc7dce567 Mark speakers 2018-02-13 10:32:31 +01:00
FinnStutzenstein 0b04b7478f Fixed email translations, motion sorting, undefined in DOCX, reduced motion search 2018-02-02 12:48:01 +01:00
Emanuel Schütze 9c4a8cc7fc
Merge pull request #3539 from normanjaeckel/BundleAutoupdate
Added autoupdate bundle middleware.
2018-01-26 15:23:32 +01:00
Norman Jäckel 1527cc69dd Cleaned up config app. Removed OPTIONS request. Fixed #3531. 2018-01-26 13:58:21 +01:00
Norman Jäckel d381ca36dd Added autoupdate bundle middleware. 2018-01-25 23:09:28 +01:00
Tobias Hößl c7729a6619 Diff-Bugfix: Whitespace was inserted after <br> 2018-01-22 09:12:36 +01:00
FinnStutzenstein 5e089bfcdc Preparations for the SAML plugin; Fixed caching of main views. 2018-01-21 11:54:01 +01:00
Emanuel Schütze 2f7bc4227a
Merge pull request #3546 from CatoTH/Bugfix-Diff-Bugfix-Moving-Words
Fixes an edge case in the diff
2018-01-21 10:30:44 +01:00
Tobias Hößl e4da7905ca Fixes an edge case in the diff 2018-01-21 10:21:22 +01:00
Emanuel Schütze 3ac072d1a2
Merge pull request #3534 from normanjaeckel/BetterProjectorPrioritization
Split send_data channel into send_data_projector and send_data_site f…
2018-01-21 09:23:19 +01:00
Emanuel Schütze 60fa629857 Set new default for projector resolution (1220x915, Fixed #2549). 2018-01-20 21:20:52 +01:00
Tobias Hößl b574502a37 Bugfix: Diff and Line breaks at dashes 2018-01-20 11:48:46 +01:00
Norman Jäckel aaeb85db61 Split send_data channel into send_data_projector and send_data_site for projector prioritization. Fixed #3426. 2018-01-20 11:07:28 +01:00
FinnStutzenstein 5cf82e5921 fixed ValidationError 2018-01-08 10:41:09 +01:00
Emanuel Schütze 2fe1218fbb
Merge pull request #3503 from FinnStutzenstein/emailTest
Send invitation emails
2017-12-15 08:29:09 +01:00
FinnStutzenstein 2220112d27 Send invitation emails with OpenSlides login. 2017-12-15 08:16:29 +01:00
FinnStutzenstein a998657923 extended the legal notice page (fixes #3504) 2017-12-05 07:55:12 +01:00
Tobias Hößl e18f22f200 Break lines in nodes that have already been parsed 2017-11-02 09:16:36 +01:00
Tobias Hößl 6891471c45 Better handling of inserted paragraphs 2017-11-01 10:29:18 +01:00
Emanuel Schütze 4ff7d0b7dc Merge pull request #3450 from CatoTH/Bugfix-Disable-Change-Ratio
Disable change ratio detection / Fix marking unchanged dangling line as changed
2017-10-16 13:05:35 +02:00
Tobias Hößl e651c124e4 Disable change ratio detection / Fix for marking unchanged line as changed 2017-10-16 12:27:44 +02:00
Emanuel Schütze 17959bd9c5 Motion template improvements (Fixed #3303)
- Sort categories drop downs by config value (name or prefix) (fixed #3303).
- Show comment fiels in pdf without "Comment" as prefix.
- Improved heading style in web and pdf.
- Added motion block to motion pdf.
2017-10-16 09:35:06 +02:00
Tobias Hößl a09a12c55c Diff: use comma as a word separator 2017-10-11 22:15:12 +02:00
FinnStutzenstein 178948b269 Index and Webclient View caching 2017-09-27 12:50:59 +02:00
FinnStutzenstein aa13e5ddd0 Fixing special comments fields, reconnect timeout, minor things. 2017-09-22 13:45:52 +02:00
Tobias Hößl ee37cfed9c Line break algorithm should not be distracted by newline characters
- Cancel out newlines inserted when inline-editing motions
- Bugfix for newlines after BRs
2017-09-21 16:24:54 +02:00
Emanuel Schütze 9f6deb89c1 Fixed karma diff test of #3408. 2017-09-18 12:02:09 +02:00
Emanuel Schütze e313731c9e Merge pull request #3408 from CatoTH/Issue3401-Inline-Diff-When-First-Word-Changed
Inline-Diff when the first word in a paragraph is replaced - fixes #3401
2017-09-18 11:15:52 +02:00
Tobias Hößl 8650bc0401 Inline-Diff works when the first word in a paragraph is being replaced - fixes #3401 2017-09-18 11:05:00 +02:00
Tobias Hößl da8f825d42 Sort attributes before applying the diff - fixes #3402 2017-09-16 14:06:12 +02:00
Emanuel Schütze b824e0387c Merge pull request #3390 from ostcar/rewrite_restricted_data
CollectionElement and Autoupdate cleanups to help mypy
2017-09-15 12:23:50 +02:00
Oskar Hahn d7db714562 CollectionElement and Autoupdate cleanups
* change get_restricted_data and get_projector_data to always use a list
* Add typings to all get_restricted_data and get_projector_data methods
* Replace CollectionElementList with a real list
* Fixed arguments of inform_deleted_data
* Moved CollectionElementCache to cache.py and refactored it
* Run tests with cache enabled (using fakeredis)
2017-09-15 12:11:32 +02:00
Emanuel Schütze 4565e7e4a6 Merge pull request #3400 from FinnStutzenstein/UserAutoupdate
Autoupdates on user login (fixes #3395, fixes #3392)
2017-09-15 11:48:35 +02:00
Emanuel Schütze 2c4a1d5a6c Merge pull request #3376 from FinnStutzenstein/MotionCommentsRework
Rework on motion comments.
2017-09-15 10:59:02 +02:00
FinnStutzenstein 16abfd0dbf Autoupdates on user login (fixes #3395, fixes #3392) 2017-09-15 10:40:04 +02:00
FinnStutzenstein 288a706d01 Rework on motion comments (fixes #3350). 2017-09-12 14:58:43 +02:00
Oskar Hahn b80e95a321 Rewrite projector_element without dispatch 2017-09-05 22:46:13 +02:00
Oskar Hahn be94e97889 more typings 2017-09-03 18:34:55 +02:00
Oskar Hahn 24b07da7b4 Fix PersonalNoteAccessPermissions for anonymous user
fixes: #3377
2017-08-31 22:00:22 +02:00
Oskar Hahn 87b889fbf2 Rewrite config to have id field 2017-08-24 15:02:42 +02:00
Oskar Hahn 9d1ebac86e Add typing (#3370)
Add typing
2017-08-23 20:51:06 +02:00
FinnStutzenstein 727d1341e8 some changes in the example data plugin 2017-08-14 09:56:48 +02:00
Tobias Hößl 7b62c60350 Marks split list items with CSS-classes and hides the bullet points - fixes #3269 2017-07-27 14:42:51 +02:00
Norman Jäckel 77a321894b Merge pull request #3306 from FinnStutzenstein/Issue2862
Remove OPTION request to query permissions (fixes #2862)
2017-07-05 21:26:08 +02:00
Tobias Hößl 65d5bbccd6 Prevent colliding change recommendations - fixes #3298 2017-06-29 18:03:58 +02:00
FinnStutzenstein 90af3e6d1d remove OPTION request to query permissions (fixes #2862) 2017-06-29 13:25:52 +02:00
Emanuel Schütze 573fc4da57 Merge pull request #3267 from normanjaeckel/NewPersonalNote
Rework on personal notes.
2017-06-16 12:38:40 +02:00
Norman Jäckel eaebeb8f06 Fixed get_projector_data impementation. Closed #3282. 2017-06-13 22:21:56 +02:00
Norman Jäckel 91d365e386 Rework on personal notes. Fixed #3262. 2017-06-13 20:58:17 +02:00
Norman Jäckel 260cd5cd16 Merge pull request #3290 from FinnStutzenstein/Issue1533-neu
Massimport for users
2017-06-12 22:07:32 +02:00
FinnStutzenstein 433cdc42fa Massimport for users 2017-06-08 14:40:29 +02:00
Emanuel Schütze fb56215a26 Merge pull request #3233 from normanjaeckel/FixFreeUserAgenda
Fixes autoupdate bug for a user without user.can_see_name permission …
2017-06-07 21:00:12 +02:00
Norman Jäckel ea50971ae6 Fixes autoupdate bug for a user without user.can_see_name permission. 2017-06-07 20:55:00 +02:00
Tobias Hößl 029ca0b8e3 Fix a bug where a single moved word was not highlighted in the diff 2017-06-06 19:28:52 +02:00
Tobias Hößl 7109c75246 Remove color styles insert .insert/.delete-Paragraphs - fixes #3247 2017-05-17 21:38:35 +02:00
Tobias Hößl b340256541 Detect broken HTML after diff (Fixed #3229) 2017-05-16 12:19:18 +02:00
Norman Jäckel db1d087aa0 Merge pull request #3236 from CatoTH/Issue3226-WhitespacesDisturbingLineExtraction
Bugfix: whitespaces were disturbing line extraction - fixes #3226
2017-05-08 13:06:13 +02:00
Norman Jäckel ebabc291c5 Refactoring of data parsing for startup and autoupdate. 2017-05-03 08:58:29 +02:00
Tobias Hößl b0a569fdf3 Bugfix: whitespaces were disturbing line extraction 2017-05-01 15:55:51 +02:00
Norman Jäckel 4bdb06bd9b Fixed error for internal function get_model_from_collection_string. 2017-04-27 15:16:07 +02:00
Emanuel Schütze 11aacc71b6 Merge pull request #3216 from ostcar/early_websocket_open
Open websocket connections immediately
2017-04-27 13:13:00 +02:00
Oskar Hahn 74c1cc63dc Open websocket connections immediately
Also made a performance boost to get_model_from_collection_string()
2017-04-27 12:54:16 +02:00
Norman Jäckel 6aee27e49f Added personal notes for motions (server side part). 2017-04-27 09:10:46 +02:00
Tobias Hößl 9d2edc23e4 Bugfix: changing line length did not invalidate cache 2017-04-19 14:49:43 +02:00
Norman Jäckel c4ec26c4c0 User without permission to see users can now see some required users.
These are
- agenda item speakers,
- motion submitters and supporters,
- assignment candidates,
- mediafile uploader and
- chat message users
but only if the user has respective permissions. Fixed #3002.
2017-04-11 17:10:49 +02:00
Norman Jäckel eea623befa Added some tests for topics. See #3175. 2017-04-03 13:17:10 +02:00
Norman Jäckel 4cad6943f6 Fixed creating motion for users with comments permissions. 2017-03-28 20:42:13 +02:00
Norman Jäckel bdd5d0666f Added command to create example data. 2017-03-27 23:30:43 +02:00
Tobias Hößl 0d98fa3a88 Line breaks in inline diffs 2017-03-26 17:55:28 +02:00
Tobias Hößl d4a72f4b37 Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe516e853cc0 2017-03-24 21:07:51 +01:00
Norman Jäckel 85d13179da Merge pull request #3111 from FinnStutzenstein/Issue3103
Improving creation of ballots (fixes #3103)
2017-03-24 14:46:25 +01:00