Commit Graph

6140 Commits

Author SHA1 Message Date
Emanuel Schütze
b900dfcba3
Merge pull request #4050 from FinnStutzenstein/remove_action_word
removed action word from states
2018-12-13 10:05:11 +01:00
Finn Stutzenstein
99d6c8454f
Merge pull request #4047 from jsaalfeld/travis_prettier
naming tasks and add format check for client
2018-12-13 08:36:00 +01:00
Finn Stutzenstein
e21668bd62
Merge pull request #4054 from normanjaeckel/FixTest
Fixed Test
2018-12-13 08:19:57 +01:00
Jochen Saalfeld
656753c2a7
Merge pull request #4048 from jsaalfeld/user_profile_enhancement
add change password field for users/admins
2018-12-12 14:23:39 +01:00
Jochen Saalfeld
73cbd8f687
add change password field for users/admins 2018-12-12 13:15:51 +01:00
Sean
659f9f116a
Merge pull request #4052 from tsiegleauq/motion-attachments
Motion Attachments + Restructure
2018-12-10 18:02:29 +01:00
Sean Engelhardt
00db199947 Motion Attachments + Restructure 2018-12-10 17:54:49 +01:00
Jochen Saalfeld
b024960a51
naming tasks and add format check for client 2018-12-10 14:07:27 +01:00
Norman Jäckel
d7231e60f2 Fixed Test 2018-12-07 21:06:30 +01:00
Sean
574fde5f6d
Merge pull request #4051 from FinnStutzenstein/manage_submitters
Manage submitters
2018-12-06 16:00:14 +01:00
FinnStutzenstein
2e7bbcc981 Manage submitters 2018-12-06 15:54:02 +01:00
Sean
527382367a
Merge pull request #4049 from tsiegleauq/motion-block
Add motion blocks
2018-12-06 12:40:46 +01:00
Sean Engelhardt
03508c903f Add motion blocks 2018-12-06 12:28:06 +01:00
FinnStutzenstein
362e2f154f removed action word from states 2018-12-06 11:47:33 +01:00
Emanuel Schütze
d11154cfc1
Merge pull request #4028 from jsaalfeld/fix_redis
the redis host needs to be configured for channel layers
2018-12-03 14:15:59 +01:00
Emanuel Schütze
cde1c04e5a
Merge pull request #4031 from jsaalfeld/fix_docker_build
fix the docker build
2018-12-03 14:14:59 +01:00
Emanuel Schütze
3b72e720b3
Merge pull request #4046 from emanuelschuetze/translations
Updated translations.
2018-11-30 14:02:51 +01:00
Emanuel Schütze
b578c58ac9 Updated translations. 2018-11-30 13:55:43 +01:00
Sean
c416f7a1be
Merge pull request #3977 from normanjaeckel/HistoryModel
OpenSlides history mode
2018-11-30 12:51:09 +01:00
Sean Engelhardt
0c62c1c864 History mode on client side
Add view for full history and History Repom TimeTravelService
Add function time travel routine
Updated the HTTP Service, fixed usage of storage, OSStatus Service, fixed loading of the history data
2018-11-30 12:42:13 +01:00
Sean
d4d4ac838f
Merge pull request #4040 from MaximilianKrambach/os3/multiSelect2
Multiselect for advanced options
2018-11-30 11:04:54 +01:00
FinnStutzenstein
7a56e6c3c0 travis.. 2018-11-30 10:28:14 +01:00
FinnStutzenstein
428e58db9b move to agenda 2018-11-30 10:10:13 +01:00
Norman Jäckel
060856628b OpenSlides history mode.
Also containing auth check and viewpoint to clear history.
2018-11-30 09:51:10 +01:00
FinnStutzenstein
212bce1c08 rework motion submitters to clear confusion about creation and normal update.
Also docs and cleanup
2018-11-30 09:47:21 +01:00
Maximilian Krambach
1de2161ded make choice dialog proper scrollable 2018-11-30 09:47:19 +01:00
FinnStutzenstein
d49b796b29 travis and prettify 2018-11-30 09:47:16 +01:00
Emanuel Schütze
82b26347e2 Added new multiselect actions. 2018-11-30 09:47:14 +01:00
Finn Stutzenstein
0a823877c2
Merge pull request #4044 from jsaalfeld/fix_ts_version_conflict
fixing ts version due to conflict
2018-11-30 09:46:45 +01:00
Jochen Saalfeld
30f45822c9
fixing ts version due to conflict
"@angular/compiler-cli@7.1.1 requires typescript@'>=3.1.1 <3.2'
2018-11-30 09:33:13 +01:00
Finn Stutzenstein
8f3f7719b1
Merge pull request #4042 from FinnStutzenstein/fixedMigrations
Fixed user migrations
2018-11-30 08:10:05 +01:00
Norman Jäckel
9e007437ec
Merge pull request #4037 from normanjaeckel/MultiSubmitters
Added multi select for motion submitters, tags and recommendations.
2018-11-29 20:16:49 +01:00
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