ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,943 Commits 6 Branches 42 Tags 64 MiB
7aa110aca6
Commit Graph

2747 Commits

Author SHA1 Message Date
FinnStutzenstein
e267784173 fixing topics import (closes #2522) 2016-10-24 16:38:43 +02:00
Norman Jäckel
9ca15fd0b8 Fixed migrations by skipping autoupdate. 2016-10-24 10:42:34 +02:00
FinnStutzenstein
2f03777d56 change dropdown for project agenda (closes #2517) 2016-10-21 13:11:25 +02:00
FinnStutzenstein
111b9e3fd7 use check icon and no post request on deselect (fixes #2471) 2016-10-21 09:39:04 +02:00
Emanuel Schütze
dc1c958e0f Merge pull request #2514 from FinnStutzenstein/Issue2494 
Round corners for projectorbuttons (fixes #2494)
 2016-10-18 13:01:49 +02:00
FinnStutzenstein
6ca3c07e1f Round corners for projectorbuttons (fixes #2494) 2016-10-18 12:48:19 +02:00
Emanuel Schütze
8172984a4d Updated translation resource. Updated German translations. 
Fixed translation strings.
 2016-10-17 23:30:18 +02:00
Emanuel Schütze
35a69254af Updated EN translation resources. 2016-10-17 22:07:25 +02:00
Emanuel Schütze
68139ff5be Merge pull request #2512 from FinnStutzenstein/Issue2470 
key value switched in angular foreach (fixes #2470)
 2016-10-17 22:05:55 +02:00
Norman Jäckel
676e783039 Merge pull request #2516 from FinnStutzenstein/Issue2502 
Remove chat history
 2016-10-17 21:48:34 +02:00
Norman Jäckel
f2fa8de7be Merge pull request #2495 from normanjaeckel/MotionBlock 
Motion block
 2016-10-17 21:29:31 +02:00
Emanuel Schütze
29638cc702 Recreated migrations file for motionBlock. 
Minor template fixes for motionBlock.
 2016-10-17 21:18:31 +02:00
Norman Jäckel
20f8875dcd Added view to follow recommendations. 
for all motions of a motion block
 2016-10-17 21:02:50 +02:00
Emanuel Schuetze
0270c31b32 Template improvements for motion blocks. 
Fixed $stateProvider to allow camelCase in state name (Fixed #2479)
- Refactor generic templateUrl function.
- Rename MotionBlock templates.
- Rename MotionBlock controller.
 2016-10-17 20:58:10 +02:00
Norman Jäckel
700c86a24c New feature blocks for motions. 
- Added ListView, DetailView, UpdateForm and connection to
  agenda item for MotionBlock.
- Added slide and projection default.
- Added custom manager for motion blocks.
- Enabled current list of speakers slide and overlay for motion block.
 2016-10-17 20:54:26 +02:00
Norman Jäckel
8d494ddef9 Merge pull request #2511 from FinnStutzenstein/Issue2465 
Rename AdditionalId to arg (closes #2465)
 2016-10-17 20:45:23 +02:00
Tobias Hößl
228abf5cee Change recommendations 2016-10-17 19:37:32 +02:00
Norman Jäckel
e944f6368b Merge pull request #2509 from matakuka/majorities 
Majorities (issue #2258)
 2016-10-17 17:15:15 +02:00
Emanuel Schütze
7ada65a628 Optimized template and translation for majority feature. 2016-10-17 17:03:42 +02:00
Norman Jäckel
45aa4146da Refactored majority calculation. Added cache for MotionPollDetailCtrl. 2016-10-17 17:03:42 +02:00
Maximilian Krambach
e5e1e3e8ba Majority test for motions 2016-10-17 17:03:31 +02:00
Norman Jäckel
639748bb3b Added view to clear the chatbox. 2016-10-17 16:56:19 +02:00
FinnStutzenstein
7965fd3fce Button for deleting chat history 2016-10-17 15:04:06 +02:00
Emanuel Schütze
208d94a91b Support https as websocket protocol (wss). 2016-10-17 11:31:27 +02:00
FinnStutzenstein
5272a3c1bb key value switched in angular foreach (fixes #2470) 2016-10-17 08:58:43 +02:00
FinnStutzenstein
7fcbed051c Rename AdditionalId to arg (closes #2465) 2016-10-17 08:10:52 +02:00
André Böhlke
cced97d9fb password change command 2016-10-14 16:01:46 +02:00
Norman Jäckel
447339ec33 Merge pull request #2508 from tsiegleauq/userListPdfMake 
Create the user list over pdfmake
 2016-10-14 11:50:31 +02:00
Sean Engelhardt
54fc500d04 Create the user list over pdfmake 2016-10-12 16:52:24 +02:00
Maximilian Krambach
88674da36a list-of-speakers overlay (fixes #2211) 2016-10-12 15:45:21 +02:00
Norman Jäckel
1a54d1f4c6 Merge pull request #2505 from emanuelschuetze/fix-autoupdate-for-polls 
Fixed autoupdate for motion and assigment polls.
 2016-10-12 11:34:09 +02:00
Emanuel Schuetze
d2acbdda70 Fixed autoupdate for motion and assigment polls. 
Send autoupdate once only after all votes are saved. Disable
autoupdate for saving incompleted vote results.
 2016-10-12 11:23:53 +02:00
Emanuel Schütze
6f70fb630c Merge pull request #2498 from tsiegleauq/agendaPDFmake 
Generate agendas using pdfmake
 2016-10-12 10:27:46 +02:00
Sean Engelhardt
345328357f Generate agendas using pdfmake 2016-10-11 18:10:33 +02:00
Norman Jäckel
1b218843ef Merge pull request #2491 from emanuelschuetze/template-fixes 
Template fixes
 2016-10-07 20:07:11 +02:00
Emanuel Schuetze
af10c5aa3d Fixed typo in projector autoupdate (Fixes #2492) 2016-10-07 17:02:55 +02:00
Emanuel Schuetze
f7d10b417e Template fixes 
- motion list: show category and tags dropdown for manager only
- manage projector: fix submenu buttons and css classes
 2016-10-07 11:42:33 +02:00
FinnStutzenstein
f1c58f98e8 Using a datetimepicker for agenda start time (closes #2413 and fixes #2440) 2016-10-06 22:12:51 +02:00
Emanuel Schuetze
0a2759c3ce Updated missing German translations. 2016-10-06 21:12:31 +02:00
Sean Engelhardt
5040caba5c moves pdfmake related code in own files (fixes #2307) 2016-10-05 11:27:22 +02:00
Oskar Hahn
e209dd6dfe Support to send many objects through the autoupdate system 2016-10-04 18:10:04 +02:00
Emanuel Schuetze
d7a22c371e Minor changes 
- Show workflow field in motion form only if more than one workflows
  exists.
- Reorder the fields category, tags and origin in motion detail.
- Fix translation string 'Line numbering'.
- Fix padding in motion list.
 2016-10-04 15:06:50 +02:00
Emanuel Schuetze
2b206a9e72 Updated German tranlsations. 2016-10-04 13:22:39 +02:00
Emanuel Schuetze
4075c1aa3f Fixed translations strings. Updated template-en.pot. 2016-10-04 12:04:55 +02:00
Emanuel Schuetze
72651f5bbc Updated translation resource files. 2016-10-04 11:16:03 +02:00
Emanuel Schütze
e64a1bf19c Merge pull request #2478 from emanuelschuetze/ui-improvements 
UI improvements
 2016-10-04 10:59:21 +02:00
Emanuel Schuetze
bc72089973 UI improvements 
- item list: reorder buttons
- motion list:
  * move hover menu for edit/delete below submitters
  * limit submitters to one
- motion detail:
  * show ol flush left
  * use 2 or 3 columns in meta box
  * use small buttons for line numbering controls
  * group line number controls in grey tool bar.
  * Show motion comments div only if user is allowed.
- motion config:
  * Deativate comments by default.
  * Deactivate recommendations for motions by default.
- item detail: Show needed buttons only.
- assignment detail: Improve ballot tabs.
- general:
  * move pdf button to right
  * move 'back to overview' button to left
  * update label vor countdown option
 2016-10-04 10:51:19 +02:00
Oskar Hahn
c4f6477a4d Merge pull request #2475 from normanjaeckel/FixBroadcast 
Fixed broadcast. Fixed #2467.
 2016-10-01 15:49:07 +02:00
Norman Jäckel
2e7555e720 Fixed broadcast. Fixed #2467. 2016-10-01 14:37:04 +02:00
Oskar Hahn
962deca506 Send full_data through the channel. 
Saves db queries.
 2016-10-01 13:57:53 +02:00
Oskar Hahn
97bd526dd7 Fix config cache key 2016-10-01 12:37:43 +02:00
Oskar Hahn
98bab9b358 Fix tests and remove old code. 2016-10-01 01:49:27 +02:00
Norman Jäckel
039795beb7 Refactored projector requirements system for autoupdate. 2016-10-01 01:49:17 +02:00
Oskar Hahn
ac9c9f4ec3 More tests, development instructions and small changes. 2016-10-01 01:48:30 +02:00
Norman Jäckel
7cd70a568c Added docstrings. Small changes. 2016-10-01 01:48:18 +02:00
Oskar Hahn
368873e738 Adds a cache system to the CollectionElement and add 
a Collection class that can be used to call a collection
used this for the list and receive rest api.
 2016-09-30 21:37:52 +02:00
Emanuel Schuetze
720c7e76a5 Hot fix for broadcast (will improved later). 2016-09-30 21:20:30 +02:00
Emanuel Schuetze
6f2a509ebf Fix mediafile control buttons for fullscreen and play. 2016-09-30 19:59:53 +02:00
Norman Jäckel
8427ffd816 Small changes for multiple projector feature. 2016-09-30 19:11:33 +02:00
Finn Stutzenstein
e6b9b21d41 Added support for multiple projectors. 2016-09-30 18:58:59 +02:00
Emanuel Schütze
447d475321 Merge pull request #2461 from FinnStutzenstein/minorFixes 
some minor fixes
 2016-09-30 17:37:27 +02:00
Norman Jäckel
188f605973 Merge pull request #2446 from tsiegleauq/issue2441-LineNumberBlankText 
PDF line numbers for new linenumbering.js (fixes #2441)
 2016-09-30 17:35:53 +02:00
Emanuel Schuetze
8f24039493 Remark for PR#2446: Check if 'highlight' is undefined. 2016-09-29 14:46:32 +02:00
FinnStutzenstein
84cd3dbc77 little fixes 2016-09-28 19:27:40 +02:00
Norman Jäckel
f4c6c35584 Merge pull request #2449 from emanuelschuetze/fixTranslations 
Minor fixes
 2016-09-28 13:17:59 +02:00
Emanuel Schuetze
4732c64617 Minor fixes 
- Fix translation strings.
- Fix dropdown style in motion table.
 2016-09-27 15:21:52 +02:00
sean
7ea1a7e481 PDF line numbers for new linenumbering.js (fixes #2441) 2016-09-27 12:59:21 +02:00
Emanuel Schütze
4a5aea0b81 Merge pull request #2444 from FinnStutzenstein/Issue2442 
Hotfix for issue #2442
 2016-09-27 12:03:32 +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
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
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
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
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