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

364 Commits

Author SHA1 Message Date
FinnStutzenstein
acb5a6dcf9 Use session cookies and store filter settings in sessionStorage 2016-12-07 08:01:33 +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