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

6057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean
4f7d860280
Merge pull request #3950 from FinnStutzenstein/refineHttpService 
Refine the HTTP Service.
 2018-11-01 11:30:20 +01:00
FinnStutzenstein
060e68844d Refine the HTTP Service. 2018-11-01 11:22:41 +01:00
Finn Stutzenstein
72e3df8b65
Merge pull request #3928 from normanjaeckel/StripResponse 
Strip out response.data.
 2018-11-01 07:59:59 +01:00
Oskar Hahn
f4cf9f30a1
Merge pull request #3959 from normanjaeckel/AutoupdateSplitUp 
Split up autoupdate functions (sync and async).
 2018-10-30 17:18:45 +01:00
Jochen Saalfeld
e146bc9f71
updating Dockerfile for Version 3 2018-10-30 15:59:02 +01:00
Norman Jäckel
30c0773838 Split up autoupdate functions (sync and async). 2018-10-30 13:07:24 +01:00
Sean
eeb29d140b
Merge pull request #3940 from CatoTH/OpenSlides-3-ChangeRecommendations-internal 
Internal change recommendations
 2018-10-30 10:02:04 +01:00
FinnStutzenstein
e59497bc54
Setting change recommendations internal 2018-10-29 20:33:40 +01:00
Sean
3d65a244cc
Merge pull request #3952 from CatoTH/OpenSlides-3-Diff-Bugfixes 
Diff bugfixes: port of #3946 & #3943 - fixes #3944
 2018-10-29 18:06:52 +01:00
Oskar Hahn
4fb51d8e49
Merge pull request #3941 from ostcar/remove_projektor_code 
Remove old projector code
 2018-10-29 13:48:50 +01:00
Oskar Hahn
b034839ac8 Remove old projector code 2018-10-29 13:10:15 +01:00
Oskar Hahn
f0d60a6a96
Merge pull request #3955 from ostcar/websocket_protocol2 
Move websocket protocoll in apps
 2018-10-29 13:05:40 +01:00
Oskar Hahn
0229bb923d Move websocket protocoll in apps 2018-10-29 12:33:15 +01:00
Oskar Hahn
6ed5650262
Merge pull request #3956 from ostcar/use_typing_protocol 
Use Protocol instead of ABC in cache_provicer
 2018-10-29 12:33:01 +01:00
Norman Jäckel
6441347d10 Strip out response.data. 2018-10-29 08:52:52 +01:00
Oskar Hahn
c405b4b323 Use Protocol instead of ABC in cache_provicer 2018-10-28 10:37:16 +01:00
Oskar Hahn
69e25a57e1
Merge pull request #3953 from ostcar/change_id_fixes 
Add test for second getElement request
 2018-10-27 15:06:11 +02:00
Oskar Hahn
b9e24016c1 Add test for second getElement request 2018-10-27 14:56:22 +02:00
Tobias Hößl
d5bd8761ee
Diff bugfixes: port of #3946 & #3943 - fixes #3944 2018-10-27 11:59:42 +02:00
Finn Stutzenstein
95fab6b991
Merge pull request #3947 from FinnStutzenstein/changeIdQuickfix 
Client quickfix for autoupdates
 2018-10-26 08:24:02 +02:00
FinnStutzenstein
654404f8f4 Client quickfix for autoupdates 2018-10-26 08:19:07 +02:00
Oskar Hahn
bd8ea6fb5b
Merge pull request #3938 from ostcar/public_change_id_api 
Public change id api
 2018-10-26 06:37:12 +02:00
Oskar Hahn
e7d14a8081 Change_id API 
* Improve AutoUpdateFormat
* Receive autoupdate requested via websocket
* Support change_id in query string
* Disable autoupdate at default
* Add websocket protocoll to turn on or off autoupdate
 2018-10-26 06:30:01 +02:00
Oskar Hahn
1c99c0c40a
Merge pull request #3924 from ostcar/remove-old-client 
remove old client
 2018-10-26 06:24:49 +02:00
Oskar Hahn
9eef4da21c remove old client 2018-10-25 16:04:28 +02:00
Sean
02fe1817cb
Merge pull request #3927 from MaximilianKrambach/tags 
Tags
 2018-10-24 11:50:24 +02:00
Maximilian Krambach
126a16b553 Implement tags 2018-10-24 11:23:34 +02:00
Sean
e3cf8102de
Merge pull request #3911 from jsaalfeld/motions_in_categories 
Motions in categories
 2018-10-23 14:20:29 +02:00
Sean Engelhardt
2a06075315 Repair Categories, DataSend and Motion Detail 
update to angular 7
 2018-10-23 13:44:47 +02:00
Jochen Saalfeld
a7b01fc09c implementing sorting in categories (fixes #3903) 2018-10-23 13:19:43 +02:00
Sean
454488028f
Merge pull request #3909 from tsiegleauq/shared-detail-bar 
Shared detail bar
 2018-10-23 12:31:02 +02:00
sean
4d26316e1e Enhance os-head-bar 
Headbar now works with multi slot transclusion
Supports more cases and detail bar

Also adds some UI UX improvements
 2018-10-23 11:47:18 +02:00
Sean
794b978627
Merge pull request #3907 from CatoTH/OpenSlides-3-ChangeRecommendations 
Line Numbering / Change Recommendations
 2018-10-23 09:45:30 +02:00
Tobias Hößl
46ad38a98a
Change recommendations 2018-10-22 18:45:08 +02:00
Tobias Hößl
db25ac6bf4
Diff & Line numbering services 2018-10-22 18:44:58 +02:00
Oskar Hahn
645ae4a784
Merge pull request #3939 from ostcar/update_requirements 
update requirements
 2018-10-20 23:16:12 +02:00
Oskar Hahn
570d32dd6b update requirements 2018-10-19 22:56:00 +02:00
Finn Stutzenstein
214a310069
Merge pull request #3919 from FinnStutzenstein/statute 
statute paragraphs list view
 2018-10-19 07:50:04 +02:00
FinnStutzenstein
64f6f35e31 statute paragraphs list view 2018-10-19 07:41:15 +02:00
Finn Stutzenstein
236dc21d62
Merge pull request #3926 from ostcar/new_autoupdate_format 
New autoupdate format
 2018-10-19 07:40:42 +02:00
Oskar Hahn
5b5d0e395a new autoupdate format 2018-10-19 07:35:59 +02:00
Oskar Hahn
1ba3af968d
Merge pull request #3925 from ostcar/cache_improvements 
Improve redis cache
 2018-10-16 22:06:06 +02:00
Sean
313df50575
Merge pull request #3916 from MaximilianKrambach/os3/fonts 
Switch heading fonts to roboto-condensed
 2018-10-16 14:47:10 +02:00
Maximilian Krambach
2dcf8e8de5 Switch heading fonts to roboto-condensed 2018-10-16 10:58:36 +02:00
Oskar Hahn
bc442210fb Improve redis cache 
* delete only keys with prefix
* Make redis_provider atomic with transactions and lua scripts
* improve lock
* generate change_id in redis to make sure it is uniq
* use miliseconds as starttime
* add argument use max_change_id to get_{full|resticted}_data
 2018-10-15 23:37:26 +02:00
Oskar Hahn
becdef26a8
Merge pull request #3923 from ostcar/new-master 
Merge OpenSlides-3 branch into the master branch
 2018-10-13 07:46:31 +02:00
Oskar Hahn
b1fa3ca263 Merge remote-tracking branch 'upstream/OpenSlides-3' into new-master 2018-10-13 07:38:09 +02:00
Sean
1b3a287642
Merge pull request #3917 from MaximilianKrambach/os3/material-icons 
Adding material icons
 2018-10-12 15:20:21 +02:00
Sean Engelhardt
2cc9188962 Add Material Icon library 
replace font-awesome icons with material icons
 2018-10-12 15:13:57 +02:00
Sean
54ee775c64
Merge pull request #3920 from tsiegleauq/statute-hotfix 
Hotfix for MotionStatute
 2018-10-12 13:20:28 +02:00