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
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
Norman Jäckel
4e672c5832
Merge pull request #3440 from CatoTH/20171011-Diff-Improvements
...
Diff: use comma as a word separator
2017-10-12 20:25:04 +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
20cf124e9e
Merge pull request #3435 from emanuelschuetze/docFixes
...
Added missing CHANGLOG entry. Minor fix in DEVELOPMENT.rst.
2017-10-06 10:40:14 +02:00
Emanuel Schütze
1a27aa975c
Added missing CHANGLOG entry. Minor fix in DEVELOPMENT.rst.
2017-10-06 09:54:27 +02:00
Emanuel Schütze
0171855e51
Merge pull request #3434 from emanuelschuetze/translation
...
Updated German translations.
2017-10-05 13:40:55 +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
Emanuel Schütze
188f29a6c3
Merge pull request #3424 from FinnStutzenstein/Issue3422
...
Generate webclient-realm.js while collecting staticfiles (fixes #3422 )
2017-10-05 12:53:28 +02:00
FinnStutzenstein
46364a84e1
Generate webclient-realm.js while collecting staticfiles ( fixes #3422 )
2017-10-04 12:26:30 +02:00
Norman Jäckel
3840c0ac5e
Merge pull request #3431 from FinnStutzenstein/NginxInstructions
...
Updated Nginx configuration
2017-10-03 21:14:52 +02:00
FinnStutzenstein
00296a802b
Updated Nginx configuration
2017-09-28 12:19:32 +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
Emanuel Schütze
6d791c7828
Merge pull request #3429 from FinnStutzenstein/NginxInstructions
...
Instructions for using Nginx in big mode
2017-09-28 11:29:12 +02:00
FinnStutzenstein
2ba1fe2a0f
Instructions for using Nginx in big mode
2017-09-28 09:35:05 +02:00
Emanuel Schütze
4c9a8b4ec7
Merge pull request #3425 from FinnStutzenstein/ProjectorPrio
...
Naive projector prioritization
2017-09-27 15:23:24 +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
863e929470
Merge pull request #3423 from emanuelschuetze/dockerfile
...
Install vim in Dockerimage.
2017-09-27 12:12:48 +02:00
Emanuel Schütze
e3e8785079
Install vim in Dockerimage.
2017-09-27 11:12:00 +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
Emanuel Schütze
456d1ff763
Merge pull request #3421 from FinnStutzenstein/MotionCommentsFix3
...
Fixing motion comments
2017-09-27 09:35:11 +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