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

5456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
3b6cebc4ee
Merge pull request #4023 from emanuelschuetze/bugfixes 
Several bug fixes for 2.3.x
 2018-11-20 13:54:23 +01:00
Emanuel Schütze
82f8c3fc26 Several bug fixes for 2.3.x 
- PDF export: Added missing alignment for pdf header logo (right).
  Hide event data if heder logo left _and_ right is set.
- Fixed typo in set motion block multi action.
- Fixed motion slide: project diff mode by default (if selected in config)
- Catched some JS errors (for undefined motion objects).
- Order recommendations by id in motion detail view.
 2018-11-20 13:45:45 +01:00
Emanuel Schütze
66a06e4ccc
Merge pull request #4020 from CatoTH/v2.3.x-bugfix-diff3 
Diff-Bugfix
 2018-11-19 15:22:47 +01:00
Tobias Hößl
31d8258750 Diff-Bugfix: be more consistent about marking up block elements by 'inserted' instead of using <ins>-tags 2018-11-19 15:05:24 +01:00
Emanuel Schütze
34498af9c5
Merge pull request #3992 from emanuelschuetze/agendaSort 
Allow to hide internal items in agenda sort view.
 2018-11-08 11:47:28 +01:00
Emanuel Schütze
48d18c40a7 Allow to hide internal items in agenda sort view. 2018-11-07 10:02:19 +01:00
Emanuel Schütze
1b6d8baeaf
Merge pull request #3946 from CatoTH/v2.3.x-Bugfix-Diff2 
Diff-Bugfixes regarding replaced list items
 2018-10-26 10:11:42 +02:00
Tobias Hößl
46727238c7 Diff-Bugfixes regarding replaced list items 2018-10-26 10:03:15 +02:00
Emanuel Schütze
709182119c
Merge pull request #3943 from CatoTH/v2.3.x-Bugfix-Diff 
Diff Bugfix: inserted/deleted list items
 2018-10-23 09:27:57 +02:00
Tobias Hößl
023f398875 Diff Bugfix: inserted/deleted list items 2018-10-23 09:21:00 +02:00
Emanuel Schütze
81bd123af0
Merge pull request #3942 from emanuelschuetze/fixAmendmentCSVExport 
Fixed missing submitters in amendment csv export
 2018-10-23 09:16:14 +02:00
Emanuel Schütze
40c8d8869a Fixed missing data in amendment csv export 
- add submitters
- add recommendation
- strip html tags for old and new text in csv
 2018-10-23 09:10:09 +02:00
Emanuel Schütze
07b75584cf
Merge pull request #3932 from emanuelschuetze/bugfixes2.3 
Minor bugfixes for 2.3.1
 2018-10-19 15:11:36 +02:00
Emanuel Schütze
85d7b2ebe6 Minor bugfixes for 2.3.1 
- Fixed sorting of users in dropdowns for speakers, submitters and candidates.
- Fixed assignment ballot paper layout (more space required for global 'no').
- Fixed missing output of special poll values. Use new filter 'textOrNumber'
  to return decimal number or string (e.g. 'majority').
 2018-10-19 14:07:06 +02:00
Emanuel Schütze
d4f9da9cdb
Merge pull request #3889 from FinnStutzenstein/fixImagePlugin 
Fix image plugin
 2018-09-24 13:06:50 +02:00
FinnStutzenstein
eebd7a1fce Fix image plugin 2018-09-20 13:06:02 +02:00
Emanuel Schütze
d2c4aff7a4
Merge pull request #3888 from emanuelschuetze/release2.3 
Release 2.3
 2018-09-20 09:33:18 +02:00
Emanuel Schütze
dca94333e8 Update version to 2.3.1-dev 2018-09-20 09:27:03 +02:00
Emanuel Schütze
772c032357 Release 2.3 2018-09-20 09:24:34 +02:00
Emanuel Schütze
7b9d84dabd
Merge pull request #3886 from FinnStutzenstein/export-filename 
Fixed filenames in motion export dialog
 2018-09-18 19:37:02 +02:00
FinnStutzenstein
2815d5f62c Fixed filenames in motion export dialog 2018-09-18 15:03:55 +02:00
Emanuel Schütze
3481ca58d8
Merge pull request #3885 from emanuelschuetze/translations 
Updated German translations.
 2018-09-18 11:23:17 +02:00
Emanuel Schütze
7a9921a85f Updated German translations. 2018-09-18 10:42:57 +02:00
Emanuel Schütze
9432367f1b
Merge pull request #3884 from FinnStutzenstein/fixes 
Little fixes for current master (fixes #3883, fixes #3882, fixes #3880)
 2018-09-18 09:57:01 +02:00
FinnStutzenstein
f17951f363 Little fixes for current master (fixes #3883, fixes #3882, fixes #3880) 2018-09-18 09:49:40 +02:00
Emanuel Schütze
c164766fa5
Merge pull request #3879 from emanuelschuetze/readme 
Updated 'used software' links in README. Fixed formatting for pypi.
 2018-09-17 10:24:17 +02:00
Emanuel Schütze
f340048d56 Updated 'used software' links in README. Fixed formatting for pypi. 2018-09-17 09:46:51 +02:00
Emanuel Schütze
db919d3a4b
Merge pull request #3840 from emanuelschuetze/release2.3b1 
Release2.3b1
 2018-08-30 15:34:13 +02:00
Emanuel Schütze
865940bd12 Update version to 2.3b2-dev 2018-08-30 15:24:42 +02:00
Emanuel Schütze
90370ea628 Release 2.3b1 2018-08-30 15:24:42 +02:00
Emanuel Schütze
cbd7566885
Merge pull request #3839 from emanuelschuetze/translations 
Final translations for 2.3
 2018-08-30 15:24:06 +02:00
Emanuel Schütze
48537dbfbf Updated all translations. 2018-08-30 15:08:51 +02:00
Emanuel Schütze
6bae5cf87a Fixed translation strings and permission check. Updated Changelog. 2018-08-30 15:05:08 +02:00
Emanuel Schütze
1dd1a4bac8
Merge pull request #3832 from FinnStutzenstein/hideSortInAgenda 
Hide Sort button in agenda (closes #3812)
 2018-08-27 12:14:26 +02:00
FinnStutzenstein
d1b52a9302 Hide Sort button in agenda (closes #3812) 2018-08-27 11:24:52 +02:00
Emanuel Schütze
bec7224c9b
Merge pull request #3827 from emanuelschuetze/motion-pdf-default 
Change default for motion export dialog.
 2018-08-24 16:23:22 +02:00
Emanuel Schütze
702bc67334 Change default for motion export dialog. 2018-08-24 16:14:01 +02:00
Emanuel Schütze
053b284691
Merge pull request #3826 from emanuelschuetze/motionPDF 
Enable/disable category in motion PDF.
 2018-08-24 14:52:17 +02:00
Emanuel Schütze
6c2fbf7389 Enable/disable category in motion PDF. 2018-08-24 14:00:53 +02:00
Emanuel Schütze
96637e18c4
Merge pull request #3804 from normanjaeckel/ChangeCollectStatic 
Fixed collectstattic command so that it does not write into openslide…
 2018-08-23 17:38:26 +02:00
Emanuel Schütze
2a4056816c
Merge pull request #3816 from emanuelschuetze/translations 
Updated German translations.
 2018-08-23 17:30:15 +02:00
Emanuel Schütze
7d24066be7 Updated German translations. 2018-08-23 17:20:40 +02:00
Emanuel Schütze
c49eb8bf64
Merge pull request #3808 from FinnStutzenstein/diverses 
Layout changes for motion detail view and PDF
 2018-08-23 16:49:30 +02:00
FinnStutzenstein
cece35b3a5 Layout changes for motion detail view and PDF 2018-08-23 16:38:12 +02:00
Norman Jäckel
e012589ab0
Merge pull request #3814 from emanuelschuetze/fix3813 
Fixed TypeError in Motion and Assignment Slides (Fixed#3813)
 2018-08-23 15:48:15 +02:00
Emanuel Schütze
8ed043bbe8
Merge pull request #3806 from normanjaeckel/FixAgenda 
Fixed agenda get_restricted_data() if no agenda items exist.
 2018-08-23 15:47:34 +02:00
Norman Jäckel
3578d0e850 Fixed collectstattic command so that it does not write into openslides app dir. 2018-08-23 15:47:19 +02:00
Emanuel Schütze
c852f72c20
Merge pull request #3811 from normanjaeckel/ElectionBar 
Fixed assignment election bar for votes mode. Fixed #3598.
 2018-08-23 15:42:50 +02:00
Emanuel Schütze
0036567f7d Fixed TypeError in Motion and Assignment Slides (Fixed#3813) 
in MotionPollDecimalPlaces and AssignmentPollDecimalPlaces
 2018-08-23 15:39:15 +02:00
Finn Stutzenstein
172f1ed890
Merge pull request #3810 from emanuelschuetze/workflow-sorting 
Fix sorting of states in workflow detail view.
 2018-08-23 14:35:04 +02:00