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

4830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FinnStutzenstein
542cb67d59 Fixing the sidebar, fixes #3068 2017-03-17 12:24:40 +01:00
Sean Engelhardt
259e338b17 fix double PDF Head in Motions (fixes #3025) 2017-03-16 23:17:25 +01:00
Norman Jäckel
a33f0dd668 Merge pull request #3078 from emanuelschuetze/template-fixes 
Several template fixes
 2017-03-16 14:14:01 +01:00
Emanuel Schütze
b53843c17e Several template fixes 
- Motions catalog pdf: Show categories of filtered motions only.
- Fixed permission for "reject all change recommendations" button
- Use color for yes/no/abstain for progress bars in assignment detail.
 2017-03-10 22:46:01 +01:00
Emanuel Schütze
26c9937220 Merge pull request #3075 from emanuelschuetze/issue3066 
Fixed autoupdate error after deleting a slide (Fixed #3066).
 2017-03-09 08:58:24 +01:00
Emanuel Schütze
1be2cbb8dc Fixed autoupdate error after deleting a slide (Fixed #3066). 2017-03-09 08:51:57 +01:00
Norman Jäckel
07faf1078b Merge pull request #3074 from emanuelschuetze/fixes2 
Hide empty placeholder of ui-tree in sort templates.
 2017-03-09 00:05:28 +01:00
Norman Jäckel
365a65ef7c Merge pull request #3071 from emanuelschuetze/travis 
Added karma tests for angular.js to travis.
 2017-03-09 00:05:06 +01:00
Emanuel Schütze
e611b46784 Added karma tests for angular.js to travis. 
Installed required dependencies to run karma test in phantomjs which
is a supported browser by travis.
 2017-03-08 23:46:04 +01:00
Emanuel Schütze
780b9e2e9a Hide empty placeholder of ui-tree in sort templates. 2017-03-08 23:07:22 +01:00
Norman Jäckel
82e20ee5a7 Merge pull request #3073 from emanuelschuetze/fixes 
Minor template fixes
 2017-03-08 23:00:26 +01:00
Norman Jäckel
27bc6a7df4 Merge pull request #3072 from CatoTH/fix-diff-test-cases 
Fixes broken diff test cases
 2017-03-08 22:51:37 +01:00
Emanuel Schütze
3717f63d12 Minor template fixes 
- More column width in all-motions pdf.
  Order categories by prefix.
- Fixed using translations in error messages.
  Removed unused pdf-status template.
 2017-03-08 22:46:45 +01:00
Norman Jäckel
4fd70f7eff Merge pull request #3070 from tsiegleauq/issue3069-stroke-out-text 
Add strike command to HTML PDF parser (Fixes #3069)
 2017-03-08 22:44:00 +01:00
Tobias Hößl
c3bd85e5ee Diff-Bugfix: don't repeat unchanged words 2017-03-08 21:29:34 +01:00
Tobias Hößl
a6de228f56 Prevent broken HTML like <ins>Test</p></ins> 2017-03-08 20:38:02 +01:00
Tobias Hößl
9f71afa602 Fixes broken diff test cases + Bugfix for: TypeError: Failed to execute 'insertBefore' on 'Node' 2017-03-08 20:10:32 +01:00
Sean Engelhardt
6dc52c6fe2 Add strike command to HTML PDF parser (Fixes #3069) 2017-03-08 15:47:40 +01:00
Emanuel Schütze
48f7c258df Merge pull request #3065 from emanuelschuetze/2.1b4 
2.1b4 Release
 2017-03-07 22:07:57 +01:00
Emanuel Schütze
f457720d29 Update version to 2.1b5-dev 2017-03-07 21:22:53 +01:00
Emanuel Schütze
c788e3bfab Release 2.1b4 2017-03-07 21:19:31 +01:00
Norman Jäckel
f105ecd68c Merge pull request #2995 from FinnStutzenstein/Issue2957 
Autoupdate on permission change
 2017-03-07 15:32:56 +01:00
FinnStutzenstein
cc0049b55b Adding agenda/topics app, fixes user app 2017-03-07 15:02:39 +01:00
Norman Jäckel
14ec6c0f44 Improved autoupdate on permission change. 2017-03-06 17:42:27 +01:00
FinnStutzenstein
bcc85f9cad Autoupdate on user permission change. 2017-03-06 15:08:23 +01:00
Norman Jäckel
f1c0821dd0 Merge pull request #2948 from ostcar/getgeiss 
Added the command getgeiss
 2017-03-06 15:05:26 +01:00
Norman Jäckel
688b247bcc Added flag to use Geiss. Small changes for the new getgeiss command. Changed path of collected statics. 2017-03-06 14:39:55 +01:00
Oskar Hahn
e3cc592f70 Added the command getgeiss. Work on start script to use Geiss. 2017-03-06 14:39:26 +01:00
Norman Jäckel
8b710b0b13 Merge pull request #3056 from emanuelschuetze/cleanup 
Removed unused ubuntu fonts (from old pdf generation).
 2017-03-05 23:54:09 +01:00
Norman Jäckel
0c5746b349 Merge pull request #3055 from emanuelschuetze/fix 
Fixed iframeoverlay and missing ErrorMessage.
 2017-03-05 22:43:10 +01:00
Emanuel Schütze
1d6326fb1b Removed unused ubuntu fonts (from old pdf generation). 2017-03-05 22:40:38 +01:00
Emanuel Schütze
95c6ed4e76 Merge pull request #3054 from emanuelschuetze/update-translations 
Updated all translations.
 2017-03-05 22:37:23 +01:00
Emanuel Schütze
d92328674a Fixed iframeoverlay and missing ErrorMessage. 2017-03-05 22:27:14 +01:00
Emanuel Schütze
2d65ecbc3a Updated all translations. 
Added Russia as new language.
 2017-03-05 22:25:48 +01:00
Emanuel Schütze
c6ced4e4a0 Merge pull request #3051 from emanuelschuetze/issues-2142 
Excluded already elected persons for new ballot (Fixed #2142)
 2017-03-05 21:30:35 +01:00
Emanuel Schütze
ff840ab3c6 Excluded already elected persons for new ballot (Fixed #2142) 
- Reorder assignment ballot tabs in detail template.
- Removed logic to set phase automatically to 'finished' if
  elected candidates reached, because autoupdate makes it unreliable.
 2017-03-05 21:25:22 +01:00
Norman Jäckel
4c2b13a142 Merge pull request #3052 from emanuelschuetze/mobile-theme 
Responsive design improvements
 2017-03-05 20:34:50 +01:00
Norman Jäckel
32aaa28637 Merge pull request #3050 from CatoTH/bugfix-inline-diff-when-replacing-paragraphs 
Improve the diff when a paragraph is replaced by another one
 2017-03-05 20:25:43 +01:00
Norman Jäckel
6525b79774 Merge pull request #3047 from emanuelschuetze/projector-control 
Inscreased projector scroll distance.
 2017-03-05 20:23:56 +01:00
Norman Jäckel
0ca8fa57ed Merge pull request #3046 from CatoTH/Projector-Diff-View-Line-Numbers 
Bugfix for missing line numbers in diff view in the projector
 2017-03-05 20:23:35 +01:00
Norman Jäckel
16743cd9b8 Merge pull request #3044 from CatoTH/Issue3027-LineNumberingBugfix 
Handle STRIKE-tags correctly in line numbering - fixes #3027
 2017-03-05 20:22:59 +01:00
Norman Jäckel
659c7858eb Merge pull request #3043 from emanuelschuetze/category-sort-template 
Added motion detail links to category sort view.
 2017-03-05 20:22:40 +01:00
Norman Jäckel
1fdb3a4f2a Merge pull request #3042 from emanuelschuetze/3028 
Improved go to line number tooltip/popup. (#3028)
 2017-03-05 20:20:25 +01:00
Norman Jäckel
a4a7fd255b Merge pull request #3041 from CatoTH/remove-pdf-test-cases 
Remove PDF unit tests
 2017-03-05 20:19:52 +01:00
Norman Jäckel
a33d504c6b Merge pull request #3040 from CatoTH/Issue3024-Escaping-of-HTML-elements 
Bugfix for #3024 - escaping HTML tags
 2017-03-05 20:19:24 +01:00
Norman Jäckel
26e9265634 Merge pull request #3037 from emanuelschuetze/issue2363 
Fixed switching between motion versions (Fixed #2363)
 2017-03-05 20:18:53 +01:00
Emanuel Schütze
f67afd1823 Responsive design improvements 
- Reduce search bar on small devices.
- Use separate projector sidebar for small devices.
- motion detail toolbar: show line number mode and change recommendation
  controls as dropdown (for small/extra small devices) or as
  button group (for medium/large devices).
 2017-03-05 00:30:00 +01:00
Tobias Hößl
6577287e26 Improve the diff when a paragraph is replaced by another one 2017-03-04 20:48:18 +01:00
Emanuel Schütze
65d93d1b66 Inscreased projector scroll distance. 
Allows faster scrolling for long slides.
 2017-03-04 16:52:27 +01:00
Tobias Hößl
0022df2aff Bugfix for missing line numbers in diff view in the projector 2017-03-04 16:42:02 +01:00