Commit Graph

7908 Commits

Author SHA1 Message Date
FinnStutzenstein
598a726394 Fixed user migrations 2018-11-29 16:13:31 +01:00
Sean
ad1fcfdb00
Merge pull request #3975 from CatoTH/OpenSlides-3-Amendments
Amendments
2018-11-29 14:45:12 +01:00
Tobias Hößl
afad235bad Show amendments in detail view 2018-11-29 14:11:27 +01:00
Sean
e694d9e0dd
Merge pull request #4038 from emanuelschuetze/motion-ui
Improved UI of motion list and detail view
2018-11-29 12:40:35 +01:00
Emanuel Schütze
ed47ac4884 Improved UI of motion list and detail view 2018-11-29 12:31:52 +01:00
Finn Stutzenstein
86e858c800
Merge pull request #4036 from FinnStutzenstein/calllist_export
Call list csv export
2018-11-29 08:47:38 +01:00
FinnStutzenstein
80fce9a173 prevalidate agenda items on assign 2018-11-29 08:42:16 +01:00
FinnStutzenstein
6a8976b8ca Call list export
refined the export service to accept a generic map function, so arbitrary values can put into the csv
2018-11-29 08:25:36 +01:00
Norman Jäckel
cfd5cf3c7e Added viewpoint to assign multiple items to a new parent item. 2018-11-27 23:46:41 +01:00
Norman Jäckel
261083ac69 Added multi select for motion submitters, tags and recommendations. 2018-11-27 23:46:39 +01:00
Sean
3c4936764d
Merge pull request #3993 from MaximilianKrambach/os3/multiSelect
multiSelect on listViews
2018-11-27 14:11:28 +01:00
Maximilian Krambach
b5aebe5615 multiSelect on listViews 2018-11-27 14:03:02 +01:00
Finn Stutzenstein
fed085c319
Merge pull request #4033 from FinnStutzenstein/motion_virtual_sort
OpenSlides ♥ Trees
2018-11-23 17:41:56 +01:00
FinnStutzenstein
80782ccbec OpenSlides ♥ Trees 2018-11-23 17:32:20 +01:00
Jochen Saalfeld
ec7f63b52d
Merge pull request #4029 from Fadiabb/CSV-export
add csv for motions
2018-11-23 11:21:41 +01:00
Sean
10714bbbe4
Merge pull request #4032 from FinnStutzenstein/new_configs
new configs for statute amendments; improved the majorityMethod confi…
2018-11-23 11:15:07 +01:00
Fadi Abbud
021cc0a393
add CSV for motions
This does the csv export for the user list

emanuelschuetze:
Uses right order and translatable labels

jsaalfeld:
fixing some documentation, rebasing to master and fixing strings
and coding style.

fixing #4035
2018-11-23 11:12:56 +01:00
Jochen Saalfeld
14b2d33d00
Merge pull request #4016 from FinnStutzenstein/postgres_no_error
Do not try to access the database during migrations
2018-11-23 08:19:06 +01:00
FinnStutzenstein
3d4bd67980 new configs for statute amendments; improved the majorityMethod config variable
Removed none from os-search-value-selector; improved list of speakers
2018-11-22 17:34:00 +01:00
Finn Stutzenstein
8a7d0e8be9
Merge pull request #4018 from FinnStutzenstein/nested_dnd
angular2 tree
2018-11-22 17:21:45 +01:00
FinnStutzenstein
8e59170b76 Do not try to access the database during migrations 2018-11-22 17:20:17 +01:00
FinnStutzenstein
101d6c96cd using angular2 tree for the nested motion call list 2018-11-22 17:16:20 +01:00
Sean
8473a48caf
Merge pull request #4027 from tsiegleauq/tinymce
Include TinyMCE
2018-11-22 16:28:25 +01:00
Sean Engelhardt
c52b86a33f Include TinyMCE 2018-11-22 15:57:51 +01:00
Jochen Saalfeld
22a91750e8
fix the docker build 2018-11-22 11:53:01 +01:00
Finn Stutzenstein
f91c756b14
Merge pull request #4030 from FinnStutzenstein/style_fixes
Fixed style issues introduced with #4025
2018-11-22 10:19:34 +01:00
FinnStutzenstein
9f05929251 Fixed style issues introduced with #4025 2018-11-22 09:52:24 +01:00
Jochen Saalfeld
09e2629b64
the redis host needs to be configured for channel layers
otherwise the post migration signal in django will try to establish an connection to localhost, no matter what redis server ip or adress was entered
2018-11-22 09:08:22 +01:00
Sean
d8886eb08f
Merge pull request #4026 from jsaalfeld/clean_repository_service
moving http-post to repository
2018-11-21 15:01:56 +01:00
Jochen Saalfeld
76bfa16232
moving http-post to repository 2018-11-21 14:56:04 +01:00
Jochen Saalfeld
0a361665c4
Merge pull request #4025 from Fadiabb/shift-enter-submit
add shift-enter shortcut
2018-11-21 14:52:37 +01:00
Fadi Abbud
da8b456d90 add shift-enter shortcut
add the possibilty to hit shift and enter to save fomrs
2018-11-21 14:46:08 +01:00
Sean
224f98bf49
Merge pull request #4022 from CatoTH/Bugfix-Diff-Port
OS3-Port of #4020
2018-11-21 13:27:37 +01:00
Oskar Hahn
619a589731
Merge pull request #4021 from ostcar/fix_double_elements_in_autoupdate
fix douple elements
2018-11-20 22:34:02 +01:00
Sean
01c593e9be
Merge pull request #3957 from CatoTH/StatuteParagraphAmendments
Creating / Editing / Showing statute paragraph amendments
2018-11-20 16:54:16 +01:00
Jochen Saalfeld
7ae95b9208
Merge pull request #4019 from tsiegleauq/mediafile-upload
Upload media files
2018-11-20 16:15:34 +01:00
Tobias Hößl
d3fc006ddc Creating / Editing statute paragraph amendments 2018-11-20 14:40:01 +01:00
Sean Engelhardt
e791177ac5 Upload media files 2018-11-20 14:29:36 +01:00
Tobias Hößl
88ee3053c9
OS3-Port of #4020 2018-11-19 20:45:25 +01:00
Oskar Hahn
67d933a206 fix douple elements 2018-11-18 07:57:44 +01:00
Finn Stutzenstein
4f7fa31f22
Merge pull request #4013 from CatoTH/Issue3958-Default-Internal-Value
Change default of change recommendation internal value to public
2018-11-15 15:16:12 +01:00
Tobias Hößl
ffc0cd9423
Change default of change recommendation internal value to public 2018-11-15 13:16:43 +01:00
Sean
890196fdcb
Merge pull request #4012 from tsiegleauq/angular703
update dependencies and prettierrc
2018-11-15 02:03:59 -08:00
Sean Engelhardt
d67e39b994 update dependencies and prettierrc 2018-11-15 10:24:37 +01:00
Sean
734c7c872b
Merge pull request #4011 from jsaalfeld/fix_wss_connection
fix #4010
2018-11-14 06:30:20 -08:00
Jochen Saalfeld
d70d9c4b09
fix #4010 2018-11-14 15:14:08 +01:00
Sean
759ae91aa0
Merge pull request #4008 from tsiegleauq/speaker-indicator-in-list
Speaker indicators in Lists
2018-11-12 09:07:03 -08:00
Sean Engelhardt
d968761377 Speaker indicators in Lists 2018-11-12 18:01:04 +01:00
Jochen Saalfeld
aa497ad543
Merge pull request #4006 from tsiegleauq/fix_list_of_speakers
Fix broken nested agenda speaker
2018-11-12 14:52:51 +01:00
Sean
e5ee71d1a3
Merge pull request #4005 from emanuelschuetze/ui
Template styling improvements
2018-11-12 05:10:26 -08:00