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

214 Commits

Author SHA1 Message Date
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
Tobias Hößl
2605239244 Move inline editing methods into a separate service 2016-09-08 19:22:09 +02:00
Emanuel Schütze
2753af3585 Merge pull request #2277 from FinnStutzenstein/FeatureCSV 
Improved motions table with CSV export
 2016-09-08 14:47:54 +02:00
Finn Stutzenstein
a05a29c99a A new motions table with csv export 2016-09-08 14:38:32 +02:00
Norman Jäckel
ddc1f5d0b9 Merge pull request #2367 from emanuelschuetze/motionCommentFixes 
Fixes and template improvements for motion comments.
 2016-09-08 13:24:08 +02:00
Maximilian Krambach
bcd15d2691 moved MotionComment factory to base.js 2016-09-08 11:25:03 +02:00
Emanuel Schuetze
9ed37c00af Fixes and template improvements for motion comments. 
Fixed erros while creating motion as anonymous user.
 2016-09-08 11:18:56 +02:00
Norman Jäckel
4bed8f6c11 Added recommendations for motions. 
Also changed label of former state 'commited a bill' to 'refered to committee'. Fixed #2342.
 2016-09-07 23:46:38 +02:00
Norman Jäckel
ab845b4137 Added generic fields for comments for motions. 2016-09-07 20:43:00 +02:00
sean
23b7d74890 create ballot papers with pdfmake (fixes #2298) 2016-09-06 16:08:25 +02:00
Norman Jäckel
0fddfdd25a Merge pull request #2356 from emanuelschuetze/fix 
Fixed missing translation and form errors.
 2016-09-06 00:33:40 +02:00
Emanuel Schuetze
d7b092300d Fixed missing translation and form errors. 2016-09-05 23:13:07 +02:00
Tobias Hößl
a341071e91 Line-Breaking Bugfix: break before an inline element if the first word of the element exceeds the current line 2016-09-05 20:31:43 +02:00
Norman Jäckel
b4d4026316 Refactored user serializers for different client permissions. See #1871. 2016-09-05 13:48:06 +02:00
Emanuel Schuetze
e87eb930df Use neutral (untranslated) prefix for amendments. 
Reason: Server cannot use the on client-side translated prefix string.
 2016-08-31 12:05:33 +02:00
Norman Jäckel
09aa2dea72 Review. 2016-08-29 17:15:44 +02:00
Norman Jäckel
6fba75c78b Reimplemented amendments for motions. 2016-08-29 17:14:40 +02:00
Norman Jäckel
70dfe8f525 Merge pull request #2331 from emanuelschuetze/issue2182b 
Motion config: 'calculate % without abstains' (Fixes #2182)
 2016-08-29 16:59:12 +02:00
Emanuel Schuetze
65b0772556 Some clean up and styling work for motion config 'without abstains'. 
Manage all config strings in site.js of each app.
 2016-08-29 16:40:27 +02:00
Maximilian Krambach
fc1ce3d90d added option to calculate % based on Yes/No (for motions) (fixes #2182) 2016-08-29 13:07:57 +02:00
Maximilian Krambach
126cfb9000 Parent items for Agenda items (fixes #2213) 2016-08-25 13:51:54 +02:00
Emanuel Schütze
5a092710c9 Merge pull request #2286 from FinnStutzenstein/Issue2075 
Fixing motion CSV import (fixes #2075, fixes #2165)
 2016-08-23 23:17:32 +02:00
Finn Stutzenstein
0c5726b5d4 Fixing CSV import (fixes #2075, fixes #2165) 2016-08-22 16:01:57 +02:00
Emanuel Schütze
73095948ca Merge pull request #2260 from FinnStutzenstein/Feature435 
New matrix interface for group editing (closes #435)
 2016-08-22 15:26:10 +02:00
Finn Stutzenstein
bf3a1ce714 New matrix interface for group editing (closes #435) 2016-08-22 15:05:06 +02:00
Tobias Hößl
d986d551e0 Line numbers and inline editing 2016-08-20 11:18:17 +02:00
Emanuel Schuetze
8a329a81e6 Minor motion PDF improvements. 2016-08-19 22:13:12 +02:00
Thomas Junk
92a541215f pdfmake incl. fixes 2016-08-19 16:21:46 +02:00
Thomas Junk
546c4e65f6 PDFMake implemented 2016-08-19 14:10:30 +02:00
Finn Stutzenstein
cd1a2735dc fixes an important typo in category sort 2016-08-19 09:17:28 +02:00
Finn Stutzenstein
ee95af9acc Added a possibility to sort and renumber all motions in a category 2016-08-18 14:54:09 +02:00
Emanuel Schuetze
af16733b36 Use origin field in motion detail and list view (Fixes #2227) 2016-07-27 16:16:22 +02:00
Norman Jäckel
0b9a64f968 Added motion origin field. 2016-07-13 14:45:40 +02:00
Norman Jäckel
b45e0ea09f Fixed coding style. 2016-06-16 10:28:14 +02:00
Maximilian Krambach
a5a00a7eda Config translations moved to client side (Issue #2093) 2016-06-12 11:46:46 +02:00
Sean Engelhardt
62310c83ae Limit selection of files to csv and txt (Fixed #2133) 
agenda, motions, users csv import
 2016-06-07 11:34:02 +02:00
Emanuel Schuetze
07d95fd10a Allow to show vote value '0' in motion poll result view. 2016-04-12 22:26:13 +02:00
Norman Jäckel
e2383dc770 Merge pull request #2051 from emanuelschuetze/templateFixes2 
Template improvements
 2016-03-20 21:21:52 +01:00
Norman Jäckel
7cba7c42a4 Merge pull request #2055 from emanuelschuetze/fix2048 
Catch JS error "this.getVersion(...) is undefined" (Fixes #2048)
 2016-03-20 21:06:39 +01:00