Commit Graph

7670 Commits

Author SHA1 Message Date
Emanuel Schütze
9f5226c1d9
Merge pull request #4648 from FinnStutzenstein/motionBlockSlideTwoColumns
Dynamic a two column layout in motion block slides
2019-04-30 16:38:58 +02:00
Sean
addc0cc3cc
Merge pull request #4653 from GabrielInTheWorld/sorting
Save motion category weight, handle auto update in categories
2019-04-30 16:18:48 +02:00
GabrielMeyer
33044a6eaa Handles 'auto-update'
- New motions in a category are appended to the end of the list.
- Removed motions are extracted from the list of motions.
2019-04-30 15:48:22 +02:00
Sean
524ff4a981
Merge pull request #4652 from FinnStutzenstein/sortMotionInCategories
Sort motions in categories
2019-04-30 14:28:09 +02:00
FinnStutzenstein
76880100f5 Sort motions in categories 2019-04-30 14:14:41 +02:00
Sean
83044acde5
Merge pull request #4650 from tsiegleauq/xlsx-addons
Add various extensions to the xlsx exporter
2019-04-30 10:55:46 +02:00
Sean Engelhardt
d05a30bccb Add various extensions to the xlsx exporter 2019-04-30 10:34:01 +02:00
Emanuel Schütze
4507840788
Merge pull request #4646 from FinnStutzenstein/resetClientCache
Added button to reset the clients cache
2019-04-30 10:24:19 +02:00
Emanuel Schütze
bccd9db076
Merge pull request #4649 from tsiegleauq/pdf-font-size-parsing
use ParseInt in PDF generation
2019-04-29 19:54:18 +02:00
Sean Engelhardt
945b2ce72a use ParseInt in PDF generation
Replace "+"(string) with parseInt(val, 10), since apparently some editors
copy `style="xy.zpt"` into a style tag
2019-04-29 12:43:22 +02:00
Sean
3dd659ae36
Merge pull request #4636 from FinnStutzenstein/assignmentAttachments
Add attachments to assignments
2019-04-29 11:35:39 +02:00
FinnStutzenstein
ec7a7aadae Added button to reset the clients cache 2019-04-29 11:27:35 +02:00
FinnStutzenstein
c234cfe698 Dynamic a two column layout in motion block slides 2019-04-29 11:20:12 +02:00
GabrielMeyer
8b489fcdc0 Adds the structure-level to the user-list
- The dialog shows the structure level of one user
- In the list-view the structure level and the participant number are displayed.
2019-04-29 10:35:24 +02:00
FinnStutzenstein
44b683e361 Add attachments to assignments 2019-04-29 10:31:28 +02:00
Emanuel Schütze
29aa6acdc5
Merge pull request #4574 from ostcar/new_django_version
Update django and other dependencys
2019-04-29 08:58:39 +02:00
FinnStutzenstein
1b15f6ea14 prohibit changes in projectiondefaults
resolves question in #4541
2019-04-29 08:25:49 +02:00
Oskar Hahn
65161cbbf8 Update django and other dependencys 2019-04-28 14:03:11 +02:00
Emanuel Schütze
3584dd5646
Merge pull request #4627 from tsiegleauq/virtual-scroll-statute
Add virtual scrolling to statute list
2019-04-28 13:57:30 +02:00
Emanuel Schütze
483d759c88
Merge pull request #4641 from normanjaeckel/FixMotionStateCreation
Server should not require restriction field for motion state. Fixed #…
2019-04-28 13:46:21 +02:00
Emanuel Schütze
e20ff16755
Merge pull request #4642 from CatoTH/diff-bugfix-ins-beyond-paragraphs
Diff-Bugfix: Insertions/Deletions beyond paragraph boundaries
2019-04-28 13:44:43 +02:00
Tobias Hößl
bc8739f017
Diff-Bugfix: Insertions/Deletions beyond paragraph boundaries 2019-04-28 11:27:28 +02:00
Emanuel Schütze
652968add3
Merge pull request #4634 from MaximilianKrambach/lastEmailSent
last_email_sent display and resend email
2019-04-27 21:32:16 +02:00
Maximilian Krambach
d1eed23158 last_email_sent display and resend email 2019-04-27 21:16:28 +02:00
Norman Jäckel
3d6e87e1ef Server should not require restriction field for motion state. Fixed #4622. 2019-04-27 16:23:31 +02:00
Emanuel Schütze
0675bdcf46
Merge pull request #4635 from MaximilianKrambach/commentExport
make comment exportable if readable
2019-04-26 21:49:01 +02:00
Emanuel Schütze
23103362a5
Merge pull request #4617 from tsiegleauq/assignment-pdf
Create assignment PDF service
2019-04-26 21:46:04 +02:00
Emanuel Schütze
ea93c65c3f
Merge pull request #4637 from tsiegleauq/catch-pdf-creation-bugs
Show errors during PDF generation
2019-04-26 21:41:46 +02:00
Emanuel Schütze
78c77efd7c
Merge pull request #4638 from FinnStutzenstein/fixRestrictionCheck
Fix restriction check for motions
2019-04-26 21:35:09 +02:00
Sean Engelhardt
e520dd99e0 Create assignment PDF service
Exports the assignment detail as PDF
2019-04-26 16:23:48 +02:00
Emanuel Schütze
2a10dd4675
Merge pull request #4615 from FinnStutzenstein/silenceWsSendErrosAfterTermination
Silence errors after sending to a closed connection
2019-04-26 16:10:16 +02:00
Emanuel Schütze
729b7f151b
Merge pull request #4621 from tsiegleauq/workflow-state-creation
Temp Fix creation of Workflow States
2019-04-26 16:07:27 +02:00
FinnStutzenstein
7cfe22436e Fixed motion state and restriction
- Fixed restriction check for motions
- Send users via autoupdate on statechanges
2019-04-26 15:57:21 +02:00
Sean Engelhardt
680b6e04e4 Show errors during PDF generation
A lot of PDF-Erros are resolveable by the users themselves.
This helpes users to show them, which of their motions have
malformated HTML
2019-04-26 15:34:27 +02:00
FinnStutzenstein
6de9616c47 Silence errors after sending to a closed connection 2019-04-26 14:07:13 +02:00
Maximilian Krambach
395dfaf63f
Merge pull request #4628 from MaximilianKrambach/assignmentLayout
small assignment layout updates/fixes
2019-04-26 13:06:31 +02:00
Maximilian Krambach
f16884388e make comment exportable if readable
conditions for the export button:
- comment is present and  readable for user
- comment is not in 'edit' mode
2019-04-26 12:45:57 +02:00
Sean Engelhardt
afc6bb629e Fix layout of search value selector 2019-04-26 12:41:55 +02:00
Emanuel Schütze
7ed59a57b0
Merge pull request #4629 from tsiegleauq/export-order-adjustment
Adjust the export order and dialog order
2019-04-26 12:15:33 +02:00
Sean Engelhardt
fdc169f1e9 Adjust the export order and dialog order
The order of the motion export dialog now fits to the motionImportExportHeaderOrder.
It will update dynamically
2019-04-26 11:54:08 +02:00
Sean
7c503024cc
Merge pull request #4633 from FinnStutzenstein/fixRequestingAllChanges
Fixed requesting all data after a connection lost
2019-04-26 11:13:00 +02:00
Maximilian Krambach
ab6a53c2de small assignment layout updates/fixes 2019-04-26 10:11:30 +02:00
FinnStutzenstein
2a73c194dd Fixed requesting all data after a connection lost 2019-04-26 09:51:44 +02:00
Emanuel Schütze
11322a7231
Merge pull request #4632 from emanuelschuetze/translation20190425
Updated translations
2019-04-25 23:49:43 +02:00
Emanuel Schütze
8985d5c5e1 Updated translations 2019-04-25 23:35:57 +02:00
Emanuel Schütze
1e62501f05
Merge pull request #4608 from FinnStutzenstein/autoupdateOnPermissionChangeViaStateRestrictions
send autoupdate on state update for motions
2019-04-25 22:34:52 +02:00
Emanuel Schütze
b7ae5fd8a8
Merge pull request #4631 from CatoTH/Bugfix-replacing-text-at-end-of-paragraph
Bugfix: inline diff for replaced text at end of paragraph
2019-04-25 22:26:38 +02:00
Emanuel Schütze
ddd4588a1c
Merge pull request #4625 from MaximilianKrambach/assignmentSlide
Assignment/Assignment poll slide
2019-04-25 22:18:31 +02:00
Tobias Hößl
e533fbad6d
Bugfix: inline diff for replaced text at end of paragraph 2019-04-25 22:08:21 +02:00
Emanuel Schütze
a61a655715 More slide style improvements 2019-04-25 22:02:36 +02:00