Commit Graph

968 Commits

Author SHA1 Message Date
Oskar Hahn
b1fa3ca263 Merge remote-tracking branch 'upstream/OpenSlides-3' into new-master 2018-10-13 07:38:09 +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
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
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
FinnStutzenstein
9226874010 Expose the workflow id during motion serialization 2018-09-06 13:39:16 +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
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
401e7821ae Merge remote-tracking branch 'upstream/master' into OpenSlides-3 2018-08-23 21:31:24 +02:00
Oskar Hahn
aac9dcabf5 drop python 3.5 2018-08-23 17:51:30 +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
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
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
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
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
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
FinnStutzenstein
e073084f74 New temporal field for editing the final version of a motion. 2018-08-14 14:15:11 +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
Emanuel Schütze
732f5e7327 Updated German translations. 2018-07-13 13:47:13 +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
Emanuel Schütze
8dca3b5321 Updated German translations.
Changed some strings in source.
Fixed some regressions introduces by new sort-submitters and amendment features.
2018-06-14 13:08:52 +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
Emanuel Schütze
a5a8a1371e
Merge pull request #3748 from FinnStutzenstein/scrollProjectorToLine
Scroll projector to a given line
2018-06-12 13:31:19 +02:00
Emanuel Schütze
97bf5adc6a
Merge pull request #3749 from FinnStutzenstein/motionNumberingException
Removed the ValidationError in motion numbering (fixed #3680)
2018-06-12 13:06:29 +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
FinnStutzenstein
5833393268 Messaging docstring and user callback
only hide votes for unpublished polls
2018-05-22 09:20:19 +02:00
FinnStutzenstein
562d620851 Removed the ValidationError in motion numbering (fixed #3680) 2018-05-22 07:44:21 +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
0fd1cd688b Fixed logic for saving motion comments 2018-05-16 11:54:46 +02:00
FinnStutzenstein
0a141adbd1 Fixes for the item projection (fixes #3733) 2018-05-04 10:27:39 +02:00
Emanuel Schütze
7b9d8d11a6
Merge pull request #3732 from FinnStutzenstein/MotionProjectorFix
Fixed deleted comment fields
2018-05-04 09:34:08 +02:00
FinnStutzenstein
d189e5bca8 Fixed deleted comment fields 2018-05-03 17:26:47 +02:00
Emanuel Schütze
cb42af7c8b
Merge pull request #3731 from FinnStutzenstein/MotionCommentsInlineEditingFix
Fixed wrong index for inline editors
2018-05-02 20:18:54 +02:00
FinnStutzenstein
902ca96a16 Fixed wrong index for inline editors 2018-05-02 15:35:49 +02:00
Emanuel Schütze
cc5a1ea0fe
Merge pull request #3702 from FinnStutzenstein/motionAgendaTitle
new style for motion agenda title
2018-05-02 13:37:44 +02:00
FinnStutzenstein
754040570d New style for motion agenda title and list of speakers
Improved list of speakers slide title:
- h2 subtitle: use always motion identifier only (like in motion slides)
- h1 title: use always "list of speakers" (long motion title not useful
  if an other projector shows the motion slide with full title
  (identifier is enough)
2018-05-02 13:29:59 +02:00
Emanuel Schütze
bf27b6f016
Merge pull request #3723 from emanuelschuetze/fixes
Template improvements
2018-04-25 16:01:21 +02:00
Emanuel Schütze
ef2a22fefe Template improvements
- Show item duration and done for normal users correctly.
- Fixed CSS class for countdown warning time.
- Improved projector manage button layout.
- Updated fontawsome icons to 4.7.
- Fixed iframe width/height to show border correctly.
- Improved 'close list of speakers' button.
- Improved 'clear all filter' icons.
- Fixed election pdf if candidate was deleted.
- Moved ban icon for internal icons.
- Improved edit projector form. Show simple scaling steps instead of
  width/height resolution.
- Consolidated both agenda item filters.
- Used better sort icon.
- Installed colordialog plugin for ckeditor to select more colors.
- Several css improvements.
2018-04-25 15:47:39 +02:00
FinnStutzenstein
08045638ab precalculate projectorchanges in the client 2018-04-25 11:08:23 +02:00
Emanuel Schütze
334a6880b5
Merge pull request #3718 from FinnStutzenstein/autoupdateAmendments
Watch for changes of amendments in the motion detail view.
2018-04-24 11:38:56 +02:00
FinnStutzenstein
07f3880ad3 Watch for changes of amendments in the motion detail view. 2018-04-24 11:27:33 +02:00
FinnStutzenstein
d4a9751474 Added motions from state and recommendation to the projector requirements 2018-04-24 11:22:24 +02:00
FinnStutzenstein
10038b782f One request for each projection. Added some validation for clear_elements and prune_elements 2018-04-24 10:23:28 +02:00
Emanuel Schütze
b6ebc78e85
Merge pull request #3682 from FinnStutzenstein/voting-plugin
Changes for the voting plugin
2018-04-13 15:11:48 +02:00
Emanuel Schütze
11ba5a7c37
Merge pull request #3704 from emanuelschuetze/fixRecommendationExtensionField
Add missing permission check for recommendation extension field.
2018-04-13 14:21:47 +02:00
Emanuel Schütze
4a2410a596
Merge pull request #3700 from FinnStutzenstein/titleInMotionBlockSlide
Added a short title in the motion block slide
2018-04-13 14:20:31 +02:00
FinnStutzenstein
595bcab845 Added shortened motion title to motion block slide. 2018-04-13 10:13:17 +02:00
Emanuel Schütze
71b3cc181f
Merge pull request #3698 from FinnStutzenstein/topPagination
Proposal for top pagenavigation
2018-04-13 10:06:01 +02:00
Emanuel Schütze
384a7869ec
Merge pull request #3699 from FinnStutzenstein/attachmentsOrder
Order attachments by title
2018-04-13 10:00:48 +02:00
FinnStutzenstein
094fa4da84 Added pagination on top of lists (Fixed #3667). 2018-04-13 09:51:14 +02:00
Emanuel Schütze
cdea91c780 Add missing permission check for recommendation extension field. 2018-04-13 09:42:07 +02:00
FinnStutzenstein
30b307d309 Order attachments by title 2018-04-11 12:56:34 +02:00
FinnStutzenstein
a17c853d67 Removed todo (closes #3580).
For explaination see the issue.
2018-04-11 10:39:44 +02:00
FinnStutzenstein
2256031184 Changes for the voting plugin
- new-style template hooks. See changes in the template hook documentation
- reordered user list view to get more space for extra things
- added template hooks.
2018-04-11 10:31:48 +02:00
Emanuel Schütze
5a8bfbd403
Merge pull request #3692 from emanuelschuetze/issue3588
New config to hide motion meta information box on projector (Fixed #3588)
2018-04-11 08:02:42 +02:00
Emanuel Schütze
8c1c6241d1 New config to hide motion meta information box on projector (Fixed #3588). 2018-04-11 07:52:40 +02:00
Emanuel Schütze
ca21401384 Linebreak protection for motion sidebox (Fixed #3593). 2018-04-10 14:48:00 +02:00
Emanuel Schütze
9e2c6a14fa
Merge pull request #3685 from FinnStutzenstein/fixedMotionSlide
Fixed motion slide not showing any diffs
2018-04-10 14:00:30 +02:00
Emanuel Schütze
7f0386138f Template fixes (fixed #3603, fixed #3601, fixed #3555)
- Fixed agenda import preview (Fixed #3603)
- Show import error only if available; for agenda/motions/users (Fixed #3601)
- Added missing tooltips in detail views (Fixed #3555).
2018-04-09 18:01:05 +02:00
FinnStutzenstein
75e0955a29 Fixed motion slide not showing any diffs 2018-04-06 14:24:52 +02:00
Emanuel Schütze
58dcb0c3b4
Merge pull request #3657 from CatoTH/Issue3656-Too-Much-Caching-Line-Numbers
Add firstLine to cache definition - fixes #3656
2018-03-19 16:06:48 +01:00
FinnStutzenstein
052daa2b19 Fixing translations (fixes #3607, fixes #3604). 2018-03-19 15:23:34 +01:00
Tobias Hößl
652701e4f3
Add firstLine to cache definition - fixes #3656 2018-03-15 19:34:42 +01:00
Emanuel Schütze
972d76cf21
Merge pull request #3644 from CatoTH/Isuue3643-OL-Offsets
OL Offsets - fixes #3643
2018-03-15 12:53:13 +01:00
Emanuel Schütze
78747fad35
Merge pull request #3646 from CatoTH/Issue3645-Goto-Original-View-After-Deleting-Title-CR
Go to original view after deleting the Title CR...
2018-03-15 12:42:06 +01:00
Tobias Hößl
76fd094ddc OL Offsets - fixes #3643 2018-03-15 12:38:18 +01:00
Emanuel Schütze
b1d5fa21c9
Merge pull request #3652 from emanuelschuetze/numberingCategory
Improved error handling of re-numbering motions of a category.
2018-03-14 18:03:48 +01:00
Emanuel Schütze
79d69068f5 Improved error handling of re-numbering motions of a category. 2018-03-14 17:49:25 +01:00
Emanuel Schütze
bee73d3a28 Layout improvements for agenda and motions
- Use more compact agenda on projector (reduce line height)
- Fixed sorting of motions and limit motion title lenght in recommendation dropdown menu.
- Improved CSS for using tables in topic text (site and projector).
2018-03-14 12:06:26 +01:00
Tobias Hößl
b2043fa49d
Go to original view after deleting the Title CR, if it is the last one - fixes #3645 2018-03-11 18:28:16 +01:00
Tobias Hößl
611be75d95
Bugfix: Title change recommendations on the projector 2018-03-09 14:34:09 +01:00
Emanuel Schütze
6daf262c0e Some minor CSS improvements.
- Projector: Use same line height in list elements as in content.
- Projector: Reduce indentation of ul/ol lists.
- Projector: Add more space between line numbers and motion text,
- Agenda list: Remove padding-left in item list view.
2018-03-08 10:51:31 +01:00
Tobias Hößl
9f8dce6e34
Change recommendations for titles 2018-03-07 16:36:30 +01:00
FinnStutzenstein
1949a00ee7 Moved image sources to the virtual filesystem 2018-03-05 11:51:35 +01:00
Norman Jäckel
a30a30d72f
Merge pull request #3617 from emanuelschuetze/issue3614
Improved motion import/export (Fix #3614).
2018-03-04 20:59:24 +01:00
Emanuel Schütze
a733f2edb4 Improved motion import/export (Fix #3614).
- Fix motion import if names of paricipants are sorted by surname.
- Support multiple submitters in motion export csv.
2018-03-01 11:21:23 +01:00
Emanuel Schütze
0899bc5e22 Adapt motion csv import example file (Fix #3613). 2018-03-01 10:22:16 +01:00
Emanuel Schütze
4067a52dda Updated German translations. 2018-02-16 16:41:55 +01:00
Emanuel Schütze
1d49121cb6
Merge pull request #3581 from FinnStutzenstein/li-space
Add space between list elements in motion text and pdf
2018-02-16 15:30:48 +01:00
Emanuel Schütze
d22a2c3c58
Merge pull request #3567 from FinnStutzenstein/layoutChanges
Collapsable agenda, one panel for each motion comment and hide closed…
2018-02-16 14:55:05 +01:00
FinnStutzenstein
1c62f7510b Add space between list elements in motion text and pdf 2018-02-16 14:54:19 +01:00
FinnStutzenstein
44fcfb447e Collapsable agenda, one panel for each motion comment and hide closed agenda items in the item slide. 2018-02-16 14:30:03 +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
Emanuel Schütze
a6cdb75093
Merge pull request #3564 from FinnStutzenstein/improvements
Fixed email translations, motion sorting, undefined in DOCX, reduced …
2018-02-11 20:12:25 +01:00
FinnStutzenstein
dea62c8394 Fixed wrong css hierachy 2018-02-06 15:53:24 +01:00
FinnStutzenstein
0b04b7478f Fixed email translations, motion sorting, undefined in DOCX, reduced motion search 2018-02-02 12:48:01 +01:00
FinnStutzenstein
39e49f7226 Finally removed AgendaAutoupdate 2018-01-29 09:18:15 +01:00
Norman Jäckel
4aad16db4f Enhance setup of new agenda items for topics, motions and motion blocks. 2018-01-29 09:18:07 +01:00
Norman Jäckel
4a78298f94 Supported server side setup of new agenda items (type and parent). 2018-01-25 23:14:26 +01:00
FinnStutzenstein
60b6ef1415 Repair the master 2018-01-23 14:02:16 +01:00
Tobias Hößl
c7729a6619 Diff-Bugfix: Whitespace was inserted after <br> 2018-01-22 09:12:36 +01:00
Tobias Hößl
e4da7905ca Fixes an edge case in the diff 2018-01-21 10:21:22 +01:00
Jochen Saalfeld
612924c087
save language selection to session storage
and adding @FinnStutzenstein remarks

adding changelog entry
2018-01-20 20:57:53 +01:00
Tobias Hößl
b574502a37 Bugfix: Diff and Line breaks at dashes 2018-01-20 11:48:46 +01:00
Finn Stutzenstein
cfefd1c7b7
Merge pull request #3507 from FinnStutzenstein/css
split up css classes
2018-01-16 09:41:08 +01:00
FinnStutzenstein
cc75452691 split up css classes using sass 2018-01-16 08:38:11 +01:00
FinnStutzenstein
264b6f7d34 Hide identifier field in motion update form if the user is delegate (fixes #3528) 2018-01-12 08:08:01 +01:00
FinnStutzenstein
5cf82e5921 fixed ValidationError 2018-01-08 10:41:09 +01:00
Emanuel Schütze
3271ff368c
Merge pull request #3516 from FinnStutzenstein/delegateDelete
Allow to delete own motions
2017-12-15 10:41:16 +01:00
FinnStutzenstein
a934ab3845 Allow to delete own motions. 2017-12-15 10:20:40 +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
Emanuel Schütze
3d264683ff Assignment improvements
- Use ckeditor for assignment description field (e.g. for candidatures
  using html).
- Use 2 decimal places for percentage of voting results (motions/assignments)
- Allow css style attributes 'float' and 'padding'.
- Remove progress bar in election result slide to get more space (height)
  for candidate rows.
2017-12-05 14:04:35 +01:00
Emanuel Schütze
95be44e7f7 Updated German translations. 2017-12-01 12:07:50 +01:00
Emanuel Schütze
a34ad1485a
Merge pull request #3490 from FinnStutzenstein/followRecommendation
Reduce autoupdates by adding a follow_recommendation view (fixes #348…
2017-12-01 09:34:56 +01:00
FinnStutzenstein
b6a2530618 Reduce autoupdates by adding a follow_recommendation view (fixes #3488, fixes #3489) 2017-12-01 09:17:50 +01:00
FinnStutzenstein
34ac4a347c Added is amendment filter, fixed ckeditor image browser logo, changed motion table header layout 2017-12-01 09:16:48 +01:00
FinnStutzenstein
2a0a0049b0 New change recommendation type other 2017-11-24 13:30:19 +01:00
Norman Jäckel
3161bdaa05
Merge pull request #3498 from FinnStutzenstein/MotionHref
Give motions by id in state and recommendation.
2017-11-21 20:41:47 +01:00
FinnStutzenstein
2bdaf85b67 Give motions by id in state and recommendation. 2017-11-21 16:56:52 +01:00
FinnStutzenstein
79e6e31229 Extended motion export dialog (fixes #3493)
- Cleanup formfield types
- Remove complete columns in the csv
2017-11-21 16:27:05 +01:00
Emanuel Schütze
de47da646b
Merge pull request #3492 from emanuelschuetze/templateImprovements
Template improvements for motions and projector
2017-11-15 12:08:24 +01:00
Emanuel Schütze
702b452b6e Template improvements for motions and projector
- Use same title layout for (current) list of speakers slide.
- Set default choose for current list of speakers slide to 'project as slide'
  if more than one projectors available.
- Remove additional control bottons in list of speakers view to stop/end current/next speech.
  (User should better use the start/stop buttons behind the speaker names.)
- Fix typo in projection defaults.
- Set sidebox in motion slide to fix position (should not scroll).
- Fix order of amendments in motion detail template.
- Increase font size of motion block items on slide.
2017-11-12 17:23:05 +01:00
FinnStutzenstein
db9e132e08 Fix the motion detail template 2017-11-10 17:27:39 +01:00
Emanuel Schütze
b76fd2303c Do not show identifier in motion detail template twice. 2017-11-03 17:02:55 +01:00
FinnStutzenstein
b7da8cf7ec Do not show identifier in motion slide twice 2017-11-03 13:06:51 +01:00
Emanuel Schütze
bed42b5c66
Merge pull request #3472 from FinnStutzenstein/templateChanges
Template changes and IE fix
2017-11-03 12:55:17 +01:00
FinnStutzenstein
9e46924c77 Template changes and IE fix
- Fix IE11 that projector shows JS error if 'startsWith' is used.
  Projector was updated very slowly.
- Hide the valid/invalid/casted ballot rows on projector if empty.
- Use 80% width for motion reason in PDF.
2017-11-03 12:36:03 +01:00
Emanuel Schütze
432ab9068d
Merge pull request #3473 from FinnStutzenstein/zoomcontent
Do not zoom slideheaders
2017-11-03 12:33:42 +01:00
FinnStutzenstein
323534700c Do not zoom slideheaders 2017-11-03 12:17:29 +01:00
FinnStutzenstein
1236fee7ee Showing the number of next speakers in motion list view 2017-11-03 10:29:34 +01:00
Tobias Hößl
e18f22f200 Break lines in nodes that have already been parsed 2017-11-02 09:16:36 +01:00
Emanuel Schütze
c40ae6e9d1
Merge pull request #3465 from CatoTH/Bugfix-More-Tolerant-Diff
Better handling of inserted paragraphs
2017-11-02 09:11:28 +01:00
FinnStutzenstein
5e8662e470 Motion optimizations 2017-11-02 08:50:33 +01:00
Tobias Hößl
6891471c45 Better handling of inserted paragraphs 2017-11-01 10:29:18 +01:00
Emanuel Schütze
a8ff32bbb1
Merge pull request #3442 from FinnStutzenstein/MotionIdentifierInTitle
Show motion identifier in (current) list of speakers
2017-11-01 10:23:19 +01:00
FinnStutzenstein
39bd6653f0 Show motion identifier in (current) list of speakers 2017-11-01 09:58:22 +01:00
Norman Jäckel
6767dbc40a
Merge pull request #3457 from CatoTH/Bugfix-Fail-Less-Dramatically-With-Inconsistent-Data2
try/catch for inconsistent data
2017-10-29 17:59:18 +01:00
Norman Jäckel
e259e10202
Merge pull request #3461 from FinnStutzenstein/followRecommendationAutoCopy
Update state field when following a recommendation
2017-10-29 17:53:30 +01:00
Emanuel Schütze
b50d5e10ee Added '!' as new split separator for better motion diff view. 2017-10-27 14:50:38 +02:00
FinnStutzenstein
1c508765fa Update state field when following a recommendation 2017-10-27 12:36:31 +02:00
Tobias Hößl
5fd8741fdb try/catch for inconsistent data 2017-10-24 20:06:04 +02:00
Norman Jäckel
73407133bd Merge pull request #3444 from FinnStutzenstein/ScrollTopOnPageChange
Go to top on a page change
2017-10-22 15:35:12 +02:00
Norman Jäckel
d175e4a200 Merge pull request #3452 from FinnStutzenstein/Plugin
Added TemplateHooks for the protocol plugin.
2017-10-19 21:21:49 +02:00
FinnStutzenstein
9c657016e3 Added TemplateHooks for the protocol plugin. 2017-10-18 11:35:22 +02: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
5eda3131a8 Merge pull request #3449 from emanuelschuetze/motionTemplateImprovements
Motion template improvements (Fixed #3303)
2017-10-16 12:10:00 +02:00
Emanuel Schütze
c02f00da7d Merge pull request #3446 from FinnStutzenstein/Identifier
New motion identifier behavior
2017-10-16 12:08:53 +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
Emanuel Schütze
721064700a Merge pull request #3441 from FinnStutzenstein/CommentsFilterMove
Move comments filter behind motion block filter
2017-10-13 23:38:45 +02:00
Norman Jäckel
611776d38c Merge pull request #3445 from FinnStutzenstein/MotionTextFullWidth
Limit the reason display width
2017-10-13 18:35:47 +02:00
Norman Jäckel
9b64bd5646 Merge pull request #3438 from FinnStutzenstein/PDF
Fixing multiline headers in PDF
2017-10-13 18:21:34 +02:00
FinnStutzenstein
5b9933e930 Move comments filter behind motion block filter 2017-10-13 14:25:31 +02:00
FinnStutzenstein
1da34f744f New motion identifier behavior 2017-10-13 14:06:01 +02:00
FinnStutzenstein
96cd3405aa Go to top on a page change 2017-10-13 11:46:41 +02:00
FinnStutzenstein
6584c7b035 Limit the reason display width 2017-10-13 11:16:01 +02:00
Norman Jäckel
3c9ae628e8 Merge pull request #3439 from FinnStutzenstein/PdfInsertFix
Fixed indention of inserted paragraphes
2017-10-12 20:29:41 +02:00
Tobias Hößl
a09a12c55c Diff: use comma as a word separator 2017-10-11 22:15:12 +02:00
FinnStutzenstein
fc185e2eeb Fixing multiline headers in PDF 2017-10-11 14:21:35 +02:00
FinnStutzenstein
b8e23e6a4f Fixed indention of inserted paragraphes 2017-10-11 14:04:31 +02:00
Emanuel Schütze
18d138ebf1 Merge pull request #3433 from emanuelschuetze/layoutIssues
Fixed minor layout issues on projector and pdf.
2017-10-05 13:29:38 +02:00
Emanuel Schütze
02857bdbf1 Fixed minor layout issues on projector and pdf.
Especially for motion diff view.
2017-10-05 13:05:49 +02:00
Emanuel Schütze
0a04ee0716 Added new motion configs to hide reason/recommendation on projector. 2017-10-05 12:54:40 +02:00
Emanuel Schütze
0b10933d67 Merge pull request #3417 from FinnStutzenstein/HidePassword
Hide password in change password view
2017-09-27 10:52:09 +02:00
FinnStutzenstein
6f33c8a866 Fixing motion comments (fixes #3420) 2017-09-27 09:20:07 +02:00
FinnStutzenstein
ab08708ec1 Hide password in change password view 2017-09-26 09:03:05 +02:00
FinnStutzenstein
aa13e5ddd0 Fixing special comments fields, reconnect timeout, minor things. 2017-09-22 13:45:52 +02:00
Emanuel Schütze
6f3e2a74f8 Merge pull request #3410 from CatoTH/Issue3409-Workaround-For-Newlines
Line break algorithm should not be distracted by newline characters
2017-09-21 16:35:14 +02:00
Emanuel Schütze
c68688c2ff Merge pull request #3414 from FinnStutzenstein/Fixes
Motion comments fix and close open dialogs if a relogin is necessary
2017-09-21 16:29:32 +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
FinnStutzenstein
a4ae174a94 Fixing motion access permissions 2017-09-21 12:43:07 +02:00
FinnStutzenstein
31708df436 Motion comments fix and close open dialogs if a relogin is necessary 2017-09-20 07:34:57 +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
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
FinnStutzenstein
c580ee4c8d Goto top link, improved title, stylistic changes, and more 2017-09-15 11:06:19 +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
288a706d01 Rework on motion comments (fixes #3350). 2017-09-12 14:58:43 +02:00
FinnStutzenstein
8adf2a6729 Clear the identifier_number on identifier reset (fixes #3353) 2017-09-08 22:09:25 +02:00
Emanuel Schütze
29f60fc6aa Fixed motion detail style issues
- margin in motion diff view
- personal note box
2017-09-08 18:25:48 +02:00
Oskar Hahn
71e154ec6d Merge pull request #3382 from ostcar/remove_dispatch
Rewrite projector_element without dispatch
2017-09-06 18:06:39 +02:00
Oskar Hahn
b80e95a321 Rewrite projector_element without dispatch 2017-09-05 22:46:13 +02:00
Emanuel Schütze
b416786b40 Merge pull request #3360 from FinnStutzenstein/PinPersonalNote
Pin personal note.
2017-09-05 09:52:31 +02:00
FinnStutzenstein
02428eb8f0 Pin personal note. 2017-09-05 08:24:16 +02:00
Oskar Hahn
be94e97889 more typings 2017-09-03 18:34:55 +02:00
Emanuel Schütze
f4ac0dd30d Fixed inline editing of motion reason. 2017-08-30 19:23:52 +02:00
Emanuel Schütze
97a1431c32 Merge pull request #3372 from FinnStutzenstein/Issue3365
Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367)
2017-08-29 11:44:47 +02:00
FinnStutzenstein
7d333d4f3b Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367) 2017-08-29 11:36:00 +02:00