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

6276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
a716910b63 Merge pull request #2734 from emanuelschuetze/issue2727 
Hot fix for cache update while user import (Fixes #2727).
 2016-12-05 13:25:11 +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
b36560bffb Hot fix for cache update while user import (Fixes #2727). 2016-12-05 13:17:35 +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
Emanuel Schütze
224ba797a2 Merge pull request #2731 from normanjaeckel/MotionNumberingSpeed 
Improved speed of motion numbering.
 2016-12-04 19:56:44 +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
dbfa470ee0 Merge pull request #2729 from emanuelschuetze/translation-update 
Updated translations for EN/DE. Fix translation string.
 2016-12-02 16:41:45 +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
Emanuel Schütze
0698327427 Fix minor remarks for #2271. 2016-12-02 15:49:21 +01:00
Emanuel Schütze
4c37fd8e62 Merge pull request #2726 from normanjaeckel/FollowRecommendationButton 
Added button to motion detail view to follow recommendation. Closed #…
 2016-12-02 15:40:33 +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
4d288ec9b2 Merge pull request #2724 from emanuelschuetze/posts 
Rename 'posts' to 'persons' in assigment templates.
 2016-12-02 14:47:11 +01:00
Norman Jäckel
926d04f610 Merge pull request #2723 from FinnStutzenstein/Clock 
Fixing the clock
 2016-12-02 14:46:43 +01:00
Emanuel Schütze
65337ae2d2 Rename 'posts' to 'persons' in assigment templates. 2016-12-02 14:41:34 +01:00
Norman Jäckel
dc0559ef38 Merge pull request #2722 from FinnStutzenstein/Issue2126 
Show countdown above messageoverlay (closes #2126)
 2016-12-02 14:26:15 +01:00
Norman Jäckel
1ca0b7f291 Merge pull request #2719 from FinnStutzenstein/Issue2693 
Translate legal notice
 2016-12-02 14:25:51 +01:00
FinnStutzenstein
7e18061e53 Fixing the clock 2016-12-02 14:17:37 +01:00
FinnStutzenstein
cc8cf1ef7a Show countdown above messageoverlay (closes #2126) 2016-12-02 12:31:10 +01:00
Emanuel Schütze
7fa5d3b9bb Merge pull request #2713 from normanjaeckel/SettingsForClient 
Added settings for client to basic JavaScript code on client startup.…
 2016-12-02 10:38:18 +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
FinnStutzenstein
0f89205038 Translate legal notice 2016-12-02 08:10:06 +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
Norman Jäckel
a245236392 Merge pull request #2716 from emanuelschuetze/fix-motion-pdf 
Fixed motion pdf layout
 2016-12-01 23:57:24 +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
526a5478f7 Added settings for client to basic JavaScript code on client startup. Closed #2697. 2016-12-01 15:21:11 +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
e81eeb4af9 Merge pull request #2557 from matakuka/majority_assignment 
Majority calculation for assignments
 2016-12-01 14:41:41 +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
Emanuel Schütze
9dd44edb9e Merge pull request #2698 from FinnStutzenstein/Issue2531 
Translate default projector (closes #2531)
 2016-12-01 11:02:02 +01:00
Norman Jäckel
510d60ef0f Merge pull request #2702 from tsiegleauq/assignmentImprove2559 
improves the assignments (fixes #2559)
 2016-12-01 10:25:57 +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
Norman Jäckel
4604d687f1 Merge pull request #2707 from emanuelschuetze/fix-js-error 
Fix JS error after project pdf file.
 2016-12-01 10:22:08 +01:00
FinnStutzenstein
b0c94888ce Translate default projector (closes #2531) 2016-12-01 07:48:26 +01:00
Emanuel Schütze
bc312efbb9 Fix JS error after project pdf file. 2016-11-30 22:26:11 +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