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

6106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jochen Saalfeld
f8cfb418f6
adding and implementing logo component 2019-01-16 15:54:34 +01:00
Sean
460b3dcac9
Merge pull request #4113 from jsaalfeld/fix_travis_headless_browser 
Fix Headless Browser Start with Travis
 2019-01-15 13:31:10 +01:00
Jochen Saalfeld
1091ac4e76
Fix Headless Browser Start with Travis 
Even though the documentation of travis still states, that xvfb can be
initialized via init.d, it seems that all images are updated to use
systemd, therefore it was switched to the travis service syntax.
 2019-01-15 13:09:35 +01:00
Norman Jäckel
ce64ff7ac8
Merge pull request #4107 from ostcar/development_tools 
Undo #4086 after pytest is fixed and released
 2019-01-14 21:28:27 +01:00
Jochen Saalfeld
4c02661649
Merge pull request #4102 from MaximilianKrambach/npmfix 
fix vulnerable npm dependency angular-devkit
 2019-01-14 10:00:59 +01:00
Oskar Hahn
6c312cb6a4 Undo #4086 after pytest is fixed and released 2019-01-12 23:28:44 +01:00
Oskar Hahn
5ff16d6c5f
Merge pull request #4081 from ostcar/new_projector 
New projector
 2019-01-12 23:23:06 +01:00
Oskar Hahn
a0f554674b New projector system. Add first slides 2019-01-12 21:21:43 +01:00
Emanuel Schütze
73e1853758
Merge pull request #4094 from emanuelschuetze/ui 
UI improvements
 2019-01-11 17:00:48 +01:00
Emanuel Schütze
1ff84c1ae1 UI improvements 2019-01-11 16:51:43 +01:00
Emanuel Schütze
e69cf2f0f7
Merge pull request #4101 from FinnStutzenstein/prettifier_doku 
added missing documentation about prettifier
 2019-01-11 16:06:01 +01:00
Emanuel Schütze
e8a4480014
Merge pull request #4099 from FinnStutzenstein/motion-title-fix 
fixed motion title in agenda
 2019-01-11 16:02:10 +01:00
Sean
7226d04106
Merge pull request #4076 from MaximilianKrambach/csvimport/motions 
motion csv import
 2019-01-11 15:42:54 +01:00
Maximilian Krambach
5d989a8847 fix vulnerable npm dependency angular-devkit 2019-01-11 11:20:50 +01:00
Maximilian Krambach
060d8c8324 motion csv import 2019-01-11 10:47:20 +01:00
FinnStutzenstein
5196780b3a added missing documentation about prettifier 2019-01-11 10:43:20 +01:00
Finn Stutzenstein
c76e7165af
Merge pull request #4096 from MaximilianKrambach/httpError 
fix login not responding to errors
 2019-01-10 15:07:13 +01:00
Maximilian Krambach
e0e88ce891 fix login not responding to errors 2019-01-10 14:04:10 +01:00
Jochen Saalfeld
2f7336b257
Merge pull request #4067 from FinnStutzenstein/prettify 
Using prettify instead of pretty-quick-wrapper
 2019-01-10 13:12:02 +01:00
FinnStutzenstein
1c895fbea8 run prettifier 2019-01-10 12:54:48 +01:00
FinnStutzenstein
6e87a4bd80 Use prettier 2019-01-10 12:54:22 +01:00
FinnStutzenstein
ebe068155a fixed motion title in agenda 2019-01-10 12:50:12 +01:00
Finn Stutzenstein
b01b20f4b4
Merge pull request #4097 from jsaalfeld/fix_pypi_module_error 
fixing Module not found error
 2019-01-10 12:39:56 +01:00
Jochen Saalfeld
c9df66ffb9
fixing Module not found error 
should fix #4069
 2019-01-10 12:30:13 +01:00
Finn Stutzenstein
44846da4cd
Merge pull request #4095 from jsaalfeld/fix_trailing_slash 
fixing the wsgi server by removing trailing slashes on static files
 2019-01-10 11:46:20 +01:00
Jochen Saalfeld
73a3001a35
fixing the wsgi server by removing trailing slashes on static files 
fixes #4091
 2019-01-09 21:31:48 +01:00
Oskar Hahn
ebf51507f8
Merge pull request #4085 from ostcar/black 
Black
 2019-01-08 22:43:24 +01:00
Oskar Hahn
eddbd86d3a Run black 2019-01-08 21:51:52 +01:00
Oskar Hahn
800055a5ea Format code with black 2019-01-08 21:50:50 +01:00
Sean
405ddaec60
Merge pull request #3963 from MaximilianKrambach/os3/sortSearch 
Sorting/Filters for list views
 2019-01-08 12:23:53 +01:00
Maximilian Krambach
59ec1c552a sorting and filters for listViews 2019-01-08 11:08:01 +01:00
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