FinnStutzenstein
da89bf5a83
Usability improvements
2017-02-22 16:58:52 +01:00
Emanuel Schütze
e1075eb24d
Minor fixes from previous pull request reviews.
2017-02-21 15:56:41 +01:00
Norman Jäckel
ebf9278b79
Merge pull request #2990 from emanuelschuetze/fixProjection
...
Fix motion projection.
2017-02-20 20:38:59 +01:00
Emanuel Schütze
d79cea9a8b
Fix motion projection.
2017-02-20 18:44:37 +01:00
Norman Jäckel
1e9c7273ae
Merge pull request #2987 from emanuelschuetze/issue2963
...
Fixed placement of 'back' button in motion block view (Fixed #2963 ).
2017-02-18 00:06:00 +01:00
Emanuel Schütze
58f499283f
Fixed translation strings.
2017-02-17 23:21:50 +01:00
Emanuel Schütze
e4bd44082d
Fixed placement of 'back' button in motion block view ( Fixed #2963 ).
2017-02-17 22:32:17 +01:00
Emanuel Schütze
6bad8e8cc6
Merge pull request #2973 from FinnStutzenstein/Dialogs
...
Dialogs for some views
2017-02-17 22:20:59 +01:00
Norman Jäckel
582915a019
Merge pull request #2981 from emanuelschuetze/fix-motion-block-projector
...
Send also motion.state.workflow to motion block slide.
2017-02-17 21:44:56 +01:00
Emanuel Schütze
06e9ffc819
Send also motion.state.workflow to motion block slide.
...
to show recommendation names in slide template
2017-02-17 21:10:46 +01:00
Norman Jäckel
56420aa0f5
Merge pull request #2982 from emanuelschuetze/recommendation-config
...
Added new config for default change recommendation view.
2017-02-17 16:33:36 +01:00
Norman Jäckel
ee66ee3d72
Merge pull request #2979 from FinnStutzenstein/Issue2951
...
fixing #2951
2017-02-17 16:28:26 +01:00
Norman Jäckel
8adbb1218f
Merge pull request #2978 from FinnStutzenstein/MotionBlockAutoupdate
...
Fixing MotionBlock autoupdate and added projector button (fixes #2958 )
2017-02-17 16:27:22 +01:00
Emanuel Schütze
768ee9236a
Added new config for default change recommendation view.
...
Use this default view for motion catalog pdf and motion detail view.
2017-02-17 16:03:00 +01:00
FinnStutzenstein
735dbcf109
Better dialog handling. Many fixes.
2017-02-17 14:58:35 +01:00
FinnStutzenstein
a5398a491c
fixing #2951
2017-02-17 14:54:32 +01:00
FinnStutzenstein
0e401e7223
Fixing MotionBlock autoupdate and added projector button ( fixes #2958 )
2017-02-17 13:49:55 +01:00
Norman Jäckel
28a5c9ecaf
Merge pull request #2974 from emanuelschuetze/pdf-layout
...
Motion PDF improvements
2017-02-17 13:11:15 +01:00
Emanuel Schütze
46f6bbb907
Motion PDF improvements
...
* Use consistent lineheight (1.25) in PDF (also for lists).
* set default value of motions_line_length config to 90.
* Reduce footer height.
* Use identifier in filename only if available.
Added missing translation string.
2017-02-17 10:48:27 +01:00
Norman Jäckel
0319799aff
Merge pull request #2891 from normanjaeckel/CamelCase
...
Added support for CamelCase to RESTModelMixin. See #2480 .
2017-02-16 21:09:13 +01:00
Emanuel Schütze
d595e28d09
Merge pull request #2969 from CatoTH/Issue2961-bugfix
...
Solving two bugs in the diff - for #2961
2017-02-16 14:59:51 +01:00
Norman Jäckel
89192236fc
Added support for CamelCase to RESTModelMixin. See #2480 .
2017-02-16 13:31:57 +01:00
Emanuel Schütze
7a73b30189
More layout fixes for motion diff view slide.
...
- Fixed wrong text order.
- Improved change summary box.
2017-02-15 22:40:18 +01:00
Tobias Hößl
afff1f35f8
Solving two bugs in the diff
2017-02-15 20:23:29 +01:00
Emanuel Schütze
be342f752f
Merge pull request #2966 from emanuelschuetze/issue2956
...
Send only data to client which user is allowed to see (Fixed #2956 ).
2017-02-15 20:18:45 +01:00
Emanuel Schütze
3e92799838
Send only data to client which user is allowed to see ( Fixed #2956 ).
...
Fixed get_restricted_data functions for motion and mediafiles.
2017-02-15 16:51:44 +01:00
Sean Engelhardt
4eefde839b
pdf w.o linen numbers and change rec. ( fixes #2962 )
2017-02-15 14:23:28 +01:00
Emanuel Schütze
1230f4a29a
New full text search on client-side ( Fixed #2865 ).
...
Removed server-side search by whoosh.
2017-02-10 22:52:08 +01:00
Emanuel Schütze
311b134d81
Merge pull request #2939 from FinnStutzenstein/Encoding
...
Added UTF-8 byte order mark for csv export
2017-02-10 21:23:09 +01:00
FinnStutzenstein
30a3382bd1
Added UTF-8 byte order mark for csv export and global csv separator config
2017-02-10 20:47:57 +01:00
FinnStutzenstein
b73c50a4f9
Fixed missing <p> tags for motion import and some improvements.
2017-02-10 09:11:45 +01:00
Emanuel Schütze
f66e551eaa
Merge pull request #2936 from FinnStutzenstein/MotionReason
...
Set resaon on save with CKEditor (fixes #2934 )
2017-02-06 17:29:09 +01:00
FinnStutzenstein
bacadd6931
Set resaon on save with CKEditor ( fixes #2934 )
2017-02-06 14:50:51 +01:00
Emanuel Schütze
12b50a0d68
Merge pull request #2935 from emanuelschuetze/motion-pdf-subtitle
...
PDF Layout improvements
2017-02-06 14:44:06 +01:00
Emanuel Schütze
80b9ce138f
PDF Layout improvements
...
- Added parent motion into subtitle of motion pdf.
(for amendments only).
- Adapted page margin and footer.
- Use same line height also for outside line numbering.
- Add more margin-top for motion reason heading.
2017-02-06 14:22:13 +01:00
Emanuel Schütze
f238125a23
Fixed motion numbering in category sort view.
...
Removed blanks if MOTION_IDENTIFIER_WITHOUT_BLANK is True.
2017-02-06 12:11:50 +01:00
Emanuel Schütze
e7ee8fbc07
Fixed some minor template styles.
...
Use always css class 'btn-sm' for buttons and 'input-sm' for inputs in
list and detail templates for consistent appearance.
2017-02-03 12:50:57 +01:00
Emanuel Schütze
bbd8782c4c
Fix 'follow recommendation for all motions' function.
...
in motion block detail view
2017-02-03 12:50:52 +01:00
Emanuel Schütze
3d60238ce1
Fixed dynamic pdf header/footer and table border ( Fixed #2923 ).
...
Updated pdfmake to 0.1.25.
Fixed some pdf style issues.
Updated gulp watch task.
2017-02-03 11:33:46 +01:00
Emanuel Schütze
c8cd1a7210
Merge pull request #2917 from FinnStutzenstein/Worker
...
Use workers for pdf generation
2017-01-31 12:02:43 +01:00
FinnStutzenstein
e1b4c1fc68
Used worker for pdf generation.
...
Moved pdfmake.createPdf() into a web worker thread to prevent
blocking UI and max_script_runtime error in browser.
Used gulp to manage separate worker files (pdf-worker and pdf-worker-lib).
2017-01-30 23:03:29 +01:00
FinnStutzenstein
d55d374211
Prevent XSS-attacks ( fixes #2871 )
2017-01-30 21:04:41 +01:00
Emanuel Schütze
8234340a0c
Merge pull request #2909 from ostcar/rework_auth
...
Created a function to convert anything possible to a user-collection-element or None
2017-01-26 21:42:40 +01:00
Norman Jäckel
2872cd437c
Fixed bug in motion set_identifier method. Fixed #2911 .
2017-01-26 21:03:10 +01:00
Oskar Hahn
2daafa8db9
Created a function to convert anything possible to a user-collectoin-element or None
...
Changed user.has_perm(...) to has_perm(user, ...) at any place.
Removed old code
2017-01-26 18:57:10 +01:00
Emanuel Schütze
8897e22df0
Merge pull request #2907 from emanuelschuetze/pagination
...
Used better pagination for agenda, motions and users.
2017-01-25 21:23:45 +01:00
FinnStutzenstein
35903cbe97
Watch perms in client ( closes #1855 )
2017-01-25 20:19:25 +01:00
Emanuel Schütze
df3e691734
Used better pagination for agenda, motions and users.
...
to increase the browser performance while switching between apps.
2017-01-25 19:51:51 +01:00
FinnStutzenstein
9247009f1c
Csv export for IE ( closes #2898 )
2017-01-23 16:24:25 +01:00
FinnStutzenstein
2b8a1168e0
Removing unnecessary resolvers ( closes #2869 , closes #2892 )
2017-01-20 11:52:27 +01:00
Emanuel Schütze
b2dfc9b44e
Fixed translation strings.
2017-01-19 10:42:26 +01:00
FinnStutzenstein
2ac7df2ee6
Reorder projection of motions ( fixes #2883 )
2017-01-16 15:15:29 +01:00
Emanuel Schütze
e9e0280a13
Merge pull request #2878 from FinnStutzenstein/MotionProjectFix
...
Hotfix for motion projection
2017-01-15 13:42:06 +01:00
Emanuel Schütze
befff17969
Merge pull request #2873 from normanjaeckel/MotionCommentProtection
...
Fixed bug in relation for motion comment. Fixed #2568 .
2017-01-15 12:27:17 +01:00
Norman Jäckel
9250055e35
Merge pull request #2876 from emanuelschuetze/issue2763
...
Adapted motion DOCX template.
2017-01-15 12:21:27 +01:00
FinnStutzenstein
b419818b20
Hotfix for motion projection
2017-01-15 12:04:16 +01:00
Emanuel Schütze
986e8cc4f6
Adapted motion DOCX template ( Fixed #2763 ).
2017-01-15 10:59:09 +01:00
Norman Jäckel
f086d055b6
Fixed bug in relation for motion comment. Fixed #2568 .
2017-01-15 10:20:45 +01:00
Emanuel Schütze
624fcc663b
Merge pull request #2863 from FinnStutzenstein/StartUp
...
Start up
2017-01-14 21:46:16 +01:00
FinnStutzenstein
a6d1eeb9c3
Worked on startup process.
...
- fix group view on reload
2017-01-14 21:23:05 +01:00
Norman Jäckel
8bb0918372
Merge pull request #2825 from FinnStutzenstein/CsvImports
...
New csv import for users and topics
2017-01-14 20:52:09 +01:00
Oskar Hahn
ebf686ef34
Send all data to the client at startup
2017-01-14 20:42:38 +01:00
FinnStutzenstein
397d659f0b
New csv import for users and topics
2017-01-14 18:29:05 +01:00
Emanuel Schütze
458a7cf7c4
Merge pull request #2846 from normanjaeckel/MotionBlockSecu
...
Fixed motion create view. Fixed #2506 .
2017-01-14 12:10:51 +01:00
Norman Jäckel
a918361ec5
Fixed motion create view. Fixed #2506 .
2017-01-14 11:38:20 +01:00
Emanuel Schütze
35a5d4fe3b
Merge pull request #2839 from FinnStutzenstein/Issue2838
...
Fixing #2838
2017-01-14 10:40:57 +01:00
FinnStutzenstein
76e6bac422
Fixing #2838
2017-01-14 10:21:14 +01:00
Meinert Leinigen
d133199a73
Removed Recommendation motion summary
2017-01-13 21:28:03 +01:00
Oskar Hahn
728576d514
Performance improvements
...
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
2017-01-13 13:37:18 +01:00
FinnStutzenstein
b44b58393d
Motion comments inline editing
2017-01-11 20:59:50 +01:00
Emanuel Schütze
41124a53ca
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
...
Set settings value to False to disable new amendment button in motion detail
template. Default: True.
2017-01-09 14:25:28 +01:00
Emanuel Schütze
6502f36a90
Merge pull request #2796 from FinnStutzenstein/Issue2548
...
Project change recommendations
2017-01-09 09:27:46 +01:00
FinnStutzenstein
e8fa488d60
Project change recommendations
2017-01-07 14:48:11 +01:00
Emanuel Schütze
f4d468a6f6
Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
...
Allow to remove all whitespaces from motion identifier if settings
value is True. Default: False.
Example: "B 1 - Ä 1" -> "B1-Ä1"
2017-01-06 21:38:08 +01:00
Maximilian Krambach
a31ffd1009
print correct number of ballots ( closes #2504 )
2017-01-06 11:39:55 +01:00
FinnStutzenstein
f5fa3575df
New csv import using PapaParse
2017-01-06 10:50:03 +01:00
Emanuel Schütze
82396a784d
Fixing some remarks for CKEditor PR#2770
2016-12-16 21:43:19 +01:00
Tobias Hößl
08cb6a3d1b
Bugfix for line numbering with CKeditor
2016-12-16 21:43:19 +01:00
Maximilian Krambach
58b8066249
Going back from TinyMCE to CKEditor
...
- Update CKEditor toolbar
- CKEditor: new formating options and stripping empty paragraphs from imports
- fix for other clipboard html cases not beginning with 'p' tag
- Added RemoveFormat button to ckditor toolbar.
- Reorder bower.json
- inline editor and working on line numbers and language setting
- line numbering in inline edit
- changed allowed content, line number display, editor toggling
- included "justify" in ckeditor
- reload original text after ckeditor is disabled
- Reorder and extend ckeditor toolbar.
- fixed save button trigger and inserted a revert button
- set language on editor load (works for inline case only)
2016-12-16 21:43:19 +01:00
Norman Jäckel
cebfbf5b8d
Merge pull request #2633 from normanjaeckel/SquishMigrations
...
Prepare migrations for 2.1b1.
2016-12-13 23:28:56 +01:00
Emanuel Schütze
78361308aa
Updated EN+DE translations.
2016-12-13 12:20:14 +01:00
Norman Jäckel
3096958ba9
Prepare migrations for 2.1b1.
...
Agenda, Assignments, Core, Mediafiles, Motions, Users.
Topics are already done.
2016-12-13 11:58:36 +01:00
Norman Jäckel
c1d4927a9b
Merge pull request #2764 from FinnStutzenstein/Issue2754
...
More motion select mode options and layout changes for guests
2016-12-13 11:57:51 +01:00
FinnStutzenstein
dbdaa9748c
More motion select mode options and layout changes for guests
2016-12-13 11:27:44 +01:00
Emanuel Schütze
a9cc8fcb37
Some template style and translation fixes.
2016-12-12 20:30:50 +01:00
Norman Jäckel
99db9b71b7
Merge pull request #2760 from normanjaeckel/MotionTextIntro
...
Added global config for motion preamble.
2016-12-12 16:23:18 +01:00
Emanuel Schütze
32b7ddedce
Template fixes for motion preamble ( #2760 ).
2016-12-12 16:14:32 +01:00
Emanuel Schütze
2bf1b3d827
Merge pull request #2755 from normanjaeckel/StatePermission
...
Fixed state flag required permission to see.
2016-12-12 13:49:07 +01:00
Emanuel Schütze
8780c47fc1
Minor fixes ( Fixes #2750 )
...
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750 ).
- Apply category and motion block for new amendments.
2016-12-12 12:58:58 +01:00
Norman Jäckel
7772f60bd4
Added global config for motion preamble.
2016-12-12 12:51:27 +01:00
Norman Jäckel
6dc598800d
Fixed state flag required permission to see.
2016-12-11 22:02:16 +01:00
Emanuel Schütze
43cdfd3836
Merge pull request #2752 from FinnStutzenstein/MotionState
...
Adding 'done' option in motion state filter
2016-12-09 22:36:32 +01:00
Emanuel Schütze
8289306569
Merge pull request #2746 from emanuelschuetze/fonts
...
Use Roboto font in all templates.
2016-12-09 22:26:38 +01:00
Emanuel Schütze
0bef3d751e
Merge pull request #2742 from emanuelschuetze/missing-translations
...
Mark missing translation strings in table headers.
2016-12-09 15:22:03 +01:00
FinnStutzenstein
efaa00483c
Adding 'done' option in motion state filter
2016-12-09 15:18:35 +01:00
Norman Jäckel
c2edf134e2
Merge pull request #2751 from FinnStutzenstein/Issue2747
...
Some stylistic changes and new motion filter option
2016-12-09 15:16:50 +01:00
Emanuel Schütze
f6d01c1d17
Mark missing translation strings in table headers.
2016-12-09 15:13:35 +01:00
Emanuel Schütze
fb7b265826
Use Roboto font in all templates.
...
- Only install needed font files for Roboto and Roboto Condensed
which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
in app.css and projector.css.
- Remove Open Sans font.
2016-12-09 15:10:31 +01:00
FinnStutzenstein
acba95f8a4
changing user import ( closes #2666 )
2016-12-09 15:02:32 +01:00
FinnStutzenstein
f7fcb69cc2
Some stylistic changes and new motion filter option
2016-12-09 14:58:15 +01:00
FinnStutzenstein
eca93594d7
Moving csv exports in seperate files ( closes #2728 )
2016-12-09 08:08:38 +01:00
Norman Jäckel
4e5adb74e3
Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists
...
Attempt to mitigate the list / line number problem
2016-12-07 11:34:50 +01:00
Norman Jäckel
b27a975075
Merge pull request #2737 from FinnStutzenstein/Issue2730
...
Use session cookies and store filter settings in sessionStorage
2016-12-07 11:25:06 +01:00
FinnStutzenstein
acb5a6dcf9
Use session cookies and store filter settings in sessionStorage
2016-12-07 08:01:33 +01:00
Tobias Hößl
2cb1429c8d
First attempt to mitigate the list / line number problem
2016-12-06 22:12:29 +01:00
FinnStutzenstein
29ae600194
Dynamic webpage title
2016-12-05 18:00:52 +01:00
Emanuel Schütze
405fb1b9d1
Merge pull request #2733 from normanjaeckel/CategorySort
...
Category sort
2016-12-05 13:24:45 +01:00
Emanuel Schütze
3888632e14
Merge pull request #2735 from normanjaeckel/FixStatus
...
Fixed typo.
2016-12-05 13:09:25 +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
Norman Jäckel
8b6844675e
Merge pull request #2732 from CatoTH/bugfix-typo-in-variable-name
...
Typo in variable name
2016-12-05 12:58:56 +01:00
Norman Jäckel
d8c7eda587
Fixed typo.
2016-12-05 12:40:28 +01:00
Norman Jäckel
d0ed0cea23
Improved speed of motion numbering.
2016-12-03 20:57:00 +01:00
Tobias Hößl
940fb14ad6
Typo in variable name
2016-12-03 14:50:39 +01:00
Emanuel Schütze
9009c9e2e9
Updated translations for EN/DE. Fix translation string.
2016-12-02 16:30:03 +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
Norman Jäckel
49dca65640
Added button to motion detail view to follow recommendation. Closed #2700 .
2016-12-02 14:57:45 +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
cdc37b4dd5
Merge pull request #2703 from normanjaeckel/LeadingZero
...
Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696 .
2016-12-01 14:46:15 +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
ad651300d9
Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696 .
2016-12-01 14:41:12 +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
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