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

6773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FinnStutzenstein
0fd1cd688b Fixed logic for saving motion comments 2018-05-16 11:54:46 +02:00
FinnStutzenstein
2989024cca Delete restricted data cache on permission changes (closes #3396) 2018-05-16 10:59:00 +02:00
Emanuel Schütze
a7af01b507
Merge pull request #3738 from FinnStutzenstein/moveCode 
fixed #3708
 2018-05-15 09:35:14 +02:00
Emanuel Schütze
ea8a540a71
Merge pull request #3735 from FinnStutzenstein/improvements 
Fixed percentage for special values (fixes #3736), added config to couple the candidates with the list of speakers (closes #3737)
 2018-05-15 09:26:31 +02:00
FinnStutzenstein
c7a2f5c47c Fixed percentage for special values (fixes #3736), added config to couple the candidates with the list of speakers (closes #3737) 2018-05-11 15:15:53 +02:00
FinnStutzenstein
f1ab2b3afc fixed #3708 2018-05-09 08:48:37 +02:00
Emanuel Schütze
39da8f942f
Merge pull request #3734 from FinnStutzenstein/AgendaProjection 
Fixes for the item projection (fixes #3733)
 2018-05-04 10:44:22 +02:00
FinnStutzenstein
0a141adbd1 Fixes for the item projection (fixes #3733) 2018-05-04 10:27:39 +02:00
Emanuel Schütze
7b9d8d11a6
Merge pull request #3732 from FinnStutzenstein/MotionProjectorFix 
Fixed deleted comment fields
 2018-05-04 09:34:08 +02:00
FinnStutzenstein
d189e5bca8 Fixed deleted comment fields 2018-05-03 17:26:47 +02:00
Emanuel Schütze
cb42af7c8b
Merge pull request #3731 from FinnStutzenstein/MotionCommentsInlineEditingFix 
Fixed wrong index for inline editors
 2018-05-02 20:18:54 +02:00
FinnStutzenstein
902ca96a16 Fixed wrong index for inline editors 2018-05-02 15:35:49 +02:00
Emanuel Schütze
b37bad72ef
Merge pull request #3729 from FinnStutzenstein/pdfImageSize 
Fixed parsing of image sizes
 2018-05-02 13:53:34 +02:00
FinnStutzenstein
06ddd8ee46 Fixed parsing of image sizes 2018-05-02 13:44:35 +02:00
Emanuel Schütze
cc5a1ea0fe
Merge pull request #3702 from FinnStutzenstein/motionAgendaTitle 
new style for motion agenda title
 2018-05-02 13:37:44 +02:00
Emanuel Schütze
331eb9fc22
Merge pull request #3728 from FinnStutzenstein/stylistic-remarks 
Fixed stylistic remarks from #3682 (fixes #3709)
 2018-05-02 13:35:44 +02:00
FinnStutzenstein
754040570d New style for motion agenda title and list of speakers 
Improved list of speakers slide title:
- h2 subtitle: use always motion identifier only (like in motion slides)
- h1 title: use always "list of speakers" (long motion title not useful
  if an other projector shows the motion slide with full title
  (identifier is enough)
 2018-05-02 13:29:59 +02:00
FinnStutzenstein
0224c4287a Fixed stylistic remarks from #3682 (fixes #3709) 2018-05-02 10:13:45 +02:00
Emanuel Schütze
60ae155d96
Merge pull request #3724 from emanuelschuetze/translations 
Updated German translations.
 2018-04-25 16:24:02 +02:00
Emanuel Schütze
d522e8e308 Updated German translations. 2018-04-25 16:01:59 +02:00
Emanuel Schütze
bf27b6f016
Merge pull request #3723 from emanuelschuetze/fixes 
Template improvements
 2018-04-25 16:01:21 +02:00
Emanuel Schütze
ef2a22fefe Template improvements 
- Show item duration and done for normal users correctly.
- Fixed CSS class for countdown warning time.
- Improved projector manage button layout.
- Updated fontawsome icons to 4.7.
- Fixed iframe width/height to show border correctly.
- Improved 'close list of speakers' button.
- Improved 'clear all filter' icons.
- Fixed election pdf if candidate was deleted.
- Moved ban icon for internal icons.
- Improved edit projector form. Show simple scaling steps instead of
  width/height resolution.
- Consolidated both agenda item filters.
- Used better sort icon.
- Installed colordialog plugin for ckeditor to select more colors.
- Several css improvements.
 2018-04-25 15:47:39 +02:00
Emanuel Schütze
8680d4af85
Merge pull request #3722 from FinnStutzenstein/betterProjectorButton 
precalculate projectorchanges in the client
 2018-04-25 14:13:52 +02:00
FinnStutzenstein
08045638ab precalculate projectorchanges in the client 2018-04-25 11:08:23 +02:00
Emanuel Schütze
08b89858c6
Merge pull request #3720 from tsiegleauq/conversations_hook 
add template hook in user div
 2018-04-24 13:07:00 +02:00
Sean Engelhardt
85e329b9b3 add template hook in user div 2018-04-24 11:53:31 +02:00
Emanuel Schütze
231d8de036
Merge pull request #3719 from FinnStutzenstein/changeMediafileProtectionLogicAgain 
Changed mediafile protection logic (closes #3707)
 2018-04-24 11:48:21 +02:00
Emanuel Schütze
334a6880b5
Merge pull request #3718 from FinnStutzenstein/autoupdateAmendments 
Watch for changes of amendments in the motion detail view.
 2018-04-24 11:38:56 +02:00
Emanuel Schütze
15d8a5fbc0
Merge pull request #3717 from FinnStutzenstein/motionProjectorRequirements 
Added motions from state and recommendation to the projector requirem…
 2018-04-24 11:33:48 +02:00
Emanuel Schütze
024cf6c1b0
Merge pull request #3715 from FinnStutzenstein/projectorDisconnect 
Remove projector from projector-all
 2018-04-24 11:33:33 +02:00
Emanuel Schütze
b8ee6d91f7
Merge pull request #3714 from FinnStutzenstein/pdfjs-distIE11Fix 
Fixed IE11 Error in pdfjs-dist
 2018-04-24 11:33:16 +02:00
FinnStutzenstein
2220856e5d Changed mediafile protection logic (closes #3707) 2018-04-24 11:32:17 +02:00
FinnStutzenstein
07f3880ad3 Watch for changes of amendments in the motion detail view. 2018-04-24 11:27:33 +02:00
FinnStutzenstein
d4a9751474 Added motions from state and recommendation to the projector requirements 2018-04-24 11:22:24 +02:00
FinnStutzenstein
83edfc2af0 Remove projector from projector-all 2018-04-24 11:20:15 +02:00
FinnStutzenstein
c3ef007227 Fixed IE11 Error in pdfjs-dist 2018-04-24 11:18:54 +02:00
Emanuel Schütze
198e19d3d1
Merge pull request #3713 from FinnStutzenstein/oneRequestProjection 
One request for each projection. Added some validation for clear_elem…
 2018-04-24 11:15:04 +02:00
FinnStutzenstein
10038b782f One request for each projection. Added some validation for clear_elements and prune_elements 2018-04-24 10:23:28 +02:00
Emanuel Schütze
f1b87af623
Merge pull request #3706 from emanuelschuetze/release2.2b3 
Release 2.2b3
 2018-04-13 16:26:09 +02:00
Emanuel Schütze
03b17837ed Update version to 2.2b4-dev 2018-04-13 16:08:01 +02:00
Emanuel Schütze
a0ac02d391 Release 2.2b3 2018-04-13 16:07:33 +02:00
Emanuel Schütze
c3f6c8a3a2
Merge pull request #3705 from emanuelschuetze/translations 
Updated German translations.
 2018-04-13 15:36:18 +02:00
Emanuel Schütze
13921da15b Updated German translations. 2018-04-13 15:21:26 +02:00
Emanuel Schütze
b6ebc78e85
Merge pull request #3682 from FinnStutzenstein/voting-plugin 
Changes for the voting plugin
 2018-04-13 15:11:48 +02:00
Emanuel Schütze
a6537fb919
Merge pull request #3695 from FinnStutzenstein/fixRemarks 
fixed remarks from #3525 (closes #3681)
 2018-04-13 15:07:05 +02:00
Emanuel Schütze
11ba5a7c37
Merge pull request #3704 from emanuelschuetze/fixRecommendationExtensionField 
Add missing permission check for recommendation extension field.
 2018-04-13 14:21:47 +02:00
Emanuel Schütze
b95a76493d
Merge pull request #3697 from FinnStutzenstein/protectNumbering 
Protect numbering of the agenda
 2018-04-13 14:21:06 +02:00
Emanuel Schütze
4a2410a596
Merge pull request #3700 from FinnStutzenstein/titleInMotionBlockSlide 
Added a short title in the motion block slide
 2018-04-13 14:20:31 +02:00
FinnStutzenstein
595bcab845 Added shortened motion title to motion block slide. 2018-04-13 10:13:17 +02:00
FinnStutzenstein
fa5b81dad8 Protect numbering of the agenda 2018-04-13 10:09:22 +02:00