Norman Jäckel
|
420090552b
|
Merge pull request #2439 from emanuelschuetze/fix-tinymce-gulp-task
Fixed tinymce gulp task
|
2016-09-27 11:57:36 +02:00 |
|
FinnStutzenstein
|
673ee1da18
|
hotfix
|
2016-09-27 11:47:57 +02:00 |
|
FinnStutzenstein
|
54989601a1
|
renamed contains to includes
|
2016-09-27 11:39:13 +02:00 |
|
Emanuel Schuetze
|
0cb2c659d8
|
Fixed tinymce gulp task
|
2016-09-27 10:50:00 +02:00 |
|
Norman Jäckel
|
a02a39e7ae
|
Merge pull request #2438 from emanuelschuetze/fixAssignmentPollSlide
Fix to show invalid/valid/casted votes on assignment slide.
|
2016-09-26 20:51:47 +02:00 |
|
Norman Jäckel
|
8398e3abf0
|
Merge pull request #2436 from tsiegleauq/issue2433-PdfInvalidHTML
Repairs invalid HTML during PDF generation (fixes #2433)
|
2016-09-26 20:51:04 +02:00 |
|
Norman Jäckel
|
4a1cad2988
|
Merge pull request #2437 from emanuelschuetze/fix2435
Fixed AttributeError in MotionAccessPermissions (Fixed #2435)
|
2016-09-26 20:49:48 +02:00 |
|
Emanuel Schuetze
|
841ec00b22
|
Fix to show invalid/valid/casted votes on assignment slide.
|
2016-09-26 20:41:42 +02:00 |
|
Emanuel Schuetze
|
31361f9f54
|
Fixed AttributeError in MotionAccessPermissions (Fixed #2435)
|
2016-09-26 20:26:59 +02:00 |
|
sean
|
d1addf4df6
|
Repairs invalid HTML during PDF generation (fixes #2433)
|
2016-09-26 18:53:59 +02:00 |
|
Emanuel Schütze
|
223b168441
|
Merge pull request #2434 from emanuelschuetze/update-translations
Updated German translations. Fixed some translation strings.
|
2016-09-26 15:46:38 +02:00 |
|
Emanuel Schuetze
|
148e7f6a9b
|
Updated German translations. Fixed some translation strings.
|
2016-09-26 15:33:40 +02:00 |
|
Emanuel Schütze
|
f305d19856
|
Merge pull request #2430 from tsiegleauq/issue2299-motion-katalog
Add motion catalog over pdfmake (fixes #2299)
|
2016-09-26 14:20:46 +02:00 |
|
Sean Engelhardt
|
d4c4f944fe
|
Add motion catalog over pdfmake (fixes #2299)
|
2016-09-26 13:25:58 +02:00 |
|
Norman Jäckel
|
ebd8e2680f
|
Merge pull request #2432 from emanuelschuetze/update-translation-resources
Updated translation resources.
|
2016-09-26 13:10:25 +02:00 |
|
Emanuel Schuetze
|
05326cf706
|
Updated translation resources.
Fixed some translation strings.
|
2016-09-26 12:44:23 +02:00 |
|
Emanuel Schütze
|
fb2593b5a7
|
Merge pull request #2429 from normanjaeckel/CheckAssignmentPollSlide
Updated server logic for assignment detail and poll slide. Fixed #2422.
|
2016-09-24 13:40:59 +02:00 |
|
Emanuel Schütze
|
4363c3498a
|
Merge pull request #2428 from FinnStutzenstein/Issue2425
Removing PDF paragraph numbering (fixes #2425)
|
2016-09-24 13:39:06 +02:00 |
|
Emanuel Schütze
|
50f5d0a33a
|
Merge pull request #2380 from FinnStutzenstein/Issue2348
New ui element for comments in config (closes #2348)
|
2016-09-24 13:34:08 +02:00 |
|
Norman Jäckel
|
495ddb7d2d
|
Updated server logic for assignment detail and poll slide. Fixed #2422.
|
2016-09-23 22:09:38 +02:00 |
|
Norman Jäckel
|
e340d83777
|
Merge pull request #2319 from matakuka/assignment_withoutabstains
Calculate assignment without abstains (if one candidate) (issue #2182)
|
2016-09-23 16:01:04 +02:00 |
|
Norman Jäckel
|
117489c57e
|
Merge pull request #2427 from FinnStutzenstein/Issue2424
Adding TypeError(fixes #2424)
|
2016-09-23 15:55:56 +02:00 |
|
Norman Jäckel
|
256a8d9203
|
Small style changes.
|
2016-09-23 15:53:04 +02:00 |
|
FinnStutzenstein
|
0966ad82e1
|
Removing PDF paragraph numbering (fixes #2425)
|
2016-09-23 15:06:47 +02:00 |
|
Emanuel Schütze
|
5a70125922
|
Merge pull request #2423 from normanjaeckel/NeedFullUpdate
Implemented need_full_update check. Fixed #2396.
|
2016-09-23 15:00:17 +02:00 |
|
FinnStutzenstein
|
956cd05119
|
Adding TypeError(fixes #2424)
|
2016-09-23 14:50:21 +02:00 |
|
Maximilian Krambach
|
e8fa0eca5a
|
New calculate percentage options (fixes issue #2182)
|
2016-09-23 14:45:49 +02:00 |
|
Norman Jäckel
|
26f615fed4
|
Merge pull request #2426 from FinnStutzenstein/Issue2420
Fixing the projector sidebar on firefox (closes #2420)
|
2016-09-23 14:45:25 +02:00 |
|
Finn Stutzenstein
|
d13e11beb1
|
New ui element for comments in config (closes #2348)
|
2016-09-23 14:37:13 +02:00 |
|
Norman Jäckel
|
dc404d21f6
|
Implemented need_full_update check. Fixed #2396.
|
2016-09-23 14:36:26 +02:00 |
|
Norman Jäckel
|
66aa42021a
|
Merge pull request #2381 from FinnStutzenstein/Issue2346
Motions docx export with docxtemplater
|
2016-09-23 14:34:59 +02:00 |
|
FinnStutzenstein
|
8a73ce1be5
|
Fixing the projector sidebar on firefox (closes #2420)
|
2016-09-23 14:34:31 +02:00 |
|
FinnStutzenstein
|
448756f17a
|
Docx export with docxtemplater
|
2016-09-23 14:20:07 +02:00 |
|
Norman Jäckel
|
53ac7c2348
|
Merge pull request #2117 from lesteenman/extendedMediaFileSupport
Initial attempt at support for image and video files.
|
2016-09-22 23:28:00 +02:00 |
|
Norman Jäckel
|
7ee80074c8
|
Merge pull request #2128 from lesteenman/privateMediafiles
Add a 'private' flag to mediafiles.
|
2016-09-22 23:16:50 +02:00 |
|
Emanuel Schütze
|
2495d7dd7f
|
Merge pull request #2412 from FinnStutzenstein/Issue2109
Agenda duration and estimated time (closes #2109)
|
2016-09-22 22:40:23 +02:00 |
|
Norman Jäckel
|
17ddef67f7
|
Merge pull request #2410 from FinnStutzenstein/projectorScale
Allow to scale the projector in the projectorcontainer greater than 100%
|
2016-09-22 22:01:28 +02:00 |
|
Norman Jäckel
|
349a078f20
|
Merge pull request #2411 from FinnStutzenstein/Issue2293
Updating lodash (fixes #2293)
|
2016-09-22 22:00:50 +02:00 |
|
Norman Jäckel
|
926516ac65
|
Small style changes.
|
2016-09-22 21:59:36 +02:00 |
|
FinnStutzenstein
|
970f42cacb
|
Agenda duration and estimated time (closes #2109)
|
2016-09-22 21:59:35 +02:00 |
|
Norman Jäckel
|
a4226f5965
|
Merge pull request #2414 from boehlke/master
Add Dockerfile
|
2016-09-22 21:34:23 +02:00 |
|
Erik Steenman
|
514eea2105
|
Add support for image and video files.
|
2016-09-22 19:03:27 +02:00 |
|
André Böhlke
|
093054222e
|
Add Dockerfile
|
2016-09-22 17:53:27 +02:00 |
|
FinnStutzenstein
|
ceb9e70f6e
|
Updating lodash (fixes #2293)
|
2016-09-22 12:34:53 +02:00 |
|
FinnStutzenstein
|
457f8735d0
|
Allow to scale the projector in the projectorcontainer greater than 100%
|
2016-09-22 11:26:42 +02:00 |
|
Emanuel Schütze
|
8770395274
|
Merge pull request #2406 from normanjaeckel/MoveCustomSlides
Moved custom slides to own app topics. Renamed them to Topic. Fixed #…
|
2016-09-21 20:19:59 +02:00 |
|
Norman Jäckel
|
cab53f0434
|
Moved custom slides to own app topics for better app structure.
Renamed model to Topic. Added migrations file. Fixed #2402.
|
2016-09-21 15:00:23 +02:00 |
|
Norman Jäckel
|
53c4932171
|
Merge pull request #2360 from FinnStutzenstein/Issue2347
Highlighting and jumping to lines
|
2016-09-21 14:58:08 +02:00 |
|
Norman Jäckel
|
ed7c9926b5
|
Merge pull request #2409 from FinnStutzenstein/Issue2399
Confirm multiple deletions (fixes #2399)
|
2016-09-21 14:56:19 +02:00 |
|
FinnStutzenstein
|
c3e511628f
|
Confirm multiple deletions (fixes #2399)
|
2016-09-21 14:43:46 +02:00 |
|