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

249 Commits

Author SHA1 Message Date
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
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
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
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
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