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
Norman Jäckel
7e45e8a9a5
Merge pull request #2689 from FinnStutzenstein/lineNumberFix
...
Missing changes from PR 2678
2016-11-28 20:37:05 +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
Emanuel Schütze
fb646df1fd
Merge pull request #2680 from FinnStutzenstein/MultiprojectorThings
...
Some improvements for Multiprojector
2016-11-25 15:45:40 +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
Emanuel Schütze
14d00cc404
Merge pull request #2649 from CatoTH/bugfix-disabling-inline-editing
...
Bugfix disabling inline editing
2016-11-23 22:03:31 +01:00
FinnStutzenstein
88537cf67e
Some improvements for Multiprojector
2016-11-21 15:01:54 +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
FinnStutzenstein
0cc8a81320
countdown and message models ( closes #2464 )
2016-11-19 12:37:33 +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
e8bf67b185
Merge pull request #2637 from emanuelschuetze/fix-translations
...
Fixed missing translations (Fixed #2616 , fixed #2625 )
2016-11-15 23:27:02 +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
f8958e36a6
Fixed missing translations ( Fixed #2616 , fixed #2625 )
2016-11-15 21:18:06 +01:00
Emanuel Schütze
2399a8121a
Merge pull request #2634 from normanjaeckel/FixMotionComment
...
Fixed motion projector if comment field is None. Fixed #2614 .
2016-11-15 21:01:24 +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
18accc58ae
Merge pull request #2610 from tsiegleauq/electionListPdfMake
...
ElectionList over PdfMake
2016-11-14 18:05:03 +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
Norman Jäckel
5a78f1c510
Fixed motion projector if comment field is None. Fixed #2614 .
2016-11-14 13:16:34 +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
Emanuel Schütze
e49411250a
Merge pull request #2558 from FinnStutzenstein/Issue2462
...
change all isProjected functions (closes #2462 )
2016-11-11 15:57:56 +01:00
Norman Jäckel
67aa92a7ac
Merge pull request #2619 from FinnStutzenstein/Issue2573
...
No overrun of identifier col in motion table (closes #2573 )
2016-11-11 13:21:25 +01:00
FinnStutzenstein
133d0c3a0f
fixing motion block list layout
2016-11-11 10:59:38 +01:00
FinnStutzenstein
fbeacd97f8
No overrun of identifier col in motion table ( closes #2573 )
2016-11-11 09:40:30 +01:00
Sean Engelhardt
7069326655
ElectionList over PdfMake
2016-11-09 20:23:01 +01:00
Norman Jäckel
db38e5e075
Merge pull request #2476 from ostcar/remove_serverside_pdf
...
Removed old code needed be the server to serve pdf
2016-11-08 15:12:45 +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
Oskar Hahn
7281aa57b8
Removed old code needed be the server to serve pdf
2016-11-07 15:54:29 +01:00
Norman Jäckel
8c4a69dfb2
Merge pull request #2570 from emanuelschuetze/fix-inmemory-cache
...
Fix updating of motion comments for inmemory cache.
2016-11-02 14:24:30 +01:00
Emanuel Schütze
2c09b409d7
Fix updating of motion comments for inmemory cache.
...
get_restricted_data() has to use deepcopy(full_data) instead of
full_data.copy().
2016-11-02 14:07: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
Norman Jäckel
50868d1432
Merge pull request #2567 from emanuelschuetze/fix-translation-strings
...
Fixed translation issues.
2016-11-01 23:58:43 +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
Emanuel Schütze
4b124a629b
Fixed translation issues.
2016-11-01 23:32: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
FinnStutzenstein
58dd2f2b30
change all isProjected functions ( closes #2462 )
2016-11-01 10:31:28 +01:00
Tobias Hößl
efe90c4e4d
Always open motions in original view
2016-10-29 14:30:25 +02:00
Norman Jäckel
f5b37c1b84
Merge pull request #2530 from emanuelschuetze/pagination
...
Fix pagination and indentation of lists in import views.
2016-10-26 14:55:44 +02:00
Emanuel Schütze
4646cebe55
Merge pull request #2526 from FinnStutzenstein/Issue2448
...
Adding sortingoptions for creation date and last modified (closes #2448 )
2016-10-25 14:53:58 +02:00
Emanuel Schütze
435e333bbb
Fix pagination and indentation of lists in import views.
2016-10-25 13:45:54 +02:00
FinnStutzenstein
fc21713bb4
Adding sortingoptions for creationdate and last modified ( closes #2448 )
2016-10-25 10:03:01 +02:00
Norman Jäckel
9ca15fd0b8
Fixed migrations by skipping autoupdate.
2016-10-24 10:42:34 +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
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
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
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
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 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
Norman Jäckel
039795beb7
Refactored projector requirements system for autoupdate.
2016-10-01 01:49:17 +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
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
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
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
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
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
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
Norman Jäckel
dc404d21f6
Implemented need_full_update check. Fixed #2396 .
2016-09-23 14:36:26 +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
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
Emanuel Schuetze
a7f5d4dd3c
Fixed syntax of all uib-alerts.
...
Required after ui-bootstrap upgrade.
2016-09-18 21:09:37 +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
Norman Jäckel
76250c5851
Changed loading of JavaScript files.
2016-09-18 11:23:51 +02:00
Emanuel Schütze
cdf6b79a36
Updated confirm message.
2016-09-18 11:03:30 +02:00
Emanuel Schuetze
852b175f3e
Upgraded a lot of javascript libs.
...
Some template fixes required for upgrading ui-bootstrap.
2016-09-18 00:45:00 +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
Emanuel Schuetze
d1458dcca1
Fixed motion form to save form with default text ( Fixes #2069 ).
...
Use workaround: Added 'novalidate' to motion form. Otherwise user
can't save form if text editor field contains default value.
2016-09-17 15:45:59 +02:00
Norman Jäckel
5f65830d47
Reconnect autoupdate after some migrations. Fixed #2377 .
2016-09-17 13:36:32 +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
Norman Jäckel
ca9c946b6f
Merge pull request #2390 from emanuelschuetze/agend-item-check
...
Template checks if user has no permission to see agenda items.
2016-09-17 11:00:53 +02:00
Emanuel Schuetze
c55e55e91b
Template checks if user has no permission to see agenda items.
2016-09-17 10:17:40 +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
FinnStutzenstein
bdeeb53f9b
Confirm multiple deletions ( fixes #2384 )
2016-09-15 14:48:03 +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
Norman Jäckel
e9c5194a17
Merge pull request #2303 from emanuelschuetze/template-hook
...
Added new template hook for motion detail template.
2016-08-24 09:35:27 +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
Emanuel Schuetze
984282deac
Added new template hook for motion detail template.
2016-08-23 23:08:17 +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
Norman Jäckel
5ea9cbf4d1
Merge pull request #2289 from emanuelschuetze/motionpdf
...
Minor motion PDF improvements.
2016-08-19 22:42:56 +02:00
Emanuel Schuetze
8a329a81e6
Minor motion PDF improvements.
2016-08-19 22:13:12 +02:00
Norman Jäckel
70a732bce8
Merge pull request #2280 from normanjaeckel/TemplateHook
...
Added template hooks for plugins.
2016-08-19 21:13:55 +02:00
Norman Jäckel
c38cf562d5
Added template hooks for plugins.
2016-08-19 21:08:54 +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
Norman Jäckel
b0070d13b9
Added possibility to sort motions in category numbering view.
2016-08-16 23:51:12 +02:00
Norman Jäckel
d3cd2d72dc
Merge pull request #2225 from normanjaeckel/NumberCategories
...
Added viewpoint to number all motions in a category.
2016-07-29 12:30:09 +02:00
Norman Jäckel
7e6dc50b39
Added viewpoint to number all motions in a category.
2016-07-29 11:56:12 +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
207db4de89
Merge pull request #2186 from tsiegleauq/issue2164
...
Add translatable entries for QuickEdit (Fixes #2164 )
2016-07-10 23:24:36 +02:00
Sean Engelhardt
520f8362fa
Add translatable entries for QuickEdit ( Fixes #2164 )
2016-06-28 14:06:46 +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
Joel Macht
b7d83e786f
Fix linebreak on tags, add spacing and remove commas ( Fixes #2147 )
2016-06-10 18:17:42 +02:00
Maximilian Krambach
5061ea1770
typo fixing (issue #2181 )
2016-06-08 22:18:35 +02:00
Norman Jäckel
13e7e1b1e1
Merge pull request #2176 from tsiegleauq/issue2133
...
Limit selection of files to csv and txt (Fixed #2133 )
2016-06-08 10:41:52 +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
Norman Jäckel
294fb7ebc5
Fixed motion PDF if motions have no identifier. Fixed #2158 .
2016-06-06 14:26:16 +02:00
Oskar Hahn
2221b23447
Redesign of the config variables.
...
Removed the config cache and created files for each app in which the
config variables are defined.
2016-06-03 13:47:54 +02:00
Emanuel Schuetze
06d333c067
Template fixes for better smartphone usage.
...
- Remove on-focus-me directive on every list view.
(Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
on small devices.
- Add z-index for projector sidebar. Show it in full width on small
devices.
- Remove padding on small devices.
2016-04-17 19:56:38 +02:00
Norman Jäckel
8d5e983d29
Merge pull request #2077 from emanuelschuetze/translations
...
Translations
2016-04-12 23:47:38 +02:00
Emanuel Schuetze
7229c8dc3a
Fix translation strings.
2016-04-12 22:47:46 +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
Emanuel Schuetze
85ffe4d8fa
Catch JS error "this.getVersion(...) is undefined" ( Fixes #2048 )
2016-03-20 20:52:34 +01:00
Emanuel Schuetze
5e08e073f4
Fix translation strings in motions and users forms.
2016-03-19 13:06:36 +01:00
Emanuel Schuetze
03f08628c7
Catch 404 errors in resolve promise if user has not all required permissions.
...
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string
Fixes #2028 . Fixes #2038 .
2016-03-18 21:41:16 +01:00
Emanuel Schuetze
89446ce4f6
Use angular-chosen instead of ui-select for better performance.
...
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/
Use input delay on users filter field with 'debounce'.
Fixed #2006 .
2016-03-18 14:37:03 +01:00
Norman Jäckel
132c6e81ec
Forwarding JSON instead of Django model instances to autoupdate loop.
...
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
2016-03-06 14:24:53 +01:00
Norman Jäckel
4daa61888f
Massive refactoring for autoupdate optimization.
2016-03-06 14:22:40 +01:00
Norman Jäckel
de871f3f9c
Squished migrations files.
2016-03-02 14:26:47 +01:00
Emanuel Schütze
8d1de6923b
Merge pull request #2017 from normanjaeckel/FixMotionPoll
...
Fixed error in motion poll serializer. Fixed #2014 .
2016-02-28 00:21:04 +01:00
Norman Jäckel
bc49f00c66
Fixed error in motion poll serializer. Fixed #2014 .
2016-02-27 21:34:26 +01:00
Norman Jäckel
872d73b5cf
Merge pull request #2016 from normanjaeckel/GetContext
...
Rename and refactor some ProjectorElement methods. Fixed #1631 .
2016-02-27 21:24:18 +01:00
Norman Jäckel
a2a6637c89
Rename and refactor some ProjectorElement methods. Fixed #1631 .
2016-02-27 20:56:03 +01:00
Emanuel Schuetze
1d314db487
Show special vote values for motion polls on projector.
2016-02-27 20:10:24 +01:00
Emanuel Schütze
88b2e8a73e
Merge pull request #2000 from normanjaeckel/VotesQuery
...
Optimized number of queries for motion serializing. Fixed #1655 .
2016-02-24 11:10:11 +01:00
Norman Jäckel
758180e7cc
Optimized number of queries for motion serializing. Fixed #1655 .
2016-02-24 10:30:52 +01:00
Norman Jäckel
544b28cacf
Fixed coding style in some JS files. Fixed #1979 .
2016-02-24 09:56:27 +01:00
Norman Jäckel
9a94dfc735
Merge pull request #1993 from emanuelschuetze/fix1710
...
Added motion poll pdf (Fixes #1710 ).
2016-02-23 22:38:28 +01:00
Emanuel Schuetze
eebb621a98
Added motion poll pdf ( Fixes #1710 ).
2016-02-23 22:27:03 +01:00