Commit Graph

3654 Commits

Author SHA1 Message Date
FinnStutzenstein
2a0a0049b0 New change recommendation type other 2017-11-24 13:30:19 +01:00
FinnStutzenstein
3f0f98dc24 Added presence view 2017-11-24 13:29:33 +01:00
FinnStutzenstein
af96239b9a Fixed sorting 2017-11-24 12:07:21 +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
Norman Jäckel
44b0f14f65
Merge pull request #3494 from FinnStutzenstein/Exportdialog
Extended exportdialog
2017-11-21 20:33:37 +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
7a3d3d99d6
Merge pull request #3482 from FinnStutzenstein/Improvements
Some improvements
2017-11-17 14:55:38 +01:00
FinnStutzenstein
1b1c486c9d Some improvements 2017-11-17 12:14:07 +01:00
Emanuel Schütze
4f9b1e178f
Merge pull request #3481 from FinnStutzenstein/LockoutProtection
fixed client site lockout protection (fixed #3467)
2017-11-15 12:37:36 +01:00
Emanuel Schütze
ec4873a30c
Merge pull request #3480 from FinnStutzenstein/mediafilesPagination
Added pagination for mediafiles (fixes #3448)
2017-11-15 12:28:41 +01:00
FinnStutzenstein
446cab3b44 Added pagination for mediafiles (fixes #3448) 2017-11-15 12:14:18 +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
b515e68068
Merge pull request #3483 from emanuelschuetze/issue3427
Adds elements to restricted data cache only if cache already exists
2017-11-15 12:05:59 +01:00
Emanuel Schütze
279c2ba796 Adds elements to restricted data cache only if cache already exists (hotfix for #3427).
Prevents corrupt cache if restricted data cache is cleared while runtime.
2017-11-12 17:39:46 +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
FinnStutzenstein
bb322b7793 fixed client site lockout protection (fixed #3467) 2017-11-07 09:57:09 +01:00
Norman Jäckel
9fd0121132
Merge pull request #3476 from emanuelschuetze/motionTitle
Do not show identifier in motion detail template twice.
2017-11-03 22:04:32 +01:00
Emanuel Schütze
b76fd2303c Do not show identifier in motion detail template twice. 2017-11-03 17:02:55 +01:00
FinnStutzenstein
3affb27507 Motion block slide layout 2017-11-03 14:52:31 +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
Emanuel Schütze
5558ba3fc6
Merge pull request #3470 from FinnStutzenstein/SpeakersInMotionListView
Showing the number of next speakers in motion list view
2017-11-03 10:55:13 +01:00
Emanuel Schütze
969274faf3
Merge pull request #3471 from FinnStutzenstein/hideWrongErrorMessageInProjector
hide 'undefined' error message
2017-11-03 10:47:49 +01:00
Emanuel Schütze
4cbf7d6c9f
Merge pull request #3469 from FinnStutzenstein/CountdownRace
Bundle autoupdates for beginning a speech
2017-11-03 10:47:22 +01:00
FinnStutzenstein
1236fee7ee Showing the number of next speakers in motion list view 2017-11-03 10:29:34 +01:00
FinnStutzenstein
834ed77a2c Bundle autoupdates for beginning a speech 2017-11-03 10:27:45 +01:00
FinnStutzenstein
84f755a6e5 hide 'undefined' error message 2017-11-03 10:25:22 +01:00
Emanuel Schütze
3706a36051 Updated German translations. 2017-11-03 09:16:08 +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
452ecfbbd0
Merge pull request #3454 from FinnStutzenstein/UserFormFix
Fixed user form for groups with ids greater than 9
2017-10-29 17:57: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
Norman Jäckel
50bed94249
Merge pull request #3463 from FinnStutzenstein/PdfListstyle
Implement list styles in pdf (fixes #3338)
2017-10-29 17:52:59 +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
78f5d1f516 Implement list styles in pdf (fixes #3338) 2017-10-27 14:35:09 +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
FinnStutzenstein
f479a7a1ab Fixed user form for groups with ids greater than 9 2017-10-24 10:23:49 +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
cd2316652d Merge pull request #3443 from FinnStutzenstein/ResetCountdown
Reset Countdown when a speech was ended
2017-10-13 18:23:34 +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
Norman Jäckel
487b286b79 Merge pull request #3436 from FinnStutzenstein/Remarks
Fixed all remarks
2017-10-13 18:20:45 +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
5f45e2d748 Fixed all remarks 2017-10-13 12:02:23 +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
FinnStutzenstein
256c12af8e Reset Countdown when a speech was ended 2017-10-13 11:13:31 +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
84e2ec2a29 Updated German translations. 2017-10-05 13:33:32 +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
886d76ff06 Merge pull request #3432 from emanuelschuetze/additionalOptions
Added new motion configs to hide reason/recommendation on projector.
2017-10-05 13:29:12 +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
FinnStutzenstein
46364a84e1 Generate webclient-realm.js while collecting staticfiles (fixes #3422) 2017-10-04 12:26:30 +02:00
Emanuel Schütze
de9c54513d Merge pull request #3430 from FinnStutzenstein/AgendaFix
Fixed projecting subitems
2017-09-28 11:40:47 +02:00
FinnStutzenstein
343ddf5ac5 Fixed projecting subitems 2017-09-28 11:33:33 +02:00
FinnStutzenstein
2ba1fe2a0f Instructions for using Nginx in big mode 2017-09-28 09:35:05 +02:00
FinnStutzenstein
5862e054e3 Naive projector prioritization 2017-09-27 14:46:16 +02:00
Emanuel Schütze
c269ae5cf8 Merge pull request #3419 from FinnStutzenstein/ViewCaching
Index and Webclient View caching
2017-09-27 13:21:46 +02:00
FinnStutzenstein
178948b269 Index and Webclient View caching 2017-09-27 12:50:59 +02:00
Emanuel Schütze
231a056790 Merge pull request #3418 from FinnStutzenstein/ServeLogos
Serve Logos
2017-09-27 10:52:29 +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
841383d414 Serve Logos 2017-09-26 10:56:43 +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
61f59b962d Merge pull request #3411 from emanuelschuetze/stylistic-remarks
Fixed two stylistic remarks.
2017-09-18 11:16:39 +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
Emanuel Schütze
6f4d122e0f Fixed two stylistic remarks. 2017-09-18 09:40:57 +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