ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,869 Commits 6 Branches 42 Tags 64 MiB
c4fe50b38d
Commit Graph

4869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Finn Stutzenstein
a06806c33b Highlighting and jumping to lines in motions (closes #2347) 2016-09-21 13:58:39 +02:00
Norman Jäckel
2d15bd54a1 Merge pull request #2386 from FinnStutzenstein/sidebarScroll 
First attempt to scroll the projector sidebar
 2016-09-21 12:40:13 +02:00
Norman Jäckel
96b4fb9fd9 Merge pull request #2376 from tsiegleauq/issue2300-pdf-line-numbers 
Add line numbers to pdf (fixes #2300)
 2016-09-20 21:15:25 +02:00
Emanuel Schuetze
875b7b2ddd Reduced font-size of outline numbers. 2016-09-20 16:57:57 +02:00
Sean Engelhardt
cc5ff21005 Add line numbers to pdf (fixes #2300) 2016-09-20 11:34:19 +02:00
FinnStutzenstein
9347a78d56 Make the sidebar scroll and one typofix 2016-09-19 09:05:55 +02:00
Norman Jäckel
858f4a2b43 Merge pull request #2405 from emanuelschuetze/fixAlerts 
Fixed syntax of all uib-alerts.
 2016-09-18 22:54:29 +02:00
Norman Jäckel
916857d735 Merge pull request #2407 from emanuelschuetze/disableProjectorReload 
Disable projector auto reload after 5 minutes.
 2016-09-18 22:53:50 +02:00
Emanuel Schuetze
2a825adde4 Disable projector auto reload after 5 minutes. 
Auto reload no longer used because client gets all required data
after reconnection via websocket.
 2016-09-18 22:34:54 +02:00
Emanuel Schuetze
a7f5d4dd3c Fixed syntax of all uib-alerts. 
Required after ui-bootstrap upgrade.
 2016-09-18 21:09:37 +02:00
Erik Steenman
b48a99f21b Add a 'private' flag to mediafiles. 
Only users with the 'mediafiles.can_see_private' permission can create
and view these private mediafiles.
 2016-09-18 15:45:54 +02:00
Emanuel Schütze
346dfd6b57 Merge pull request #2401 from normanjaeckel/ChangeConfigManagementCommand 
Added management command to change config values. Fixed #2400.
 2016-09-18 15:42:07 +02:00
Norman Jäckel
00913a6333 Added management command to change config values. Fixed #2400. 2016-09-18 13:17:21 +02:00
Emanuel Schütze
3bfa055aed Merge pull request #2385 from FinnStutzenstein/Issue2384 
Confirm multiple deletions (fixes #2384)
 2016-09-18 12:26:45 +02:00
Emanuel Schütze
f288cb4967 Merge pull request #2374 from normanjaeckel/LoadJavaScript 
Changed loading of JavaScript files.
 2016-09-18 12:24:40 +02:00
Norman Jäckel
3d8d7bb695 Merge pull request #2398 from emanuelschuetze/upgrade-requirements 
Upgraded requirements.
 2016-09-18 12:15:49 +02:00
Norman Jäckel
76250c5851 Changed loading of JavaScript files. 2016-09-18 11:23:51 +02:00