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

5325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
f9d178506a
Merge pull request #3660 from emanuelschuetze/pdfAssignmentBallotFix 
Fix for creating assignment ballot pdf.
 2018-03-19 15:26:59 +01:00
FinnStutzenstein
052daa2b19 Fixing translations (fixes #3607, fixes #3604). 2018-03-19 15:23:34 +01:00
Emanuel Schütze
288c1cafb9 Fix for creating assignment ballot pdf. 2018-03-19 10:15:23 +01:00
FinnStutzenstein
a4d460a8f0 New file upload form (fixes #3510, fixed #3082) 2018-03-18 15:16:02 +01:00
Tobias Hößl
652701e4f3
Add firstLine to cache definition - fixes #3656 2018-03-15 19:34:42 +01:00
Emanuel Schütze
09e74481cb
Merge pull request #3655 from emanuelschuetze/groupSorting 
Fix group filtering in users list view
 2018-03-15 14:17:38 +01:00
Emanuel Schütze
3b0e32b0a2 Fix group filtering in users list view 
Use ":true" for angular filter to exact match for searching id (e.g. '2' not '12').
Order groups by id (only important for big mode with caching).
 2018-03-15 14:02:05 +01:00
Emanuel Schütze
972d76cf21
Merge pull request #3644 from CatoTH/Isuue3643-OL-Offsets 
OL Offsets - fixes #3643
 2018-03-15 12:53:13 +01:00
Emanuel Schütze
78747fad35
Merge pull request #3646 from CatoTH/Issue3645-Goto-Original-View-After-Deleting-Title-CR 
Go to original view after deleting the Title CR...
 2018-03-15 12:42:06 +01:00
Tobias Hößl
76fd094ddc OL Offsets - fixes #3643 2018-03-15 12:38:18 +01:00
Emanuel Schütze
3ef39ed116
Merge pull request #3649 from FinnStutzenstein/nginx-doku-fix 
Fixed Nginx settings
 2018-03-15 12:25:37 +01:00
Emanuel Schütze
1ac3cb7552
Merge pull request #3641 from FinnStutzenstein/add-perms-during-migrations 
Adding new permission to groups during migration from 2.1.1 to 2.2
 2018-03-15 12:22:28 +01:00
Emanuel Schütze
b1d5fa21c9
Merge pull request #3652 from emanuelschuetze/numberingCategory 
Improved error handling of re-numbering motions of a category.
 2018-03-14 18:03:48 +01:00
Emanuel Schütze
79d69068f5 Improved error handling of re-numbering motions of a category. 2018-03-14 17:49:25 +01:00
Emanuel Schütze
319f329b5e
Merge pull request #3651 from emanuelschuetze/layoutImprovements 
Layout improvements for agenda and motions
 2018-03-14 17:17:33 +01:00
Emanuel Schütze
bee73d3a28 Layout improvements for agenda and motions 
- Use more compact agenda on projector (reduce line height)
- Fixed sorting of motions and limit motion title lenght in recommendation dropdown menu.
- Improved CSS for using tables in topic text (site and projector).
 2018-03-14 12:06:26 +01:00
FinnStutzenstein
b291cc6ad6 Fixed Nginx settings 2018-03-12 15:16:43 +01:00
Emanuel Schütze
2828b8be8a
Merge pull request #3648 from FinnStutzenstein/pdf-fix 
Pdf fixes
 2018-03-12 14:17:48 +01:00
FinnStutzenstein
b081401d57 Adding new permission to groups during migration from 2.1.1 to 2.2 2018-03-12 14:11:20 +01:00
FinnStutzenstein
9639d9233f Pdf fixes 2018-03-12 14:00:23 +01:00
Tobias Hößl
b2043fa49d
Go to original view after deleting the Title CR, if it is the last one - fixes #3645 2018-03-11 18:28:16 +01:00
Emanuel Schütze
a9e0f36ab9
Merge pull request #3642 from CatoTH/Bugfix-Title-Recommendations-On-Screen 
Bugfix: Title change recommendations on the projector
 2018-03-09 16:26:23 +01:00
Tobias Hößl
611be75d95
Bugfix: Title change recommendations on the projector 2018-03-09 14:34:09 +01:00
Jochen Saalfeld
d525f2d7d2
patch userdetails without unnecessary double verification 2018-03-09 07:20:40 +01:00
Emanuel Schütze
3e3b62bc38
Merge pull request #3640 from emanuelschuetze/translations 
Updated js translations (DE, ES, CS, FR, PT, RU).
 2018-03-08 11:15:11 +01:00
Emanuel Schütze
bc5eb84647
Merge pull request #3639 from emanuelschuetze/layout-improvements 
Some minor CSS improvements.
 2018-03-08 11:03:01 +01:00
Emanuel Schütze
6a388a5bb5 Updated js translations (DE, ES, CS, FR, PT, RU). 2018-03-08 11:00:58 +01:00
Emanuel Schütze
6daf262c0e Some minor CSS improvements. 
- Projector: Use same line height in list elements as in content.
- Projector: Reduce indentation of ul/ol lists.
- Projector: Add more space between line numbers and motion text,
- Agenda list: Remove padding-left in item list view.
 2018-03-08 10:51:31 +01:00
Emanuel Schütze
85bbaea3e5
Merge pull request #3638 from FinnStutzenstein/agenda-collapse 
Disable the agenda hierachy just for searchning, not for filtering
 2018-03-08 10:49:45 +01:00
FinnStutzenstein
fce2c5857c Disable the agenda hierachy just for searchning, not for filtering 2018-03-08 09:33:49 +01:00
Emanuel Schütze
f3c634e677
Merge pull request #3626 from CatoTH/Title-Change-Recommendations 
Change recommendations for motion titles
 2018-03-08 09:18:02 +01:00
Tobias Hößl
9f8dce6e34
Change recommendations for titles 2018-03-07 16:36:30 +01:00
Emanuel Schütze
10bee988af
Merge pull request #3634 from emanuelschuetze/event-name 
Added event name to web interface header.
 2018-03-07 13:12:46 +01:00
Emanuel Schütze
4abb2402f8
Merge pull request #3621 from emanuelschuetze/admingroup 
New admin user group
 2018-03-07 12:46:38 +01:00
Emanuel Schütze
5db632365f Added event name to web interface header. 2018-03-06 12:20:35 +01:00
Emanuel Schütze
4e1c7b7497 New admin user group 2018-03-06 11:21:00 +01:00
Emanuel Schütze
d073cbbf6f
Merge pull request #3566 from FinnStutzenstein/noCachingFlag 
Added --no-template-caching
 2018-03-06 10:01:36 +01:00
Norman Jäckel
79700caefb
Merge pull request #3633 from FinnStutzenstein/saml-changes 
Changes needed for the saml plugin: It is possible now to hook into t…
 2018-03-05 20:43:03 +01:00
Norman Jäckel
ec0094827d
Merge pull request #3630 from FinnStutzenstein/fix-deselection 
Fixed delection of logos and fonts. Closes #3606
 2018-03-05 20:42:13 +01:00
Norman Jäckel
ae3277b747
Merge pull request #3631 from FinnStutzenstein/pdf-images-in-vfs 
Moved image sources to the virtual filesystem
 2018-03-05 20:35:46 +01:00
FinnStutzenstein
c5906b2dba Changes needed for the saml plugin: It is possible now to hook into the complete usermenu 2018-03-05 14:08:39 +01:00
Emanuel Schütze
db981a0c2d
Merge pull request #3590 from emanuelschuetze/pdfjs-dist-fix 
Downgrade angular-pdf to 1.3.0 (Fixed #3552).
 2018-03-05 13:17:19 +01:00
FinnStutzenstein
aacdc29394 Added --no-template-caching 2018-03-05 11:55:15 +01:00
FinnStutzenstein
1949a00ee7 Moved image sources to the virtual filesystem 2018-03-05 11:51:35 +01:00
FinnStutzenstein
2269679186 Fixed delection of logos and fonts. Closes #3606 2018-03-05 09:15:40 +01:00
Norman Jäckel
a30a30d72f
Merge pull request #3617 from emanuelschuetze/issue3614 
Improved motion import/export (Fix #3614).
 2018-03-04 20:59:24 +01:00
Norman Jäckel
15ad9340f4
Merge pull request #3616 from emanuelschuetze/issue3613 
Adapt motion csv import example file (Fix #3613).
 2018-03-04 20:58:50 +01:00
Norman Jäckel
2c266ffc03
Merge pull request #3612 from emanuelschuetze/fixAgendaImport 
Fixed agenda import with empty duration (fix #3603, fix #3601).
 2018-03-04 20:58:23 +01:00
Emanuel Schütze
a733f2edb4 Improved motion import/export (Fix #3614). 
- Fix motion import if names of paricipants are sorted by surname.
- Support multiple submitters in motion export csv.
 2018-03-01 11:21:23 +01:00
Emanuel Schütze
0899bc5e22 Adapt motion csv import example file (Fix #3613). 2018-03-01 10:22:16 +01:00