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

6234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FinnStutzenstein
e073084f74 New temporal field for editing the final version of a motion. 2018-08-14 14:15:11 +02:00
Emanuel Schütze
7e472ab472
Merge pull request #3787 from FinnStutzenstein/missing_templatehook 
Added missing templatehook for the voting plugin
 2018-08-14 13:33:10 +02:00
FinnStutzenstein
9f24ec559b Added missing templatehook for the voting plugin 2018-08-14 13:26:54 +02:00
Emanuel Schütze
e9ad439cdd
Merge pull request #3774 from FinnStutzenstein/abstain-no-for-assignment-votes 
Added general abstain/no fields for assignments. Used in votes mode.
 2018-08-14 09:34:37 +02:00
Oskar Hahn
15e4832d40
Merge pull request #3786 from ostcar/requirements_again 
support python 3.7
 2018-08-11 12:56:56 +02:00
Oskar Hahn
92a39a3fc6 support python 3.7 
fix new pep8 stype
 2018-08-08 21:46:56 +02:00
Oskar Hahn
bf3e000c5b
Merge pull request #3777 from ostcar/update-python-requirements 
Update python requirements
 2018-08-07 15:29:35 +02:00
Oskar Hahn
acceeff8f8 * Update python requirements 
* drop python 3.4
 2018-08-07 15:23:11 +02:00
FinnStutzenstein
bb654f7517 Added general abstain/no fields for assignments. Used in votes mode. 2018-07-28 12:29:26 +02:00
Emanuel Schütze
2da894b517
Merge pull request #3766 from tsiegleauq/Toc-Page-Numbers 
Add page numbers categories in motion TOC
 2018-07-13 14:43:47 +02:00
Sean Engelhardt
6e4665041e Added page numbers and categories in TOC of motion PDF. 2018-07-13 14:26:29 +02:00
Emanuel Schütze
166d287a75
Merge pull request #3780 from emanuelschuetze/translations 
Updated German translations.
 2018-07-13 14:07:40 +02:00
Emanuel Schütze
732f5e7327 Updated German translations. 2018-07-13 13:47:13 +02:00
Emanuel Schütze
5d966192c0
Merge pull request #3768 from tsiegleauq/pdf-logo-right 
Add motion PDF logos on the right side
 2018-07-13 13:44:31 +02:00
FinnStutzenstein
56cdfebe85 Added migrations for the available logos and move old values to new ones, remove old entries in the database 2018-07-13 13:20:22 +02:00
Sean Engelhardt
a6ed54eb92 Added new config options to show logos on the right side in motion PDF. 2018-07-13 13:19:55 +02:00
Emanuel Schütze
d9d0c84a1a
Merge pull request #3772 from FinnStutzenstein/custom-state-workflow 
Custom workflows and states
 2018-07-13 10:44:16 +02:00
FinnStutzenstein
9e4cafd0f0 Custom workflows and states: 
- Added new workflow list view
 - Added state table for each workflow
 - Added new StateViewSet to handle states of workflows
 2018-07-13 10:29:06 +02:00
Emanuel Schütze
e9b23c89c2
Merge pull request #3769 from emanuelschuetze/fix-dockerfile 
Fix dockerfile to build with gulp4/node10.
 2018-07-02 21:32:37 +02:00
Finn Stutzenstein
56a7bd6840
Merge pull request #3767 from FinnStutzenstein/gdpr-login 
make the privacy policy available for non logged in users (closes #3757)
 2018-06-30 17:03:53 +02:00
Emanuel Schütze
2129ffe73a Fix dockerfile to build with gulp4/node10. 2018-06-26 10:25:24 +02:00
FinnStutzenstein
26d168110f make the privacy policy available for non logged in users (closes #3757) 2018-06-25 17:28:24 +02:00
Emanuel Schütze
4007610a54
Merge pull request #3755 from jsaalfeld/gulp_4 
upgrade to node v10 and gulp 4
 2018-06-18 19:32:33 +02:00
Jochen Saalfeld
c81e318705 Upgrade to node v10 and gulp 4 2018-06-15 08:54:09 +02:00
Emanuel Schütze
393a4f54c2
Merge pull request #3765 from emanuelschuetze/translations 
Updated German translations.
 2018-06-14 13:40:51 +02:00
Emanuel Schütze
8dca3b5321 Updated German translations. 
Changed some strings in source.
Fixed some regressions introduces by new sort-submitters and amendment features.
 2018-06-14 13:08:52 +02:00
Emanuel Schütze
5a5475299c
Merge pull request #3637 from CatoTH/Paragraph-Based-Amendments 
Paragraph based amendments / Diff
 2018-06-14 11:11:39 +02:00
Tobias Hößl
d9c08b65b7 New Feature: Paragraph based amendments 
With new amendment list table:
- Removed title from table, leadmotion can be selected now
- rename the new list, added the export dialog, multiselect actions and supporter badge in the amendment list view
- Moved collission detection to own factory, compute collissions in the amendment list view
- Delegates can now enter paragraph based amendments
- new amendment list as pdf/csv export
- improved caching of amendments
- Parse styles in headings and removed all double-quotes
- Performance improvements:
  * Removed ng-mouseover/mouseleave actions in amendment-list
  * disable collission detection in amendment list view.
  * Improved state/recommendation dropdown in amendment list.
 2018-06-14 11:01:03 +02:00
Emanuel Schütze
7ad7e9fd5d
Merge pull request #3763 from FinnStutzenstein/remarks 
Fixed remarks (closes #3760)
 2018-06-14 09:31:56 +02:00
FinnStutzenstein
66c72f4345 Fixed remarks (closes #3760) 2018-06-14 07:24:55 +02:00
Emanuel Schütze
5735cebcf9
Merge pull request #3647 from FinnStutzenstein/submitterSort2 
Sort submitters
 2018-06-13 14:34:31 +02:00
FinnStutzenstein
b0a42e19e1 Sort submitters 2018-06-13 14:16:25 +02:00
Emanuel Schütze
6b2a736a6c
Merge pull request #3762 from FinnStutzenstein/typo 
typo
 2018-06-13 12:32:16 +02:00
FinnStutzenstein
7ad81d3385 typo 2018-06-13 12:13:49 +02:00
Emanuel Schütze
452f788aaa
Merge pull request #3761 from emanuelschuetze/yarn 
Updated yarn.lock (for using with node 10.x).
 2018-06-13 08:54:08 +02:00
Emanuel Schütze
e21985d608 Updated yarn.lock (for using with node 10.x). 2018-06-12 14:21:44 +02:00
Emanuel Schütze
a5a8a1371e
Merge pull request #3748 from FinnStutzenstein/scrollProjectorToLine 
Scroll projector to a given line
 2018-06-12 13:31:19 +02:00
Emanuel Schütze
97bf5adc6a
Merge pull request #3749 from FinnStutzenstein/motionNumberingException 
Removed the ValidationError in motion numbering (fixed #3680)
 2018-06-12 13:06:29 +02:00
FinnStutzenstein
252ba02e86 Scroll projector to a given line 2018-06-12 13:02:22 +02:00
Emanuel Schütze
011ec56b88
Merge pull request #3759 from emanuelschuetze/release2.2 
Release 2.2
 2018-06-06 15:18:48 +02:00
Emanuel Schütze
2c1ce6ff37 Update version to 2.3-dev. 2018-06-06 14:23:35 +02:00
Emanuel Schütze
8d64c586bc Release 2.2 2018-06-06 14:16:46 +02:00
Emanuel Schütze
bebd7e18e7
Merge pull request #3758 from emanuelschuetze/readme 
Updated README and CHANGELOG for 2.2 release.
 2018-06-06 14:13:49 +02:00
Emanuel Schütze
054a345808 Updated README and CHANGELOG for 2.2 release. 
Rename CHANGELOG to CHANGELOG.rst to show a nice page with linkable sections on GitHub.
 2018-06-06 13:36:37 +02:00
Emanuel Schütze
407b640f80
Merge pull request #3740 from FinnStutzenstein/voting-plugin 
Changes for the voting plugin and usability improvements
 2018-05-29 15:02:37 +02:00
Emanuel Schütze
d555801a45
Merge pull request #3754 from emanuelschuetze/translations 
Updated all translations.
 2018-05-23 16:54:39 +02:00
Emanuel Schütze
e4e6becf02 Updated all translations for 2.2 release. 2018-05-23 16:43:17 +02:00
Emanuel Schütze
1b321fb680
Merge pull request #3750 from FinnStutzenstein/assignmentPollInputs 
no negative votes and better scrolling in forms with number inputs (c…
 2018-05-23 15:58:01 +02:00
Emanuel Schütze
e52910a67b
Merge pull request #3751 from jsaalfeld/dsgvo 
adding working privacy policy
 2018-05-23 15:53:23 +02:00
Jochen Saalfeld
9e66f05603
adding working privacy policy 
In order to archive GDPR compliance we need a privacy policy.
 2018-05-23 15:13:05 +02:00