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 |
|
Sean Engelhardt
|
71e8ccab9c
|
Fix broken nested agenda speaker
|
2018-11-12 13:54:11 +01:00 |
|
Emanuel Schütze
|
7febb92267
|
Template styling improvements
|
2018-11-12 12:01:12 +01:00 |
|
Jochen Saalfeld
|
41caddd976
|
Merge pull request #4002 from FinnStutzenstein/aufrufliste
first work on the call list
|
2018-11-09 10:28:03 +01:00 |
|
FinnStutzenstein
|
c78de2138f
|
planar call list and HTML cleanup
|
2018-11-09 10:11:57 +01:00 |
|
Jochen Saalfeld
|
8b9cbda178
|
Merge pull request #3978 from ostcar/websocket_url
Set websocket url to /ws/
|
2018-11-09 10:02:32 +01:00 |
|
Oskar Hahn
|
8ee9fb1742
|
Set websocket url to /ws
The routing is desided by protocol
|
2018-11-09 09:15:59 +01:00 |
|
Sean
|
acce79a1c6
|
Merge pull request #3989 from emanuelschuetze/i18n
Updated German translations and translatable strings
|
2018-11-08 20:47:59 +01:00 |
|
Emanuel Schütze
|
128f17e7a4
|
Updated German translations and translatable strings
|
2018-11-08 18:50:06 +01:00 |
|
Jochen Saalfeld
|
11a5335777
|
Merge pull request #3970 from FinnStutzenstein/refineCategories
refine category editing and motion numbering. Fixes the current behav…
|
2018-11-08 16:12:13 +01:00 |
|
FinnStutzenstein
|
8f939fa933
|
refine category editing and motion numbering. Fixes the current behavior of double-saving to take effect.
|
2018-11-08 16:01:08 +01:00 |
|
Jochen Saalfeld
|
a2d736bae9
|
Merge pull request #3996 from FinnStutzenstein/client_perms_for_motion
can_manage_metadata and categories on motion create
|
2018-11-08 15:56:28 +01:00 |
|
FinnStutzenstein
|
b25b5dc928
|
can_manage_metadata and categories on motion create
|
2018-11-08 15:51:26 +01:00 |
|
Jochen Saalfeld
|
23b0965ff2
|
Merge pull request #3961 from tsiegleauq/create_angeda_items
Create agenda topics
|
2018-11-08 15:05:40 +01:00 |
|
Sean
|
55d279ca4e
|
Create agenda topics
Also:
Enhanced DragNDrop Component
List Of Speakers
|
2018-11-08 14:54:13 +01:00 |
|
Finn Stutzenstein
|
080b6f52ad
|
Merge pull request #3968 from FinnStutzenstein/ErrorHandling
error handling
|
2018-11-08 11:37:48 +01:00 |
|
Finn Stutzenstein
|
9692c2b92e
|
Merge pull request #3913 from normanjaeckel/NewMotionMetadataPerm
Added new permission to manage metadata
|
2018-11-08 10:21:52 +01:00 |
|
FinnStutzenstein
|
788beaae2a
|
error handling
|
2018-11-08 09:32:39 +01:00 |
|
Finn Stutzenstein
|
cf533d1174
|
Merge pull request #3914 from normanjaeckel/PasswordResetEMail
Added PasswordResetView.
|
2018-11-08 08:53:59 +01:00 |
|
Finn Stutzenstein
|
85b91e7101
|
Merge pull request #3948 from FinnStutzenstein/changeIdClient
ChangeId for the client
|
2018-11-08 08:38:42 +01:00 |
|
FinnStutzenstein
|
445aeb0cb4
|
change id client
|
2018-11-08 08:04:41 +01:00 |
|
Sean
|
321bdeaa46
|
Merge pull request #3994 from tsiegleauq/corner-button
Enhanced head bar no 3
|
2018-11-07 16:32:37 +01:00 |
|