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

252 Commits

Author SHA1 Message Date
Emanuel Schütze
405fb1b9d1 Merge pull request #2733 from normanjaeckel/CategorySort 
Category sort
 2016-12-05 13:24:45 +01:00
Norman Jäckel
e180b1df29 Fixed sorting of motions in a category. Changed identifiers of amendments during sorting. Fixed #2701. 2016-12-05 12:59:46 +01:00
Tobias Hößl
940fb14ad6 Typo in variable name 2016-12-03 14:50:39 +01:00
Emanuel Schütze
486f0601eb Merge pull request #2721 from FinnStutzenstein/AgendaTable 
Agenda table
 2016-12-02 15:59:57 +01:00
FinnStutzenstein
ee5adb8fd2 New AgendaTable 2016-12-02 15:18:32 +01:00
Emanuel Schütze
a1e33b99d4 Merge pull request #2718 from normanjaeckel/ApplyMotionText 
Changed config to apply motion text for new amendmend. Closed #2714.
 2016-12-02 08:51:46 +01:00
Norman Jäckel
81a01156c1 Changed config to apply motion text for new amendmend. Closed #2714. 2016-12-02 00:12:37 +01:00
Emanuel Schütze
52b9c651bb Fixed motion pdf layout 
for voting result and summary change recommendations
 2016-12-01 22:56:42 +01:00
Norman Jäckel
59599bfba0 Merge pull request #2712 from emanuelschuetze/fixes 
Minor fixes (Fixes #2710)
 2016-12-01 14:42:56 +01:00
Norman Jäckel
639978a5dc Refactor motion ans assignment percent and majority calculation. 2016-12-01 14:35:35 +01:00
Maximilian Krambach
32aaaf5b9e Majority calculation for assignments. 
Majorities when config YN(A) and simple voting method.
 2016-12-01 14:35:35 +01:00
Emanuel Schütze
670251fba9 Minor fixes (Fixes #2710) 
- motion form: show supporters field
- motion block slide: show motion identifiers in columns
- item list: show open link for motion blocks
- use right pdfmake-dist name in bower.json
 2016-12-01 14:29:31 +01:00
Emanuel Schütze
9440842e6a Merge pull request #2708 from emanuelschuetze/issue2626 
Improved wording for recommendation config (Fixes #2626)
 2016-12-01 11:29:29 +01:00
Emanuel Schütze
80f4cf8f2d Improved wording for recommendation config (Fixes #2626) 
- updated config label and helptext
- added recommendation also to motion slide
 2016-12-01 11:05:11 +01:00
Norman Jäckel
de00e35064 Merge pull request #2704 from tsiegleauq/motionDiffBox 
Adds the diff-summary box for motions
 2016-12-01 10:25:05 +01:00
Norman Jäckel
6aa3ea0d63 Merge pull request #2627 from CatoTH/change-recommendations-inline-diff 
Showing Diff inline
 2016-12-01 10:24:18 +01:00
Emanuel Schütze
5ab8b3172b Merge pull request #2699 from normanjaeckel/TrivialChange 
Fixed trivial change (disable versioning) checkboxes.
 2016-11-30 21:39:50 +01:00
Emanuel Schütze
c466af760c Motion PDF: Fix line numbers and style in summary box. 2016-11-30 21:13:12 +01:00
Emanuel Schütze
17c464bafa Merge pull request #2688 from FinnStutzenstein/AssignmentsTable 
New assignment and mediafile tables and table generics
 2016-11-30 14:29:13 +01:00
Sean Engelhardt
8f0c419c3e Adds the diff-summary box for motions 2016-11-30 14:29:09 +01:00
Norman Jäckel
e601ee8e24 Fixed trivial change (disable versioning) checkboxes. 2016-11-29 16:39:54 +01:00
FinnStutzenstein
4f717b6610 New assignment and mediafile tables and table generics 2016-11-29 16:29:29 +01:00
Emanuel Schütze
5312d44235 Merge pull request #2651 from CatoTH/editing-change-recommendations 
Editing change recommendations
 2016-11-28 21:31:22 +01:00
Emanuel Schütze
b11463fc60 Merge pull request #2690 from CatoTH/bugfix-incorrectly-merging-words 
Bugfix for merging change recommendations
 2016-11-28 21:28:38 +01:00
Emanuel Schütze
a30085f756 Merge pull request #2632 from CatoTH/explicitly-enter-change-recommendation-type 
Allow to explicitly set the type of a change recommendation
 2016-11-28 20:57:21 +01:00
Emanuel Schütze
ddfafd327b Merge pull request #2655 from CatoTH/Issue2615-line-selection-improvements 
A small tooltip after selecting the first line when creating a change recommendation
 2016-11-28 20:45:07 +01:00
Emanuel Schütze
b971c8db54 Merge pull request #2691 from emanuelschuetze/dialog-improvements 
Improved forms in ng-dialogs.
 2016-11-28 20:41:20 +01:00
Emanuel Schütze
e865cfe105 Improved forms in ng-dialogs. 
- users: use form field in grid layout and add more option
  to reduce scrolling of long dialog.
- agenda/motions/assignment: show parent agenda item field for create
  dialog only (to prevent corrupt agenda by action 'set my child item as my new
  parent item')
- refactor ng dialog and formly code.
 2016-11-27 22:57:56 +01:00
Tobias Hößl
bce74cac2f Bugfix for merging change recommendations 2016-11-26 21:48:56 +01:00
Tobias Hößl
2958a401ad Showing Diff inline 2016-11-26 16:50:32 +01:00
Tobias Hößl
f380f63851 A proposition so mitigate #2615 2016-11-26 12:34:26 +01:00
FinnStutzenstein
51cab5a8c9 Missing changes from PR 2678 2016-11-25 13:23:07 +01:00
Norman Jäckel
d068765db9 Merge pull request #2678 from CatoTH/goto-line-numbers-always-available 
Make line highlighting and 'Goto'-Feature available on all modes
 2016-11-24 00:09:22 +01:00
Tobias Hößl
fd82ae348e Editing change recommendations 2016-11-23 23:42:24 +01:00
Tobias Hößl
c888419527 Make line highlighting and 'Goto'-Feature available on all modes 2016-11-20 21:55:03 +01:00
Tobias Hößl
ec635d97ee Bugfix: Affected lines were selectable right after creating a change recommendation 2016-11-19 13:33:06 +01:00
Tobias Hößl
f9325069cf Bugfix: Calling editing dialog during inline editing 2016-11-19 13:19:08 +01:00
Tobias Hößl
771f087ade Allow to explicitly set the type of a change recommendation 2016-11-19 11:57:54 +01:00
Norman Jäckel
9375727f1f Merge pull request #2631 from CatoTH/change-change-recommendation-views 
Overhaul change recommendation statuses
 2016-11-18 10:49:38 +01:00
FinnStutzenstein
e0f78b16a0 New table design for users 2016-11-18 09:42:29 +01:00
Tobias Hößl
32d3d804b1 Overhaul change recommendation statuses 2016-11-16 22:42:22 +01:00
Emanuel Schütze
f9f9934722 Fixed missplaced comma in pdf header (Fixed #2639) 2016-11-16 21:05:04 +01:00
Norman Jäckel
35e54eecbd Merge pull request #2629 from CatoTH/Issue2617-switch-back-to-original-view 
Switch back to original view after deleting last change recommendation (Closes #2617)
 2016-11-15 23:14:03 +01:00
Norman Jäckel
5899c41840 Merge pull request #2628 from CatoTH/bugfix-wrong-caching-of-extracted-lines 
Bugfix: Caching of extracted line numbers was invalid…
 2016-11-15 23:13:13 +01:00
Emanuel Schütze
4d54a2b575 Merge pull request #2622 from FinnStutzenstein/Issue2566 
Hotfix for Issue #2566
 2016-11-15 20:24:47 +01:00
Emanuel Schütze
b9a325ba5d Merge pull request #2620 from FinnStutzenstein/Issue2590 
Highlighting motions for multiprojector and move httpProvider (fixes …
 2016-11-15 20:21:19 +01:00
FinnStutzenstein
4b8fc5fa19 Highlighting motions for multiprojector and move httpProvider (fixes #2590) 2016-11-15 13:09:56 +01:00
FinnStutzenstein
1ca390876b Hotfix for Issue #2566 2016-11-15 11:40:59 +01:00
Emanuel Schütze
4e1fdc6b22 Updated PDF layout 
- use default font for pdf from vfs_font.js
  remove base64 encoding function on server side
- use recommendation config value in motion detail template
 2016-11-14 18:52:50 +01:00
Emanuel Schütze
ff359ea629 Improved assignments and motions pdf. 
Load all users in pdfmake function - not in state resolver of
assignment list.
 2016-11-14 17:55:50 +01:00
Tobias Hößl
fca2605a2b Switch back to original view after deleting last change recommendation 2016-11-13 11:45:22 +01:00
Tobias Hößl
4ac7f48bec Bugfix: Caching of extracted line numbers was invalid when a fragment was passed as an argument 2016-11-13 10:20:00 +01:00
Sean Engelhardt
7069326655 ElectionList over PdfMake 2016-11-09 20:23:01 +01:00
Emanuel Schütze
92a9a36188 Template fixes. 
- Improved motion majority calculation form.
- Show special values without percentage.
- Fix JS errors.
 2016-11-08 12:14:24 +01:00
Emanuel Schütze
7ce479a511 Merge pull request #2535 from emanuelschuetze/state-recommendation-extra-fields 
Added new motion state flags to show an additional fields
 2016-11-02 00:19:32 +01:00
Emanuel Schütze
befb8083bf Merge pull request #2537 from CatoTH/line-number-and-diff-caching 
Caching results of insertLineNumbers and extractRangeByLineNumbers
 2016-11-01 23:41:29 +01:00
Emanuel Schütze
b08ca4be02 Merge pull request #2534 from tsiegleauq/electionsListPdfMake 
Creates the Election documents using PdfMake
 2016-11-01 23:40:42 +01:00
Emanuel Schütze
78765ae9ed Added new motion state flags to show an additional fields 
... to extend state name and recommendation label.
Hide forState and forRecommendation fields in motion form and detail
view (comment section).
 2016-11-01 23:37:39 +01:00
Tobias Hößl
36e519a798 Caching results of insertLineNumbers and extractRangeByLineNumbers 2016-11-01 23:29:32 +01:00
Sean Engelhardt
14ca655aa2 Creates the Election documents using PdfMake 2016-11-01 23:18:19 +01:00
Norman Jäckel
b0ff8375a8 Merge pull request #2539 from CatoTH/bugfix-open-motions-in-original-view 
Bugfix: Always open motions in original view
 2016-11-01 22:56:33 +01:00
Emanuel Schütze
41a4e35592 Use tinymce editor for motion comment fields. 2016-11-01 17:37:32 +01:00
Tobias Hößl
efe90c4e4d Always open motions in original view 2016-10-29 14:30:25 +02:00
FinnStutzenstein
fc21713bb4 Adding sortingoptions for creationdate and last modified (closes #2448) 2016-10-25 10:03:01 +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
Tobias Hößl
228abf5cee Change recommendations 2016-10-17 19:37:32 +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
Sean Engelhardt
345328357f Generate agendas using pdfmake 2016-10-11 18:10:33 +02:00
Sean Engelhardt
5040caba5c moves pdfmake related code in own files (fixes #2307) 2016-10-05 11:27:22 +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
4075c1aa3f Fixed translations strings. Updated template-en.pot. 2016-10-04 12:04:55 +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
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 Schuetze
8f24039493 Remark for PR#2446: Check if 'highlight' is undefined. 2016-09-29 14:46:32 +02:00
sean
7ea1a7e481 PDF line numbers for new linenumbering.js (fixes #2441) 2016-09-27 12:59:21 +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
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
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
256a8d9203 Small style changes. 2016-09-23 15:53:04 +02:00
Maximilian Krambach
e8fa0eca5a New calculate percentage options (fixes issue #2182) 2016-09-23 14:45:49 +02:00
Finn Stutzenstein
d13e11beb1 New ui element for comments in config (closes #2348) 2016-09-23 14:37:13 +02:00
FinnStutzenstein
448756f17a Docx export with docxtemplater 2016-09-23 14:20:07 +02:00
FinnStutzenstein
ceb9e70f6e Updating lodash (fixes #2293) 2016-09-22 12:34:53 +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
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
Sean Engelhardt
cc5ff21005 Add line numbers to pdf (fixes #2300) 2016-09-20 11:34:19 +02:00
Oskar Hahn
6abb0976c2 Change system for autoupdate on the projector (#2394) 
* Second websocket channel for the projector

* Removed use of projector requirements for REST API requests.

Refactored data serializing for projector websocket connection.

* Refactor the way that the projector autoupdate get its data.

* Fixed missing assignment slide title for hidden items.

* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.

* Created CollectionElement class which helps to handle autoupdate.
 2016-09-17 22:26:23 +02:00
Norman Jäckel
27223c35d9 Merge pull request #2364 from CatoTH/motion-detail-behaviour-services 
Move inline editing methods into a separate service
 2016-09-17 12:17:31 +02:00
Emanuel Schuetze
485c6ece87 Motion comment permission fixes on server and client. 
- Show motion comment fields in form also for users without can_manage but with
  can_see_and_manage_comments permission.
- Ignore comments data if user is not allowed to send comments (in create view).
 2016-09-16 23:35:37 +02:00