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

6575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
f837bf52b3
Merge pull request #4060 from jsaalfeld/tag_list_shift_enter 
adding "shift-enter"-Submit for TagList
 2019-01-07 15:12:00 +01:00
Jochen Saalfeld
29188888f8
adding "shift-enter"-Submit for TagList 2019-01-07 14:44:42 +01:00
Sean
27ca69ba49
Merge pull request #4089 from jsaalfeld/update_development 
updating development.rst and add missing fields to package.json
 2019-01-07 14:26:35 +01:00
Jochen Saalfeld
66d71a6ce1
updating development.rst and add missing fields to package.json 
The Development.rst was still a bit outdated and has now been fixed to be
coherent with the current development process.

Fixes #4083
 2019-01-07 14:09:30 +01:00
Jochen Saalfeld
e6ba2bc3fd
Merge pull request #4087 from MaximilianKrambach/devkit 
update vulnerable dependency (angular-devkit)
 2019-01-07 11:52:26 +01:00
Maximilian Krambach
c7cd510819 update dependency (angular-devkit) 2019-01-07 10:08:34 +01:00
Emanuel Schütze
f9c4f01f06
Merge pull request #4080 from CatoTH/v3-LineNumbering-Config-Variables 
Take motion configuration variables, some layout-fixes
 2019-01-07 09:52:09 +01:00
Tobias Hößl
61a3de593a
Take motion configuration variables, some layout-fixes 2019-01-07 09:22:55 +01:00
Emanuel Schütze
6db5c90180
Merge pull request #4084 from ostcar/fix_example_data_generator 
Fix example data generator
 2019-01-07 08:40:38 +01:00
Emanuel Schütze
256f4e75a3
Merge pull request #4075 from MaximilianKrambach/multiSelect-tweaks 
Multiselect dialogs with multiple choice options
 2019-01-07 08:39:01 +01:00
Oskar Hahn
6be0378c2b
Merge pull request #4086 from ostcar/pin_pytest_version 
Fix pytest to a version lower 4.1 until a bug in pytest-asyncio is fixed
 2019-01-06 20:33:37 +01:00
Oskar Hahn
c824888c98 Fix pytest to a version lower 4.1 until a bug in pytest-asyncio is fixed 2019-01-06 20:23:28 +01:00
Oskar Hahn
8fd82434af Fix example data generator 
fix #4066
 2019-01-04 16:15:45 +01:00
Maximilian Krambach
0deb5ba6c3 MultiSelect rework 
- Multiselect dialog with multiple choice options
- Some functionalities added
- ui improvements
 2019-01-04 14:49:34 +01:00
Finn Stutzenstein
211a0b8ebb
Merge pull request #4077 from FinnStutzenstein/translate_extract_hotfix 
ngx translate extract hotfix
 2018-12-20 11:37:37 +01:00
FinnStutzenstein
af67164972 ngx translate extract hotfix 2018-12-20 11:20:34 +01:00
Finn Stutzenstein
5718c6f326
Merge pull request #4072 from MaximilianKrambach/agendaexport_internalItem 
simpler csv export option for agenda type
 2018-12-20 08:08:52 +01:00
Emanuel Schütze
f3fc85aa7e
Merge pull request #4043 from CatoTH/Issue3975-Bugfix-initial-values 
Bugfix for initial values of merge_amendment_into_final - #3975
 2018-12-19 11:17:42 +01:00
Tobias Hößl
ef210dcc52 Bugfix for initial values of merge_amendment_into_final - #3975 2018-12-19 10:39:36 +01:00
Emanuel Schütze
a164b3416e
Merge pull request #4068 from CatoTH/Amendment-Bugfixes-20181216 
Amendment bugfixes
 2018-12-19 09:47:15 +01:00
Maximilian Krambach
c56a2880a4 simpler csv export option for agenda type 2018-12-19 09:32:56 +01:00
Emanuel Schütze
70437ed083
Merge pull request #4073 from ostcar/fix_key_error_in_master 
fix keyerror introduced by #3985
 2018-12-17 13:45:05 +01:00
Oskar Hahn
e09c5f415a fix keyerror introduced by #3985 2018-12-17 13:34:17 +01:00
Jochen Saalfeld
6c9fb713e1
Merge pull request #4056 from MaximilianKrambach/os3/agendaexport 
agenda csv export
 2018-12-17 11:48:29 +01:00
Maximilian Krambach
eeb0afa499 agenda csv export 2018-12-17 11:34:31 +01:00
Sean
3a2df3b731
Merge pull request #4059 from tsiegleauq/agenda-list-controls 
Add controls to agenda list
 2018-12-16 20:55:28 +01:00
Sean Engelhardt
a338884a62 Add controls controls to agenda list 
Adds information about duration, visibility and comment to agenda list view
Allows channg these information over a dialog component on the
information column
 2018-12-16 19:35:37 +01:00
Oskar Hahn
5fc868cbee
Merge pull request #3985 from ostcar/cleanup_access_permission 
Refactor assess_permission
 2018-12-16 15:12:35 +01:00
Tobias Hößl
058d87eb77
Bugfix: change detection for change recommendations 2018-12-16 14:54:32 +01:00
Tobias Hößl
f15cb4d42e
Bugfix: Creating amendments ./. empty supporters_id 2018-12-16 13:44:05 +01:00
Oskar Hahn
9bb77817dd Refactor assess_permission 
* Remove access_permission.get_full_data()
* Remove access_permission.gcet_serializer_class()
* get serializer class from model
 2018-12-16 09:10:52 +01:00
Jochen Saalfeld
2c16d1893e
Merge pull request #3991 from Fadiabb/full-text-search 
adding full search component
 2018-12-13 13:16:01 +01:00
Fadi Abbud
f5ee0daf00 adding full search component 2018-12-13 12:40:51 +01:00
Jochen Saalfeld
12ce434db5
Merge pull request #4058 from jsaalfeld/list_dingens 
multiple frontend changes on multi-select lists
 2018-12-13 11:40:10 +01:00
Jochen Saalfeld
1336c2c6bb
multiple frontend changes on multi-select lists 2018-12-13 11:20:06 +01:00
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