Emanuel Schütze
fa395d6cc2
Added motion detail links to category sort view.
2017-03-04 16:07:05 +01:00
Emanuel Schütze
a9144b6d5b
Improved go to line number tooltip/popup. ( #3028 )
2017-03-04 16:00:54 +01:00
Emanuel Schütze
3903be5d6b
Fixed switching between motion versions ( Fixed #2363 )
...
- Show correct text and reason for selected version.
- Disable inline editing after save (otherwise inline mode is still
active when user change version)
2017-03-03 17:03:32 +01:00
FinnStutzenstein
606c17ef43
Small template improvements
2017-03-03 11:53:33 +01:00
Emanuel Schütze
65fcd8e9d6
Fixed forms (added missing operator).
...
Also:
- Move motion state filter to 2nd filter position (as in detail view).
- Open dropdown filter of state and recommendation on left side.
2017-02-27 10:02:43 +01:00
Emanuel Schütze
045c65de49
Merge pull request #3008 from FinnStutzenstein/Issue2636
...
Remove scrolling to a line on projector (closes #2636 )
2017-02-24 15:38:18 +01:00
Emanuel Schütze
5d38ca8c68
Merge pull request #3005 from FinnStutzenstein/Issue3004
...
Fixing create view for amendments (fixing #3004 )
2017-02-24 15:37:46 +01:00
FinnStutzenstein
8a8755f22d
Fixing create view for amendments (fixing #3004 )
2017-02-24 15:16:12 +01:00
FinnStutzenstein
803f9dba96
Remove scrolling to a line on projector ( closes #2636 )
2017-02-24 10:31:48 +01:00
Emanuel Schütze
bf0b5d5062
Added 'reject all change recommendations' button.
2017-02-22 23:08:46 +01:00
Emanuel Schütze
4168153ba3
Added extension for state and recommendation names in dropdown.
2017-02-22 21:31:47 +01:00
FinnStutzenstein
da89bf5a83
Usability improvements
2017-02-22 16:58:52 +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
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
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
0e401e7223
Fixing MotionBlock autoupdate and added projector button ( fixes #2958 )
2017-02-17 13:49:55 +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
FinnStutzenstein
b73c50a4f9
Fixed missing <p> tags for motion import and some improvements.
2017-02-10 09:11:45 +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
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
Emanuel Schütze
b2dfc9b44e
Fixed translation strings.
2017-01-19 10:42:26 +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
Emanuel Schütze
986e8cc4f6
Adapted motion DOCX template ( Fixed #2763 ).
2017-01-15 10:59:09 +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
FinnStutzenstein
397d659f0b
New csv import for users and topics
2017-01-14 18:29:05 +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
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
FinnStutzenstein
e8fa488d60
Project change recommendations
2017-01-07 14:48:11 +01:00
FinnStutzenstein
f5fa3575df
New csv import using PapaParse
2017-01-06 10:50:03 +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
Emanuel Schütze
78361308aa
Updated EN+DE translations.
2016-12-13 12:20:14 +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
7772f60bd4
Added global config for motion preamble.
2016-12-12 12:51:27 +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
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
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
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
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
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
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
17c464bafa
Merge pull request #2688 from FinnStutzenstein/AssignmentsTable
...
New assignment and mediafile tables and table generics
2016-11-30 14:29:13 +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
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
Tobias Hößl
fd82ae348e
Editing change recommendations
2016-11-23 23:42:24 +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
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
f8958e36a6
Fixed missing translations ( Fixed #2616 , fixed #2625 )
2016-11-15 21:18:06 +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
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
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
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
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
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
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
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
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
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
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
Finn Stutzenstein
e6b9b21d41
Added support for multiple projectors.
2016-09-30 18:58:59 +02:00