Compare commits

...

5538 Commits
2.0a1 ... main

Author SHA1 Message Date
Emanuel Schütze 94263da223
Updated autoupdate service (#6446) 2022-06-20 16:01:22 +02:00
Emanuel Schütze 0e6f223cf0
Updated services (#6445) 2022-06-17 18:51:59 +02:00
GabrielInTheWorld b053baa5a6
Updating auth service (#6444) 2022-06-16 19:28:15 +02:00
Emanuel Schütze 52af4ac0da
Updated client (#6442) 2022-06-14 12:49:55 +00:00
Emanuel Schütze 37f8d76c24
Updated services (#6441) 2022-06-14 08:55:09 +00:00
Emanuel Schütze b251b942c3
Updated client (#6439) 2022-06-10 16:19:48 +00:00
Emanuel Schütze 986f55382d
Updated AU and client (#6438) 2022-06-10 18:07:48 +02:00
peb-adr 11d70bec88
Updated client,AU,icc,vote (#6437)
Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-06-10 12:13:16 +00:00
Emanuel Schütze 47d7c48425
Updated services (#6436) 2022-06-09 16:45:52 +02:00
peb-adr 4cc5c55b13
Updated client (#6435)
Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-06-08 17:10:00 +00:00
Emanuel Schütze e343bb7e6b
Updated services + Add OpenTelemetry (#6434)
OpenTelemetry now available in dev mode.
 -> run `make run-dev-otel`
As of now backend and datastore report spans.
2022-06-08 16:46:14 +00:00
Emanuel Schütze 676be7f1fa
Updated services (#6432) 2022-06-02 14:38:44 +00:00
Emanuel Schütze aeffbb6622
Updated services (#6431) 2022-05-31 22:32:52 +02:00
Emanuel Schütze 05a1712131
Updated services (#6430) 2022-05-30 17:03:45 +02:00
peb-adr f41c117cd0
Updated services (#6429)
Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-05-25 18:39:28 +02:00
Emanuel Schütze b5ddb57b06
Updated services (#6426) 2022-05-20 18:34:21 +02:00
Emanuel Schütze 5fd8e184e0
Updated client (#6425) 2022-05-19 12:33:05 +00:00
Emanuel Schütze 88a45044e8
Updated services (#6424) 2022-05-19 09:43:32 +02:00
peb-adr 8d9d114fca
Updated services (#6423)
Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-05-18 11:36:18 +02:00
Emanuel Schütze 110f4d769d
Updated client (#6422) 2022-05-17 08:55:14 +00:00
peb-adr 1467f2b529
Updated services (#6421)
Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-05-16 17:36:36 +00:00
peb-adr 43a218f58a
Updated services (#6420)
Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-05-16 14:43:45 +02:00
peb-adr 73ddad152d
Updated services (#6419)
Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-05-13 17:05:07 +02:00
Ralf Peschke 6ac9bde47d
Issue6417 last modules set to main (#6418) 2022-05-11 11:33:52 +00:00
Emanuel Schütze c5b95594d8
Updated services (#6416) 2022-05-10 05:32:26 +00:00
Emanuel Schütze 464a0e59e8
Updated client (#6415) 2022-05-02 09:09:14 +00:00
Emanuel Schütze b1f2574205
Updated services (#6414) 2022-04-29 12:08:53 +02:00
Emanuel Schütze f900b0dbcf
Updated services (#6411) 2022-04-27 10:51:04 +00:00
Emanuel Schütze 96ad0652d5
Updated services (#6410) 2022-04-25 13:44:35 +00:00
Emanuel Schütze e34be730d8
Updated services (#6406) 2022-04-23 16:06:52 +00:00
Emanuel Schütze ce1c30661a
Updated services (#6405) 2022-04-20 17:59:45 +00:00
Emanuel Schütze 17bbbc9962
Updated services and AUTHORS (#6395) 2022-03-30 13:31:23 +02:00
dependabot[bot] 5bf57687b2
Bump minimist from 1.2.5 to 1.2.6 in /integration (#6390)
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-26 19:06:30 +01:00
Emanuel Schütze cfdcb80874
Use version 4.0.0-beta (#6389) 2022-03-26 06:33:33 +01:00
Emanuel Schütze 1d38d096e8
Updated services (#6388) 2022-03-25 11:25:46 +00:00
Emanuel Schütze c2019bcb07
Updated services (#6387) 2022-03-24 08:15:57 +00:00
Emanuel Schütze 871a42532a
Updated services (#6386) 2022-03-22 12:51:29 +00:00
Emanuel Schütze abe1597bd1
Updated services (#6384) 2022-03-21 16:55:11 +01:00
dependabot[bot] 023e445930
Bump follow-redirects from 1.14.7 to 1.14.8 in /integration (#6360)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-03-17 12:59:36 +00:00
Emanuel Schütze f8347972fa
Updated services (#6383) 2022-03-11 14:25:43 +00:00
Emanuel Schütze a54555dc62
Updated services (#6382) 2022-03-09 14:23:05 +00:00
Emanuel Schütze f5425644e5
Updated services (#6381) 2022-03-04 16:14:23 +01:00
peb-adr 0b7f0c4073
Updated services (#6379) 2022-03-03 17:33:09 +00:00
Emanuel Schütze 3090779e7a
Updated services (#6377) 2022-03-01 18:18:30 +01:00
Emanuel Schütze 35d0d9d365
Updated services (#6375) 2022-02-25 14:31:18 +00:00
peb-adr a8f19e9901
cleanup services-to-main.sh (#6372)
- remove -B from checkout, didn't work as expected
- all submodules are now using main, fallback to master no longer needed
- make using git pull optional (--pull)

Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-02-25 15:16:36 +01:00
Emanuel Schütze acfb4554d2
Updated AUTHORS (#6374) 2022-02-25 11:27:33 +01:00
Emanuel Schütze 92e658ab50
Updated services (#6373) 2022-02-24 10:24:43 +01:00
Emanuel Schütze 283383bb26
Updated services (#6368) 2022-02-17 18:10:29 +01:00
Emanuel Schütze 81e75aabe2
Updated services (#6363) 2022-02-17 14:50:55 +01:00
GabrielInTheWorld 473c742681
Speed up the 'make run-dev' command (#6362) 2022-02-16 16:19:58 +01:00
bug0001 b9ca06af25
Documentation improvements (#6350)
Documentation improvements OS4
2022-02-16 11:24:50 +00:00
Emanuel Schütze 8f2fb37f79
Updated services (#6358) 2022-02-14 15:05:15 +00:00
Emanuel Schütze a98349020a
Updated services (#6357) 2022-02-11 12:20:40 +00:00
Emanuel Schütze a1d0d2cf44
Updated services (#6349) 2022-02-03 23:03:50 +00:00
Emanuel Schütze 18a8449b5c
Updated package-lock.json (#6348) 2022-02-03 17:42:18 +01:00
GabrielInTheWorld 13b3204dab
Update DEVELOPMENT.md (#6347)
Changes some wording to prevent mixing up "git checkout" with "After checking out".
2022-02-03 16:09:15 +00:00
Emanuel Schütze 714a03c154
Updated services (#6345) 2022-01-28 18:04:11 +00:00
Emanuel Schütze 04d2676b0b
Updated services (#6344) 2022-01-25 17:26:19 +00:00
Emanuel Schütze 9edf0487f1
Updated services (#6341) 2022-01-21 17:28:53 +01:00
Ralf Peschke df8c36030d
Open port 5678 for debugpy in dev (#6340)
Co-authored-by: Ralf Peschke <rpeschke@peschke-it.de>
2022-01-20 09:24:53 +01:00
Emanuel Schütze 532be0bac7
Updated services (#6339) 2022-01-19 16:18:25 +00:00
peb-adr d54499f633
make services-to-main.sh more compatible (#6332) 2022-01-18 19:46:13 +00:00
Emanuel Schütze 7b24b3db36
Updated services (#6333) 2022-01-14 17:07:19 +00:00
Emanuel Schütze 97a83af8c8
Updated services (#6331) 2022-01-14 00:32:03 +00:00
Emanuel Schütze e3ad7d2e1f
Use 'main' as default branch in services-to-main.sh. (#6330) 2022-01-13 19:10:34 +01:00
peb-adr ff13c99818
proxy: check ALLOWED_HOSTS only for client requests (#6328)
This feature is only intended to identify misdirected browser requests.
The other routes are called by services/tools which will not necessarily
set the 'Host' header and thus break.

Co-authored-by: Adrian Richter <adrian@intevation.de>
2022-01-12 17:11:21 +01:00
Emanuel Schütze 670bbdba5a
Updated services (#6326) 2022-01-10 17:09:19 +00:00
Sean 88dad9fc3e
Set various information to "main" (#6325)
Changes various usages from master to main
2022-01-10 17:46:40 +01:00
Norman Jäckel fa0fa370d6
Added LABELS to proxy's Dockerfile. (#6323) 2022-01-07 20:12:51 +00:00
Emanuel Schütze b8e01143ba
Merge pull request #6324 from emanuelschuetze/update-20220107
Updated services
2022-01-07 20:49:18 +01:00
Emanuel Schütze 504b620a40 Updated services 2022-01-07 20:21:11 +01:00
Emanuel Schütze b4bee3483f
Merge pull request #6320 from emanuelschuetze/update20220106
updated services
2022-01-06 23:59:58 +01:00
Emanuel Schütze 51bfd49aa5 updated services 2022-01-06 23:38:44 +01:00
Emanuel Schütze d75d11a511
Merge pull request #6319 from emanuelschuetze/update-20220106
Updated services
2022-01-06 16:09:20 +01:00
Emanuel Schütze 0e18053510 Updated services 2022-01-06 15:50:56 +01:00
Emanuel Schütze f0bff0a754
Merge pull request #6316 from gsiv/update-buildsh
docker/build.sh: Add ICC and voting service
2022-01-06 15:45:33 +01:00
peb-adr 3ecbd356dc
Merge pull request #6315 from peb-adr/proxy-ahosts
proxy: add ALLOWED_HOSTS env var
2022-01-06 12:41:09 +01:00
Gernot Schulz c841f817b2 docker/build.sh: Add ICC and voting service 2021-12-28 13:45:37 +01:00
root ba74f33e68 proxy: add ALLOWED_HOSTS env var
will setup caddy to check if the Host-header matches one of the space
delimited fields in ALLOWED_HOSTS. Or do no such thing if ALLOWED_HOSTS
is not set.
2021-12-22 12:42:46 +01:00
Emanuel Schütze b2741c782e
Merge pull request #6313 from emanuelschuetze/update-20211210
Updated services
2021-12-10 18:50:36 +01:00
Emanuel Schütze a3455c3981 Updated services 2021-12-10 18:18:52 +01:00
Norman Jäckel 51c72c543c
Merge pull request #6309 from peb-adr/local-prod
add local production setup
2021-12-10 16:34:08 +01:00
Emanuel Schütze 8a325e1569
Merge pull request #6312 from emanuelschuetze/services-to-master
Updated services-to-master script
2021-12-10 15:54:11 +01:00
Adrian Richter 26ef35f72e add local production setup 2021-12-10 12:45:06 +01:00
Emanuel Schütze 1241a651c6 Updated services-to-master script 2021-12-10 12:44:13 +01:00
GabrielInTheWorld 95504ce8c0
Merge pull request #6310 from GabrielInTheWorld/dev
Improves the 'services-to-master' function
2021-12-10 10:20:16 +01:00
GabrielInTheWorld 29edcc18f0 Improves the 'services-to-master' function 2021-12-09 16:23:36 +01:00
Emanuel Schütze 74f4f2dfbd
Merge pull request #6307 from emanuelschuetze/update-20211208
Updated services
2021-12-08 17:12:58 +01:00
Emanuel Schütze 119576f4a5 Updated services 2021-12-08 16:23:33 +01:00
Emanuel Schütze eb79dd9aca
Merge pull request #6305 from tsiegleauq/fix-icc-integration
Fix ICC integration
2021-12-07 20:14:58 +01:00
Sean 44e9c99eb3 Fix ICC integration
Updates the ICC Service
Changes the ICC port to 9007
Adjust the proxy
Adjust services.env
2021-12-07 17:47:09 +01:00
Emanuel Schütze 396dc75961
Merge pull request #6303 from GabrielInTheWorld/new-service-to-master
Automatically checkout the latest commit for every submodule
2021-12-07 16:43:30 +01:00
GabrielInTheWorld 9809eb029c Automatically checkout the latest commit for every submodule
Adds a new script "services-to-master.sh" and updates the Makefile
2021-12-02 15:17:14 +01:00
Emanuel Schütze fd3371dd0b
Merge pull request #6302 from emanuelschuetze/update20211201
Updated services
2021-12-02 12:09:16 +01:00
Emanuel Schütze 5762c4a9a0 Updated services 2021-12-02 11:49:02 +01:00
Emanuel Schütze 3d56027ae4
Update README.md 2021-11-30 22:03:19 +01:00
Emanuel Schütze 845f8c5676
Merge pull request #6297 from emanuelschuetze/update-serices20211125
Updated services
2021-11-25 23:00:12 +01:00
Emanuel Schütze 003acc1b78 Updated services 2021-11-25 20:29:43 +01:00
Sean f4e3257d88
Merge pull request #6293 from tsiegleauq/cypress-integration-no-docker
Run cypress workflow without docker
2021-11-24 11:30:11 +01:00
Sean fe163c809d
Merge pull request #6288 from ostcar/vote-volumes
Add volumes to vote-dev-environment
2021-11-24 10:57:24 +01:00
Sean 693e116222 Run cypress workflow without docker
Runs the cypress workflow directly without docker
2021-11-23 22:47:49 +01:00
Sean 3adea03883
Merge pull request #6291 from tsiegleauq/remove-announce-workflow
Remove GHActions to announce file changes
2021-11-23 10:58:57 +01:00
Sean 12308fbe3c Remove GHActions to announce file changes
Removes the GHActions that would create issues when files change.
The files in question were moved to the backend-repo
2021-11-23 10:31:32 +01:00
Sean 597da01430
Merge pull request #6290 from peb-adr/actions-build-vote
add vote-service to build-images workflow
2021-11-22 17:14:21 +01:00
Adrian Richter d77a14d233 add vote-service to build-images workflow 2021-11-22 15:54:09 +01:00
GabrielInTheWorld 0ab17c3597
Merge pull request #6284 from peb-adr/fix-proxy-dev
fix missing caddy_base when rebuilding
2021-11-22 11:58:31 +01:00
peb-adr 004ff453bc
Merge branch 'master' into fix-proxy-dev 2021-11-22 11:00:06 +01:00
Oskar Hahn 77dac78d88 Add volumes to vote-dev-environment
needed for auto reload
2021-11-19 19:53:15 +01:00
Emanuel Schütze 77d672544c
Merge pull request #6286 from emanuelschuetze/update-20211118
Updated services
2021-11-18 20:23:46 +01:00
Emanuel Schütze df08720d0e Updated services 2021-11-18 17:53:59 +01:00
GabrielInTheWorld e0b2679941
Merge pull request #6274 from tsiegleauq/add-vote-service
Add vote service to OS4 setup
2021-11-18 14:56:36 +01:00
Sean Engelhardt 6846b2ab91 Add vote service to OS4 setup
Integrate vote service, makes according changes to configuration
Updates the client to integrate the vote service
Updates the backend to integrate the vote service
2021-11-17 23:32:40 +01:00
Adrian Richter 3dabed8667 fix missing caddy_base when rebuilding 2021-11-17 17:57:34 +01:00
Sean 67a82de70c
Merge pull request #6281 from GabrielInTheWorld/new-dev-setup
Change the initial data
2021-11-15 15:04:47 +01:00
GabrielInTheWorld bed69cf9d2 Change the initial data 2021-11-15 14:40:03 +01:00
Sean 3b798b8ce8
Merge pull request #6275 from peb-adr/https
make local cert file location adjustable
2021-11-11 15:46:36 +01:00
Adrian Richter 84d38dc553 make local cert file location adjustable 2021-11-11 15:17:38 +01:00
Ralf Peschke a100ff22b1
Issue1008 Backend: models.yml etc. moved to backend, remove omitted workflows 2021-11-11 14:37:39 +01:00
Emanuel Schütze e9d0c07eb4
Merge pull request #6271 from emanuelschuetze/updateServices
Updated services
2021-11-04 16:33:47 +01:00
Emanuel Schütze 8a0fd4473c Updated services 2021-11-04 10:59:15 +01:00
Ralf Peschke 7a679dc530 Remove omitted workflows 2021-11-03 13:30:24 +01:00
Ralf Peschke 34eb57a31d
Merge pull request #6265 from r-peschke/BAIssue678_smtp-server
ClientIssue553: Add Testmailserver to openslides-dev-setup
2021-11-02 17:23:08 +01:00
Ralf Peschke 60e4e537f8 Remove caddy volume 2021-11-02 17:03:05 +01:00
Ralf Peschke 8c6edaf4b0 BAIssue1008: models.yml etc. deleted from repo 2021-11-01 18:51:58 +01:00
Ralf Peschke 912fafcca3 ClientIssue553: Add Testmailserver to openslides-dev-setup 2021-10-29 16:46:15 +02:00
reiterl b7263f0c3c
Merge pull request #6269 from reiterl/rename_in_progress
Rename one motion_state in initial/example data.
2021-10-29 10:18:04 +02:00
Ludwig Reiter 60d266789e Use newest backend. 2021-10-28 15:17:23 +02:00
Ludwig Reiter 95e48b05c2 Rename one motion_state in initial/example data. 2021-10-28 15:10:47 +02:00
reiterl 4430f0560a
Merge pull request #6268 from reiterl/limit_of_users
Add field limit_of_users to organization.
2021-10-28 14:29:31 +02:00
Ludwig Reiter 2ec3ad19a2 Change md5sum of initial data. 2021-10-28 14:11:15 +02:00
Ludwig Reiter b97b0de412 Add field limit_of_users to organization. 2021-10-28 14:08:36 +02:00
GabrielInTheWorld cd3dfb4229
Merge pull request #6267 from GabrielInTheWorld/of-initial-themes
Adds the openslides-red and -green theme to the initial data
2021-10-28 08:34:07 +02:00
GabrielInTheWorld 89b8422361 Adds the openslides-red and -green theme to the initial data 2021-10-27 12:18:07 +02:00
peb-adr bad1e131ee
Merge pull request #6261 from peb-adr/proxy-rework
Proxy rework
2021-10-25 14:59:31 +02:00
Adrian Richter 4d02165f1f add auto https support + manage router by header
switch from caddy file to native json
2021-10-25 12:58:32 +02:00
Ralf Peschke 4fc44929f8
Merge pull request #6255 from r-peschke/pull_req6246_req_true_fields
PR6246 mediafile.list_of_speakers not required, because of directories
2021-10-19 10:38:01 +02:00
Ralf Peschke e622822a3f - set mediafle.list_of_speakers required=false
- use submodule backend with generated models.py
- fix bug initial-data.json MI5 -> Mi7, because file data represents MI7
2021-10-19 10:18:35 +02:00
Ralf Peschke 30e978d288 Revert "PR6246 mediafile.list_of_speakers not required, because of directories"
This reverts commit 851e54077f.
2021-10-19 09:57:02 +02:00
Ralf Peschke 851e54077f PR6246 mediafile.list_of_speakers not required, because of directories 2021-10-18 19:34:01 +02:00
Emanuel Schütze 772e3a391f
Merge pull request #6253 from emanuelschuetze/update-20211014
Updated services
2021-10-14 22:38:11 +02:00
Emanuel Schütze 29f1a3b86d Updated services 2021-10-14 22:18:08 +02:00
reiterl d97e97186b
Merge pull request #6242 from reiterl/themes_collection
Add theme collection to models.
2021-10-12 11:02:50 +02:00
Ludwig Reiter dc2998b0ea Update initial-data md5sum. 2021-10-12 10:39:41 +02:00
Emanuel Schütze b5eece6052
Merge pull request #6248 from emanuelschuetze/update20211009
Updated services
2021-10-09 21:21:23 +02:00
Emanuel Schütze 53db1caa39 Updated services 2021-10-09 12:07:22 +02:00
Emanuel Schütze b21d76c882
Merge pull request #6246 from ostcar/requied_relations
Set required attribute on relation and generic-relation fields
2021-10-08 20:32:04 +02:00
Oskar Hahn 94cb1a47d2 Set required attribute on relation and
generic-relation fields
2021-10-08 17:14:14 +02:00
Ludwig Reiter 97056e9f2a Add missing options to theme. 2021-10-08 09:15:10 +02:00
Ludwig Reiter 285b900b5a Rename default_theme_id into theme_id
And update initial and example data.
2021-10-08 09:15:09 +02:00
Ludwig Reiter fdfe3bd66a Add required to default_theme_id and organization_id. 2021-10-08 09:15:09 +02:00
Ludwig Reiter ee3b84abde Add one theme to initial/example data. 2021-10-08 09:15:09 +02:00
Ludwig Reiter e2382a7c86 Fix indentation of initial-data.json 2021-10-08 09:15:09 +02:00
Ludwig Reiter cc9df51cc3 Update models.yml, initial-data.json and example-data.json 2021-10-08 09:15:09 +02:00
Ludwig Reiter 5aa9bc082d Update initial and example data. 2021-10-08 09:15:09 +02:00
Ludwig Reiter 1078a7101a Change theme/organization_ids
It should be a relation and not a relation-list, as there is only one
organization and it is renamed to avoid name conflict.
2021-10-08 09:15:09 +02:00
Ludwig Reiter 9c0329b2ad Change theme attribute names, because large letters are not allowed. 2021-10-08 09:15:09 +02:00
Ludwig Reiter 703d61a3b7 Update models.yml, initial-data.json and example-data.json 2021-10-08 09:15:09 +02:00
Ludwig Reiter d5d41a532a Add organization/theme_ids to models.yml 2021-10-08 09:14:29 +02:00
Ludwig Reiter c293544f24 Remove user/theme_id. 2021-10-08 09:14:29 +02:00
Ludwig Reiter 225a6eb5de Update initial and example data. 2021-10-08 09:14:29 +02:00
Ludwig Reiter 494b8d54f4 Rename organization/theme_id into default_theme_id. 2021-10-08 09:14:29 +02:00
Ludwig Reiter 1da3c6dced Changes to the models.yml. 2021-10-08 09:14:29 +02:00
Ludwig Reiter 23e7bc4df2 Fix minus problem in var names. 2021-10-08 09:14:29 +02:00
Ludwig Reiter 38ac9c2838 Fix type. 2021-10-08 09:14:29 +02:00
Ludwig Reiter 90d705666d Add theme collection to models. 2021-10-08 09:14:29 +02:00
Emanuel Schütze 855f5f2e86
Merge pull request #6247 from GabrielInTheWorld/updates
Updates services
2021-10-07 19:27:57 +02:00
GabrielMeyer 42b30d1ea9 Updates services 2021-10-07 16:33:38 +02:00
jsangmeister 4021c7620b
Merge pull request #6244 from jsangmeister/add-state-weight
Add motion state weight
2021-10-07 14:04:02 +02:00
Joshua Sangmeister cb85892447 Fix checksum 2021-10-06 15:43:00 +02:00
Joshua Sangmeister 3f4a020808 Update Backend 2021-10-06 15:25:47 +02:00
Joshua Sangmeister 615736eda2 Fix example & initial data 2021-10-06 12:54:52 +02:00
Joshua Sangmeister 9483414fb3 Add motion state weight 2021-10-06 10:45:15 +02:00
reiterl 973184237a
Merge pull request #6243 from jsangmeister/fix-gh-actions
Fix initial data workflow
2021-10-05 13:12:35 +02:00
Joshua Sangmeister 72d5ee06d3 Fix initial data workflow 2021-10-04 15:18:29 +02:00
Norman Jäckel 0e95e7f7e0
Merge pull request #6236 from normanjaeckel/Typo
Fixed typo and changed some format.
2021-10-02 20:07:05 +02:00
GabrielInTheWorld 34b6fcd0b3
Merge pull request #6239 from GabrielInTheWorld/updates
Updates the client, backend and media-service
2021-10-01 15:14:04 +02:00
GabrielMeyer 788afca754 Updates the client, backend and media-service 2021-10-01 14:29:57 +02:00
Emanuel Schütze c4dcedcb17
Merge pull request #6238 from emanuelschuetze/update-20210930
Updated services
2021-09-30 09:37:05 +02:00
Emanuel Schütze 8859892e10 Updated services 2021-09-30 09:18:01 +02:00
GabrielInTheWorld 5415f68723
Merge pull request #6237 from GabrielInTheWorld/updating-client
New version of the client
2021-09-29 17:40:31 +02:00
GabrielMeyer 64908007c7 New version 2021-09-29 16:54:41 +02:00
Norman Jäckel 44a3193406 Fixed typo and changed some format. 2021-09-28 22:13:13 +02:00
Emanuel Schütze c628fe3244
Merge pull request #6235 from emanuelschuetze/update-20210924
Updated services
2021-09-24 11:51:58 +02:00
Emanuel Schütze ddc8cd2716 Updated services 2021-09-24 11:34:17 +02:00
Emanuel Schütze 5aa0b84123
Merge pull request #6233 from peb-adr/fix-tagging
fix client/version.txt path
2021-09-24 11:31:02 +02:00
Adrian Richter cc4666646d shouldve double checked the path 2021-09-24 11:08:14 +02:00
Emanuel Schütze cda2c0c21c
Merge pull request #6224 from peb-adr/tagging
unique version tag for docker images
2021-09-24 10:36:18 +02:00
GabrielInTheWorld 058ee57658
Merge pull request #6232 from GabrielInTheWorld/of-perm-can-forward
Updates the wording according to #6231
2021-09-24 08:22:16 +02:00
Adrian Richter 4e00e13038 tag images uniquely + write to client/version.txt
* adjust path to client/src/assets/version.txt

      * also tag as latest

      * add timestamp to image tag + client/version.txt
2021-09-23 18:54:23 +02:00
GabrielMeyer 6629cf9ee7 Updates the wording 2021-09-23 16:57:50 +02:00
GabrielInTheWorld 7ffe5922a0
Merge pull request #6226 from r-peschke/BA939_New_field_motion_state_dont_set_identifier
New field motion_state/dont_set_identifier (Backend #939)
2021-09-23 14:45:46 +02:00
Ralf Peschke 0e830e677b Initia-dat.json plus workflow and new backend submodule 2021-09-23 14:10:44 +02:00
Ralf Peschke 761c248e19 Changed hash for initial_data.json 2021-09-23 14:10:44 +02:00
Ralf Peschke 1fe6e4e58e New field motion_state/dont_set_identifier (Backend #939) 2021-09-23 14:10:44 +02:00
GabrielInTheWorld b81b7e9980
Merge pull request #6231 from GabrielInTheWorld/of-perm-can-forward
Adjusts the models.yml to the new perm (#6230)
2021-09-23 13:54:03 +02:00
GabrielMeyer 1fb1d834e1 Adjusts the models.yml to the new perm (#6230) 2021-09-23 13:31:28 +02:00
GabrielInTheWorld 3e553a2714
Merge pull request #6230 from GabrielInTheWorld/of-perm-can-forward
Adds the perm 'motion.can_forward_to_this'
2021-09-23 11:21:11 +02:00
GabrielMeyer 8b0811efa9 Adds the perm 'motion.can_forward_to_this' 2021-09-23 11:01:53 +02:00
Sean b7c97baa1e
Merge pull request #6218 from tsiegleauq/integration-cypress
Integration tests using cypress
2021-09-21 11:02:09 +02:00
Sean 4134367b8a
Merge pull request #6225 from ostcar/remove_permission_service
Remove permission service
2021-09-17 12:26:39 +02:00
Sean 85c0e50c21 Integration tests using cypress
Test client integration (client loads)
Test auth integration (client logs in)
Test backend integration (accept request)
  - broken
Test autoupdate integration (sends au to client)

Add manual cypress tests
Add dockered cypress tests

Add Readme
Add test execution to makefile
Add test execution to github-actions

TODO:
- Create user for tests
- flush db after every test
2021-09-16 17:16:51 +02:00
Oskar Hahn b504a1c51e Remove permission service 2021-09-15 16:20:39 +02:00
Emanuel Schütze 7c43e77fcb
Merge pull request #6221 from emanuelschuetze/update-20210913
(4.0-beta-20210913) Updated services.
2021-09-13 14:21:53 +02:00
Emanuel Schütze a958549adb (4.0-beta-20210913) Updated services. 2021-09-13 14:16:27 +02:00
Ralf Peschke 97ea71c8db
Merge pull request #6215 from r-peschke/fix_users_email_sender
Replace mail-address by sender name
2021-09-06 22:00:28 +02:00
Ralf Peschke 9306ee11ea Upgrade to current backend 2021-09-06 17:35:14 +02:00
Ralf Peschke c8d9f213bd Replace mail-address by sender name 2021-09-06 17:35:14 +02:00
Ralf Peschke 6fb3e40f8b
Update md5_check_initial-data.yml
For committing the new initial-data.json with changed field content users_email_sender
2021-09-06 17:26:54 +02:00
Norman Jäckel c2f1d2b4b8
Merge pull request #6217 from normanjaeckel/UpdateFormat
Update format
2021-08-31 23:04:30 +02:00
Norman Jäckel 217e3d0b75 Updated README. Updated initial-data.json to new format. Updated example-data.json to new format. Updated backend and datastore. Disabled check of unmigrated initial data. Added announcement workflow. 2021-08-31 22:00:25 +02:00
Sean 36c9ff1451
Merge pull request #6216 from tsiegleauq/update-services-08-27
Update services
2021-08-27 17:29:29 +02:00
Sean c5accdaa9c Update services 2021-08-27 17:25:34 +02:00
GabrielInTheWorld f2515decf8
Merge pull request #6214 from GabrielInTheWorld/of-update-initial-data
Updates the docker-compose.dev.yml file to use master
2021-08-26 15:55:30 +02:00
GabrielMeyer 1b630ba714 Updates the initial data used by the datastore 2021-08-20 10:52:42 +02:00
Sean 7b8139dbfe
Merge pull request #6211 from tsiegleauq/update-readme-for-stable
Update readme
2021-08-19 12:37:19 +02:00
Sean 34eaada3d0 Update readme
Remove unused parts from the readme
Update develoment.md, replace os4-dev branch with master
2021-08-19 12:32:05 +02:00
Finn Stutzenstein 901c8beca9
Merge pull request #6210 from FinnStutzenstein/initialDataCi
Add a CI check to verify that migrating the initial data works
2021-08-18 12:13:38 +02:00
Finn Stutzenstein 6b218e3c7f
Add a CI check to verify that migrating the initial data works 2021-08-18 11:58:20 +02:00
Sean f9296f017b
Merge pull request #6170 from tsiegleauq/workflow-dispatch
Workflow dispatch
2021-08-18 11:52:01 +02:00
Sean 456ecb8316 Workflow dispatch
Manually fire to build images
2021-08-18 11:48:10 +02:00
Sean 2753499167
Merge pull request #6208 from tsiegleauq/inform-repos-about-changes
Monitor and announces changes to models and perms
2021-08-17 12:49:59 +02:00
Sean de503bbb2b Monitor and announces changes to models and perms
Monitors changes to docs/models.yml and docs/perms.yml.
If changes were made and merged github actions will create an issue
and assign the maintainers of the subprojects to ackknowledge the
changes.
2021-08-17 12:45:30 +02:00
Finn Stutzenstein 3ca9918fa2
Merge pull request #6209 from FinnStutzenstein/migrations
Update Submodules to enable migrations
2021-08-17 11:39:48 +02:00
Finn Stutzenstein 1d74030d2b
Update Submodules to enable migrations 2021-08-17 11:37:15 +02:00
Finn Stutzenstein bd537b5678
Merge pull request #6205 from r-peschke/Issue6204_fields_for_archiving_meetings
Issue6204: Define fields for archiving of meetings
2021-08-17 09:04:13 +02:00
Ralf Peschke 2b58b2f2f7
Issue6204: Define fields for archiving of meetings
- set initial-data.json to migration_index 1
- md5sum checking for initial-data.json
2021-08-17 09:03:03 +02:00
Ralf Peschke 59f6fa1ed3
Merge pull request #6206 from r-peschke/github_models.yml_generate_model
github models.yml: generate models.py for backend check_json
2021-08-11 11:49:10 +02:00
Ralf Peschke f81738a06e github models.yml: generate models.py for backend check_json 2021-08-11 11:31:16 +02:00
Norman Jäckel 2a5b4a3126
Merge pull request #6152 from normanjaeckel/RemoveProdSetup
Moved production setup to manage service.
2021-08-08 18:06:21 +02:00
Norman Jäckel de2d5eb030 Moved production setup to manage service. 2021-08-08 18:01:53 +02:00
Emanuel Schütze 6192e2347c
Merge pull request #6201 from emanuelschuetze/update-20210806
Updated client
2021-08-06 17:36:11 +02:00
Emanuel Schütze 1f94532a43 Updated client 2021-08-06 17:16:51 +02:00
Finn Stutzenstein 8ff0f379a5
Merge pull request #6200 from FinnStutzenstein/update
Update Backend
2021-08-06 11:15:36 +02:00
Finn Stutzenstein c93fb68a4f
Update Backend 2021-08-06 11:14:30 +02:00
Finn Stutzenstein 07e49746c1
Merge pull request #6198 from FinnStutzenstein/update
Update submodules. Added explicit migration index to data files
2021-08-06 08:01:50 +02:00
Finn Stutzenstein 59d9c6a9a8
Update submodules. Added explicit migration index to data files 2021-08-06 08:00:52 +02:00
Emanuel Schütze 725782078c
Merge pull request #6199 from emanuelschuetze/update-20210805
Updated os4 services
2021-08-05 20:57:32 +02:00
Emanuel Schütze d402fd4b9d Updated os4 services 2021-08-05 20:55:12 +02:00
Finn Stutzenstein b85a82bc61
Merge pull request #6197 from FinnStutzenstein/CI
Enhance CI
2021-08-04 14:14:06 +02:00
Finn Stutzenstein 27d31189c1
Enhance CI
- redone the modelsvalidator
- use the datavalidator from the backend, remove old code
2021-08-04 14:10:40 +02:00
jsangmeister 816f5cc574
Merge pull request #6194 from jsangmeister/fix-settings-definitions
Add missing defaults & fix existing ones
2021-08-04 11:37:24 +02:00
Joshua Sangmeister de14009a52 Add missing defaults & fix existing ones 2021-08-04 11:35:16 +02:00
Finn Stutzenstein ec00c6c7db
Merge pull request #6192 from ostcar/models_field_groups
Add field group info in organization
2021-08-04 07:19:27 +02:00
Oskar Hahn 552ac0f9d3
Add field restriction_mode to every collectionfield 2021-08-04 07:18:06 +02:00
Emanuel Schütze 7c6fe46946
Merge pull request #6191 from emanuelschuetze/update-20210730-2
Updated autoupdate service
2021-07-30 16:49:25 +02:00
Emanuel Schütze 53ff280f45 Updated autoupdate service 2021-07-30 16:48:02 +02:00
Emanuel Schütze 4135149cc6
Merge pull request #6190 from emanuelschuetze/update-20210730
Updated os4 services
2021-07-30 16:06:32 +02:00
Emanuel Schütze dd930ae973 Updated os4 services 2021-07-30 16:04:28 +02:00
reiterl ba5bfe1477
Merge pull request #6189 from reiterl/model_submitter_weight
motion_submitter does not need a default. In the creating a weight is…
2021-07-29 14:20:34 +02:00
Ludwig Reiter 62282cc964 motion_submitter does not need a default. In the creating a weight is always set. 2021-07-29 14:14:33 +02:00
Emanuel Schütze b19f2189c9
Merge pull request #6187 from jsangmeister/fix-motion-preamble
Fix default motion preamble
2021-07-27 17:37:59 +02:00
Joshua Sangmeister 8b7a8bf6de Fix default motion preamble 2021-07-27 17:12:15 +02:00
reiterl 8d3f0a24ea
Merge pull request #6182 from reiterl/dev_model_gender
Dev model gender
2021-07-23 13:49:20 +02:00
Ludwig Reiter 1c3088841a Update initial-data. 2021-07-23 13:44:06 +02:00
Ludwig Reiter d6c5b16a8a Add some gender to example data. 2021-07-23 13:35:18 +02:00
Ludwig Reiter 6e26108531 Update models: user/gender field. 2021-07-23 12:55:27 +02:00
Emanuel Schütze 4913ac5920
Merge pull request #6178 from emanuelschuetze/update-20210720
Updated os4 services
2021-07-20 16:59:15 +02:00
Emanuel Schütze a30477ded0 Updated os4 services 2021-07-20 16:56:02 +02:00
Emanuel Schütze 01b2b53e24
Merge pull request #6169 from emanuelschuetze/update-20210716a
Updated os4 services
2021-07-16 16:03:46 +02:00
Emanuel Schütze 53fd8148c4 Updated os4 services 2021-07-16 16:02:45 +02:00
Finn Stutzenstein b04fe236f2
Merge pull request #6168 from FinnStutzenstein/adjustModelsYml
Fix limits for LOS settings (closes #6167)
2021-07-16 13:57:32 +02:00
Finn Stutzenstein 3b14153965
Fix limits for LOS settings (closes #6167) 2021-07-16 12:37:57 +02:00
Emanuel Schütze 233fb8dfca
Merge pull request #6164 from emanuelschuetze/update-20210716
Updated os4 client
2021-07-16 08:52:01 +02:00
Emanuel Schütze a63643e762 Updated os4 client 2021-07-16 08:44:26 +02:00
Emanuel Schütze c603960291
Merge pull request #6163 from emanuelschuetze/update-20210715
Updated os4 services
2021-07-15 23:37:54 +02:00
Emanuel Schütze cac529e7c3 Updated os4 services 2021-07-15 23:33:08 +02:00
jsangmeister d8b06c8c2d
Merge pull request #6162 from jsangmeister/user-cascade-deletion
Add cascade deletion to user->speaker relation
2021-07-15 16:10:44 +02:00
Joshua Sangmeister 15e37df62d Fix on_delete field in template fields 2021-07-15 16:06:47 +02:00
Joshua Sangmeister 239e0ff30f Add cascade deletion to user->speaker relation 2021-07-15 16:02:59 +02:00
Emanuel Schütze ca4d5783d7
Merge pull request #6159 from emanuelschuetze/update-20210714
Updated os4 services
2021-07-14 21:05:27 +02:00
Emanuel Schütze 6762888333 Updated os4 services 2021-07-14 21:01:19 +02:00
jsangmeister 9b3271277f
Merge pull request #6155 from jsangmeister/remove-majority-method
Remove majority method
2021-07-12 10:47:30 +02:00
Joshua Sangmeister feee6952e7 Remove majority method 2021-07-12 10:17:06 +02:00
Finn Stutzenstein 372fe17bf1
Merge pull request #6153 from GabrielInTheWorld/interaction-into-models
Adds applause configs to the meeting model
2021-07-12 07:21:27 +02:00
GabrielMeyer 0e56d1360e Adds applause configs to the meeting model 2021-07-09 15:46:40 +02:00
Emanuel Schütze 77f6516438
Merge pull request #6149 from emanuelschuetze/update-20210708
Updated services
2021-07-08 18:19:20 +02:00
Emanuel Schütze c98e10e607 Updated os4 services 2021-07-08 17:15:53 +02:00
Finn Stutzenstein 47ac8ac984
Merge pull request #6147 from FinnStutzenstein/datastoreLib
Datastore lib
2021-07-08 10:30:27 +02:00
Finn Stutzenstein ba72cb8b01
Datastore library 2021-07-08 10:29:43 +02:00
Finn Stutzenstein a0ec4be644
Merge pull request #6144 from FinnStutzenstein/openslides4-dev
clean up docs that are in the wiki
2021-07-08 09:07:49 +02:00
jsangmeister 238f8fa602
Merge pull request #6145 from jsangmeister/split-forwarding-tree-motion-ids
Split forwarding_tree_motion_ids into two fields
2021-07-08 09:07:28 +02:00
Joshua Sangmeister 7f8a00ea4e Split forwarding_tree_motion_ids into two fields 2021-07-05 14:52:29 +02:00
Finn Stutzenstein 65bd70375d
clean up docs that are in the wiki 2021-07-05 08:22:56 +02:00
Sean 610a10712d
Merge pull request #6142 from tsiegleauq/add-helpdesk-to-yml
Add conference_enable_helpdesk to models
2021-07-01 16:33:47 +02:00
Sean a131424c8f Add conference_enable_helpdesk to models
Adjust models.yml and the json files to support the helpdesk settings
2021-07-01 16:17:14 +02:00
Sean fb9e9513fc
Merge pull request #6141 from jsangmeister/fix-number-fields
Fix initial data for conference_auto_connect_next_speakers and datavalidator for number fields
2021-07-01 16:03:25 +02:00
Joshua Sangmeister d7c67248dc Fix initial data for conference_auto_connect_next_speakers and datavalidator for number fields 2021-07-01 15:58:14 +02:00
Emanuel Schütze d1d69954f5
Merge pull request #6136 from emanuelschuetze/icc-image
Added icc image
2021-06-30 16:04:43 +02:00
Emanuel Schütze 334931c0d9 Added icc image 2021-06-30 16:03:10 +02:00
Emanuel Schütze dbb146e92c
Merge pull request #6135 from emanuelschuetze/services
Updated services
2021-06-30 14:33:20 +02:00
Emanuel Schütze de01e81306 Updated services 2021-06-30 14:31:30 +02:00
Oskar Hahn d56800b510
Merge pull request #6131 from ostcar/icc-service
Add ICC Service
2021-06-29 20:22:38 +02:00
Oskar Hahn a38942b6eb Add ICC Service 2021-06-29 20:20:59 +02:00
Finn Stutzenstein a9fbac74bb
Merge pull request #6133 from FinnStutzenstein/openslides4-dev
Fix exporting the DS
2021-06-28 12:45:01 +02:00
Finn Stutzenstein 9519849c45
Fix exporting the DS
Introduced with #6055
2021-06-28 12:42:33 +02:00
Emanuel Schütze a52467f740
Merge pull request #6132 from emanuelschuetze/os4-update
Updated os4 sevices
2021-06-28 12:11:39 +02:00
Emanuel Schütze 6bbca6cc66 Updated os4 services 2021-06-28 12:05:04 +02:00
Finn Stutzenstein 1df22d4fc3
Merge pull request #6128 from FinnStutzenstein/adjustDatavalidator
Adjust datavalidator
2021-06-24 11:25:10 +02:00
Finn Stutzenstein b3f17db2a3
Adjust datavalidator
- collection whitelist instead of blacklist
- added field mediafile/blob for import
2021-06-24 11:23:07 +02:00
Sean 6f24efa544
Merge pull request #6125 from tsiegleauq/add-imported_at
Add imported_at to models.yml
2021-06-21 15:08:47 +02:00
Sean a841919c31 Add imported_at to models.yml
Adds the imported_at field to the models.yml file
2021-06-21 15:07:30 +02:00
Finn Stutzenstein 603a558b42
Merge pull request #6124 from FinnStutzenstein/datavalidator
Enhance datavalidator for template fields
2021-06-21 15:06:54 +02:00
Finn Stutzenstein e8dd5d56d1
Enhance datavalidator for template fields 2021-06-21 11:18:59 +02:00
Ralf Peschke 8c1fa5be91
Merge pull request #6116 from r-peschke/PR_Move_translation_from_org_to_meeting
- Move custom_translation from organization to meeting
- Initialization of custom_translations as {}
2021-06-15 11:36:06 +02:00
Ralf Peschke 6816419da9 Initialization of custom_translations as {} 2021-06-15 11:31:48 +02:00
Ralf Peschke 18534b6f75 Move custom_translation from organization to meeting: initial and example.json 2021-06-14 15:18:51 +02:00
Ralf Peschke 80b05fda2f Move custom_translation from organization to meeting 2021-06-14 15:08:01 +02:00
jsangmeister 41b5ee0340
Merge pull request #6115 from jsangmeister/model-locked-error-interface
Update datastore interface for model locked error
2021-06-14 09:16:17 +02:00
Joshua Sangmeister 0778681181 Update datastore interface for model locked error 2021-06-10 16:05:56 +02:00
Finn Stutzenstein a3b2784cc7
Merge pull request #6111 from reiterl/permission_chat_group_can_manage
Add chat.can_manage to permissions enum.
2021-06-08 21:51:39 +02:00
Ludwig Reiter d5a43ea8c4 Add chat.can_manage to permissions enum. 2021-06-08 12:15:06 +02:00
Finn Stutzenstein e56786d375
Merge pull request #6107 from FinnStutzenstein/chatgroups
[WIP] Added chat groups
2021-06-07 11:55:17 +02:00
Finn Stutzenstein bc310a98e6
Added chat groups 2021-06-07 11:18:05 +02:00
Finn Stutzenstein cc2a40a178
Merge pull request #6101 from FinnStutzenstein/organizationSpelling
Fixed spelling of organization and update submodules
2021-06-03 15:18:49 +02:00
Finn Stutzenstein 6572e8b20c
Fixed spelling of organization and update submodules 2021-06-03 15:15:15 +02:00
Finn Stutzenstein cdbb5f1a83
Merge pull request #6093 from r-peschke/PR_OS4_is_demo_user_not_RO
is_demo_user is no more read only
2021-06-03 07:21:35 +02:00
Ralf Peschke ac457fdb2c is_demo_user is no more read only 2021-06-01 10:01:50 +02:00
reiterl 1e52ef9148
Merge pull request #6092 from reiterl/models_orga
Rm ro from organisation.enable_electronic_voting
2021-05-31 15:25:53 +02:00
Ludwig Reiter 2f80d1a11e Rm ro from organisation.enable_electronic_voting 2021-05-31 15:23:12 +02:00
Finn Stutzenstein aaf476fba7
Merge pull request #6090 from FinnStutzenstein/fixDatastoreCommands
Fix clearing the DS.
2021-05-31 09:16:58 +02:00
Finn Stutzenstein acdb206632
Fix clearing the DS.
Introduced with #6055
2021-05-31 09:14:47 +02:00
Finn Stutzenstein d990b098c5
Merge pull request #6068 from FinnStutzenstein/fixDefaultProjectorRelation
Fix default projector relation
2021-05-20 13:22:15 +02:00
Finn Stutzenstein 56423737bc
Fix example data for default projectors 2021-05-20 13:18:33 +02:00
reiterl a956f2d996
Merge pull request #6069 from reiterl/models_jitsi_rm_ro
Remove read_only from meeting/jitsi_*
2021-05-20 13:13:24 +02:00
Ludwig Reiter 8a51e6ae85 Remove read_only from meeting/jitsi_* 2021-05-20 13:10:21 +02:00
Finn Stutzenstein 6d64c0c62b
Merge pull request #6065 from FinnStutzenstein/ownPassword
change model of can_change_own_password
2021-05-20 12:25:23 +02:00
Finn Stutzenstein fa67c4874b
change model of can_change_own_password 2021-05-20 12:23:43 +02:00
Norman Jäckel 3d44fc4730
Merge pull request #6055 from ostcar/tunnel
Update manage service
2021-05-17 00:18:52 +02:00
Oskar Hahn f473796ce6 Update manage service
It know has a tunnel command. See

manage help tunnel

for more information and examples.

There is not need to open the ports
2021-05-17 00:17:26 +02:00
Oskar Hahn 3b41fb468e
Merge pull request #6027 from normanjaeckel/ManageSetupCommand
Manage setup command
2021-05-16 23:59:41 +02:00
jsangmeister 12f465e0b8
Merge pull request #6062 from jsangmeister/fix-typo
Fix typos
2021-05-11 10:19:26 +02:00
Joshua Sangmeister ae8951ee82 Fix typos 2021-05-11 10:16:16 +02:00
jsangmeister 862bc8c182
Merge pull request #6052 from jsangmeister/fix-models
Fix models
2021-05-10 12:49:39 +02:00
Joshua Sangmeister 24e0771d05 Fix models.yml 2021-05-06 09:10:04 +02:00
Finn Stutzenstein 50fdaca46f
Merge pull request #6029 from FinnStutzenstein/remodelUsers
Remodel users
2021-05-03 14:01:19 +02:00
Norman Jäckel e99eb0bf0b Review 2021-05-01 11:15:03 +02:00
Norman Jäckel b4a034d900 Switched to GitHub Container Registry. 2021-04-30 13:54:05 +02:00
Norman Jäckel e9357b2c10 New production setup with Docker Compose
Updated openslides-manage-service and changed README.md

Added GitHub workflow.
2021-04-30 00:41:04 +02:00
Finn Stutzenstein be883f2a0d
Remodel users 2021-04-29 14:29:08 +02:00
Finn Stutzenstein 2fd4160aaa
Merge pull request #6041 from FinnStutzenstein/os4-pro-contra-note
Pro/contra/marked/note for OS4
2021-04-29 14:12:13 +02:00
Finn Stutzenstein 4c10007bab
example- and initial data 2021-04-29 14:09:21 +02:00
Finn Stutzenstein e2c7287812
Pro/contra/marked/note for OS4 2021-04-29 12:00:53 +02:00
Finn Stutzenstein 09ba505277
Merge pull request #6039 from FinnStutzenstein/revert-6032
Revert updating manageservice
2021-04-29 08:05:33 +02:00
Finn Stutzenstein eaef28029b
Revert updating manageservice
It breaks the deployment
2021-04-29 08:03:38 +02:00
GabrielInTheWorld 9efb47f2a5
Merge pull request #6032 from GabrielInTheWorld/update-subprojects
Update subprojects to their current master
2021-04-27 10:10:21 +02:00
GabrielMeyer dbe74308b7 Update subprojects to current master 2021-04-26 16:36:27 +02:00
Finn Stutzenstein 60cae02ec7
Merge pull request #6016 from FinnStutzenstein/pollBackend
poll backend
2021-04-26 07:20:48 +02:00
jsangmeister 25d8f88ea0
Merge pull request #6018 from jsangmeister/locked-fields-as-list
Change locked fields to a list
2021-04-22 15:31:44 +02:00
Joshua Sangmeister 595a3fea90 Make change non-breaking 2021-04-22 12:23:16 +02:00
Joshua Sangmeister 6ca37f8067 Lock CollectionField with array 2021-04-22 09:33:20 +02:00
Finn Stutzenstein 5fff49e336
poll backend 2021-04-19 09:22:55 +02:00
Finn Stutzenstein d216e3121f
Merge pull request #6013 from FinnStutzenstein/update
Update submodules
2021-04-15 16:24:40 +02:00
Finn Stutzenstein 6eccda1217
Update submodules 2021-04-15 16:19:11 +02:00
jsangmeister f703a77796
Merge pull request #6012 from jsangmeister/make-countdown-times-required
Make countdown times required
2021-04-15 11:27:27 +02:00
jsangmeister 1e141bda0c
Merge pull request #6011 from r-peschke/issue473_meeting_reference_projector_id_required
Issue473 meeting.reference projector id and user.username required
2021-04-15 11:27:20 +02:00
Joshua Sangmeister 178df37536 Make countdown times required 2021-04-15 10:39:04 +02:00
Ralf Peschke 29304f34f2 User.username also required 2021-04-14 15:29:28 +02:00
Ralf Peschke dea8e98e28 issue473_required_for_meeting.reference_projector_id 2021-04-14 13:45:51 +02:00
Finn Stutzenstein 097230b66e
Merge pull request #6000 from FinnStutzenstein/organisation_tags
Add organisation tags
2021-04-08 14:34:21 +02:00
Finn Stutzenstein 2b7124760d
Add organisation tags 2021-04-08 13:47:31 +02:00
Finn Stutzenstein 2c4c33dac1
Merge pull request #5999 from FinnStutzenstein/prod
OS4 productive setup changes
2021-04-08 12:54:48 +02:00
Finn Stutzenstein 79a14e15ad
OS4 productive setup changes
Now uses secrets and add the possibility to enable electronic voting
2021-04-08 12:52:59 +02:00
jsangmeister bb1ac2fc96
Merge pull request #5993 from jsangmeister/voting-changes
Adapt models.yml to new voting changes
2021-04-08 09:36:48 +02:00
Joshua Sangmeister 3eee3c1c37 Adapt example data 2021-04-06 11:20:47 +02:00
Joshua Sangmeister df7c25cc5d Adapt models.yml to new voting changes 2021-04-06 11:01:51 +02:00
Finn Stutzenstein 4088913d7d
Merge pull request #5988 from FinnStutzenstein/prod
OS4 Prod with swarm mode
2021-04-01 10:56:30 +02:00
Finn Stutzenstein ae406a3979
OS4: prod setup 2021-04-01 10:55:06 +02:00
Oskar Hahn 00924d45d0
Merge pull request #5983 from ostcar/fix_example_projection
Fix projection name in example data
2021-03-28 16:48:28 +02:00
Oskar Hahn 353c2cb50d Fix projection name in example data 2021-03-28 16:42:59 +02:00
Finn Stutzenstein 68c3e140e7
Merge pull request #5747 from GabrielInTheWorld/update-auth-service-interface
Update auth-service's interface
2021-03-22 13:57:52 +01:00
reiterl c703b29df0
Merge pull request #5973 from reiterl/model_poll_defaults
Update poll onehundred_percent_base and majority_method defaults.
2021-03-19 14:44:36 +01:00
Ludwig Reiter 787419911b Update poll onehundred_percent_base and majority_method defaults. 2021-03-19 14:42:31 +01:00
Finn Stutzenstein 471eec07fe
Merge pull request #5965 from reiterl/model_default_time
Remove default from projector_countdown/default_time.
2021-03-18 13:39:16 +01:00
Ludwig Reiter ccc77d8ea6 Remove default from projector_countdown/default_time. 2021-03-18 13:36:02 +01:00
Finn Stutzenstein 903764565c
Merge pull request #5958 from FinnStutzenstein/updateAndCaddy
Update submodules and use Caddy
2021-03-18 13:26:25 +01:00
Finn Stutzenstein 2b34a3ffc2
Update submodules and use Caddy 2021-03-18 13:25:12 +01:00
jsangmeister 89e8a5b565
Merge pull request #5963 from jsangmeister/css-class-required
Make css_class required
2021-03-18 11:53:28 +01:00
Joshua Sangmeister be08de3858 Make css_class required 2021-03-18 11:51:03 +01:00
Finn Stutzenstein a530fef898
Merge pull request #5962 from FinnStutzenstein/update
Update submodules
2021-03-18 08:49:14 +01:00
Finn Stutzenstein 471ea30171
Update submodules 2021-03-18 08:47:45 +01:00
Finn Stutzenstein 29beab391d
Merge pull request #5960 from reiterl/models_poll_globals
Change poll global default to false.
2021-03-18 07:31:04 +01:00
Ludwig Reiter f42dea91bf Change poll global default to false. 2021-03-17 11:46:43 +01:00
Oskar Hahn 737eeeca2f
Merge pull request #5956 from ostcar/manage-service
Add manage service
2021-03-15 10:46:11 +01:00
Oskar Hahn 5af507ea82 Fix docker-compose 2021-03-13 12:50:07 +01:00
Oskar Hahn 1a965b9034 Add manage service 2021-03-13 10:31:54 +01:00
Finn Stutzenstein 4a5c356c08
Merge pull request #5950 from jsangmeister/add-speaker-equal-fields
Add equal_fields for speaker
2021-03-11 16:10:21 +01:00
Joshua Sangmeister b62728c998 Add equal_fields for speaker 2021-03-11 15:28:19 +01:00
Finn Stutzenstein 33fda8788c
Merge pull request #5949 from FinnStutzenstein/losInitialClosed
List of speaker initially closed
2021-03-11 09:04:00 +01:00
Finn Stutzenstein c8e040348f
List of speaker initially closed 2021-03-11 08:59:30 +01:00
Finn Stutzenstein 41572f41cf
Merge pull request #5947 from r-peschke/issue474_N_as_new_100_percent_base
N as new 100% base
2021-03-11 07:47:15 +01:00
Ralf Peschke 82d6c43499 N as new 100% base 2021-03-09 11:45:49 +01:00
Finn Stutzenstein 1f780c0926
Merge pull request #5945 from FinnStutzenstein/updateModels
Add default_vote_weight default
2021-03-08 14:24:32 +01:00
Finn Stutzenstein 448fab6ead
Add default_vote_weight default 2021-03-08 14:22:16 +01:00
Finn Stutzenstein 9f036fe437
Merge pull request #5944 from FinnStutzenstein/updateModels
Add default countdowns
2021-03-08 14:09:14 +01:00
Finn Stutzenstein f833b61c9b
Add default countdowns 2021-03-08 14:08:15 +01:00
Finn Stutzenstein 91b9bc6461
Merge pull request #5917 from FinnStutzenstein/projectorContentObjects
Update projector_countdown
2021-03-08 12:17:07 +01:00
Finn Stutzenstein 0a3d511322
Merge pull request #5925 from FinnStutzenstein/models
Adjusted models
2021-03-08 12:00:44 +01:00
Finn Stutzenstein aa77b878c2
Merge pull request #5942 from FinnStutzenstein/updateModels
Add defaults for closed on agenda item and list of speakers
2021-03-08 11:35:07 +01:00
Finn Stutzenstein 0a4e580274
Add defaults for closed on agenda item and list of speakers 2021-03-08 11:33:21 +01:00
Finn Stutzenstein aa05abcb0e
Merge pull request #5934 from r-peschke/mediafile_without_2_required_fields
mediafile fields list_of_speakers_id and filename not required
2021-03-04 07:58:54 +01:00
Ralf Peschke fa80e7dfac mediafile fields list_of_speakers_id and filename not required anymore because of mediafile directory 2021-03-03 17:26:26 +01:00
Finn Stutzenstein f5529f5eb3
Adjusted models
- Added new permissions poll.can_manage
- Reorder permissions.yml alphabetically
- provide some more default values
2021-03-01 11:41:25 +01:00
Finn Stutzenstein d293832199
Merge pull request #5919 from jsangmeister/fix-action-interface2
Fix action interface2
2021-03-01 07:22:49 +01:00
Joshua Sangmeister 0583f05a4f Switch atomic meaning 2021-02-26 15:04:24 +01:00
jsangmeister 5aad7e87b6
Merge pull request #5907 from jsangmeister/fix-structured-fields
Add replacement to structured fields
2021-02-26 14:50:13 +01:00
jsangmeister cf349840fc
Merge pull request #5906 from jsangmeister/fix-action-interface
Fix action interface
2021-02-26 12:39:06 +01:00
Finn Stutzenstein 41af863484
Update projector_countdown 2021-02-25 11:03:36 +01:00
Finn Stutzenstein 36125dadc5
Merge pull request #5914 from r-peschke/openslides4-dev
Add 'minimum' for some fields in Projector
2021-02-23 15:56:29 +01:00
Ralf Peschke 56c8b1c15c
Add 'minimum' for some fields in Projector 2021-02-23 15:48:15 +01:00
Ralf Peschke d127541e24
Merge pull request #5904 from r-peschke/os4-permissions-in_initial-data.json
Permissions in initial-data.json and example-data.json concording to those in models.yaml
2021-02-22 11:47:21 +01:00
Ralf Peschke 9f6ad59d0b PR5904 Fix permissions initial_data.jsoin and example-data.json 2021-02-22 11:42:47 +01:00
Finn Stutzenstein f0a5e2716a
Merge pull request #5900 from FinnStutzenstein/projector
Remodel the projector
2021-02-22 08:03:43 +01:00
Finn Stutzenstein e30f4c85d8
Merge pull request #5912 from FinnStutzenstein/userTimestamp
Fix user last_email_send type
2021-02-22 07:58:20 +01:00
Finn Stutzenstein 1e194cf161
Fix user last_email_send type 2021-02-22 07:57:08 +01:00
Joshua Sangmeister 42b590c9f0 Add replacement to structured fields 2021-02-19 12:17:51 +01:00
Joshua Sangmeister a427ca69fe Fix action interface 2021-02-19 09:26:44 +01:00
Ralf Peschke f3086375cc Fix recommendations from code review 2021-02-18 16:49:21 +01:00
reiterl 21338d20c8
Merge pull request #5901 from reiterl/change_poll_global_defaults
Change poll global_* default to true.
2021-02-18 13:06:56 +01:00
Ralf Peschke d413f04585 Proposal for permissions in initial-data.json 2021-02-18 11:08:08 +01:00
Ludwig Reiter 0a9b6f2a62 Change poll global_* default to true. 2021-02-17 11:16:18 +01:00
Finn Stutzenstein 0eaad10f11
Remodel the projector 2021-02-16 10:37:20 +01:00
Finn Stutzenstein 6e0dcf71df
Merge pull request #5858 from normanjaeckel/FixModelsvalidator
Fixed modelsvalidator.
2021-02-12 07:24:02 +01:00
Finn Stutzenstein cf653fd151
Merge pull request #5880 from r-peschke/debug-port-for-backend
Map debug port for openslides-backend in docker-compose.dev
2021-02-10 14:38:07 +01:00
Finn Stutzenstein 4794f063f8
Merge pull request #5835 from reiterl/dev_check_json
Work on check_json.py
2021-02-10 13:32:32 +01:00
Finn Stutzenstein cabba247f3
Reworked checker
Credits for initial work to @reiterl
2021-02-10 12:51:41 +01:00
Ralf Peschke 762a279d1b Map debug port for openslides-backend in docker-compose.dev 2021-02-10 11:23:46 +01:00
Norman Jäckel 11213125fc Fixed modelsvalidator. 2021-02-05 17:03:56 +01:00
Norman Jäckel 4b90c1b2ba
Merge pull request #5855 from normanjaeckel/Permission
Added permission.yml.
2021-02-05 14:03:21 +01:00
Norman Jäckel d1d18c299a Added permission.yml. 2021-02-05 12:34:14 +01:00
Finn Stutzenstein 89498a12c4
Merge pull request #5831 from FinnStutzenstein/fixInitialData
Fix initial data
2021-02-04 16:07:48 +01:00
Finn Stutzenstein aa07af5329
Merge pull request #5849 from GabrielInTheWorld/update-submodules
Update submodules
2021-02-04 15:56:19 +01:00
GabrielMeyer fe6ce208e7 Update 2021-02-04 15:35:15 +01:00
Finn Stutzenstein f41349f038
Merge pull request #5848 from jsangmeister/adjust-ds-interface
Adjust datastore interface
2021-02-04 13:49:41 +01:00
Joshua Sangmeister 21876d3be6 Adjust datastore interface 2021-02-04 13:43:14 +01:00
Finn Stutzenstein 1bee13d7e9
Merge pull request #5844 from OpenSlides/revert-5843-fixActionInterface
Revert "Fix action interface"
2021-02-03 10:07:10 +01:00
Finn Stutzenstein f7ba41dd8f
Revert "Fix action interface" 2021-02-03 10:06:16 +01:00
Finn Stutzenstein 728cbdb719
Merge pull request #5843 from FinnStutzenstein/fixActionInterface
Fix action interface
2021-02-03 10:02:07 +01:00
Finn Stutzenstein 7f125165a3
Fix action interface 2021-02-03 10:00:53 +01:00
Finn Stutzenstein aa934ecc1f
more fixes 2021-02-02 08:54:28 +01:00
Finn Stutzenstein 4107bbac80
Merge pull request #5836 from normanjaeckel/ChangeModelsYml
Added permissions to models.yml
2021-02-02 08:06:37 +01:00
Norman Jäckel 41956313b5 Added permissions to models.yml 2021-01-30 13:34:15 +01:00
Finn Stutzenstein 5d82a05608
Fix initial data 2021-01-28 13:36:11 +01:00
Finn Stutzenstein 7502569211
Merge pull request #5827 from FinnStutzenstein/update
update submodules
2021-01-27 12:41:31 +01:00
Finn Stutzenstein 2360665a6f
update submodules 2021-01-27 12:22:30 +01:00
Norman Jäckel a949dc7006
Merge pull request #5802 from normanjaeckel/ChangedModelsForUsers
Added meeting specific fields for users.
2021-01-22 15:27:26 +01:00
Norman Jäckel c6b1a254a0 Added meeting specific fields for users and changed role system. 2021-01-22 14:58:44 +01:00
jsangmeister 9abf787d99
Merge pull request #5704 from jsangmeister/datastore-partial-list-updates
Update datastore specs
2021-01-14 15:05:33 +01:00
Finn Stutzenstein f0a4dc52d5
Merge pull request #5783 from reiterl/dev_model_config
Add config defaults to models.yml settings.
2021-01-14 08:54:57 +01:00
Ludwig Reiter 926e7482b1
Update defaults. 2021-01-14 08:53:24 +01:00
Ludwig Reiter 24b435bc46 Add config defaults to the settings in model.yml 2021-01-13 11:26:13 +01:00
Finn Stutzenstein b825fb2a35
Merge pull request #5768 from FinnStutzenstein/updateDSInterface
Update Datastore interface
2021-01-12 16:25:58 +01:00
Finn Stutzenstein 0d2ce2cf29
Merge pull request #5809 from FinnStutzenstein/resources
Resources
2021-01-12 16:18:26 +01:00
Finn Stutzenstein 7c3e334677
Add default test resource 2021-01-12 16:17:06 +01:00
Joshua Sangmeister 5844eabb95 more docs & rename max_position 2021-01-12 14:58:35 +01:00
Finn Stutzenstein 08691f3a1f Update Datastore interface
Add new locked field syntax
2021-01-12 14:58:32 +01:00
Finn Stutzenstein 118876dcc1
Merge pull request #5808 from FinnStutzenstein/update
update OS4 submodules
2021-01-12 09:58:08 +01:00
Finn Stutzenstein c9f14d8b78
update OS4 submodules 2021-01-12 09:56:57 +01:00
Finn Stutzenstein 62cc57c54b
Merge pull request #5723 from FinnStutzenstein/categoryPrefixOptional
Change the category prefix to optional
2021-01-12 08:40:51 +01:00
Finn Stutzenstein 7854487e4f
Merge pull request #5803 from tsiegleauq/adjust-initial-data
Update initial data
2021-01-12 08:37:54 +01:00
GabrielInTheWorld 29e79eefb4
Merge pull request #5806 from GabrielInTheWorld/fix-auth-environment
Updates environment for autoupdate
2021-01-11 15:54:44 +01:00
GabrielMeyer 4d2ba5447a Updates environment for autoupdate 2021-01-11 14:47:47 +01:00
Sean fecec21a0f Update initial data
update initial data to new naming
2021-01-08 15:11:24 +01:00
Oskar Hahn f2f9000dec
Merge pull request #5798 from ostcar/permission-interface
permission interface
2021-01-08 09:40:54 +01:00
Finn Stutzenstein 5098d71891
Merge pull request #5799 from FinnStutzenstein/update
Updating submodules
2021-01-07 17:31:51 +01:00
Finn Stutzenstein 3a3ac21e8a
Updating submodules 2021-01-07 17:30:39 +01:00
Oskar Hahn 91f2360550 permission interface 2021-01-07 17:28:16 +01:00
Oskar Hahn 14ae5736d2
Merge pull request #5792 from ostcar/example_data_permission_rename
Example data permission rename
2021-01-07 17:02:42 +01:00
Oskar Hahn ec9cdfc7a9 Fix permissions in example data
rename superadmin to admin

Rename user perm

enum values to strings

step

internal_item
2021-01-07 17:00:38 +01:00
Finn Stutzenstein 45289663c5
Merge pull request #5790 from ostcar/models-changes
models.yml: More clear enums
2021-01-07 16:52:19 +01:00
Norman Jäckel 2399414a4f
Merge pull request #5794 from normanjaeckel/Docs
Docs
2021-01-07 16:49:11 +01:00
Oskar Hahn a1702b0b8d Remove supporters autoremove 2021-01-07 16:46:21 +01:00
Finn Stutzenstein 6db4f68136
Merge pull request #5796 from FinnStutzenstein/gitignore
Add OS3 secrets to gitignore
2021-01-07 09:19:03 +01:00
Finn Stutzenstein 1ad58c503c
Add OS3 secrets to gitignore 2021-01-07 09:17:33 +01:00
Norman Jäckel b85a981dfe Added some descriptions. 2021-01-06 20:28:35 +01:00
Oskar Hahn 3c50e18cb3
Merge pull request #5793 from ostcar/modelsvalidate_external_lib
Use openslides-models-to-go
2021-01-06 11:39:21 +01:00
Oskar Hahn 98c2f5c332 Use openslides-models-to-go 2021-01-06 11:32:16 +01:00
Finn Stutzenstein c2e46afbd1
Merge pull request #5785 from reiterl/dev_model_supporter
Remove equal_fields meetings from supporter_ids.
2021-01-05 08:11:03 +01:00
Oskar Hahn 2504fbb307 Rename meeting superadmin to just admin 2021-01-04 15:46:22 +01:00
Oskar Hahn 1c5b4a5c9e More clear enums 2021-01-02 21:30:28 +01:00
Ludwig Reiter a8a5890d20 Remove equal_fields meetings from supporter_ids. 2020-12-18 11:36:50 +01:00
jsangmeister a3dce30e1d
Merge pull request #5776 from reiterl/dev_model_rm_option
Remove allow_multiple_votes_per_candidate
2020-12-17 15:22:01 +01:00
jsangmeister d224571373
Merge pull request #5782 from jsangmeister/fix-models
Fix models
2020-12-17 11:03:22 +01:00
Joshua Sangmeister e3af800597 Fix models 2020-12-17 11:00:22 +01:00
jsangmeister 3dbc5f29da
Merge pull request #5769 from jsangmeister/update-models
Removed redundant information from models.yml
2020-12-17 10:31:36 +01:00
Joshua Sangmeister 8a36731d80 Removed redundant information from models.yml and adjusted validator 2020-12-17 10:30:15 +01:00
Ludwig Reiter 7648c9c70f Remove allow_multiple_votes_per_candidate 2020-12-16 11:38:34 +01:00
Finn Stutzenstein 253126723f
Merge pull request #5767 from FinnStutzenstein/update
Update Submodules
2020-12-10 12:02:33 +01:00
Finn Stutzenstein a366c54afe
Update Submodules 2020-12-10 12:01:06 +01:00
Finn Stutzenstein bbb355cc05
Merge pull request #5759 from FinnStutzenstein/updateMediafileInterface
Update mediaservice interface
2020-12-08 10:06:13 +01:00
Finn Stutzenstein 67f3312090
Update mediaservice interface 2020-12-08 10:05:00 +01:00
Finn Stutzenstein b2909e0f1c
Merge pull request #5728 from reiterl/dev_model_number_value
Add number_value to motion model.
2020-12-08 08:39:17 +01:00
Finn Stutzenstein cbe1a133f4
Merge pull request #5758 from FinnStutzenstein/fixExampleData
Fix example data
2020-12-08 08:37:34 +01:00
Finn Stutzenstein 9504f2fb73
Fix example data 2020-12-08 08:36:09 +01:00
Ludwig Reiter 8c59d1090c Update models.py
Add description and read_only to motion/number_value.
2020-12-07 14:31:08 +01:00
Finn Stutzenstein 09d0f740c2
Merge pull request #5756 from FinnStutzenstein/changeDocs
Change modellierung.drawio
2020-12-04 16:19:47 +01:00
Finn Stutzenstein 7f9f12e750
Change modellierung.drawio 2020-12-04 16:17:37 +01:00
Finn Stutzenstein d983925930
Merge pull request #5753 from FinnStutzenstein/refinePolls
Refine poll modelling
2020-12-03 10:43:02 +01:00
Finn Stutzenstein a8f097ded4
Refine poll modelling 2020-12-03 10:40:47 +01:00
GabrielMeyer 50129c6fd0 Update auth-service's interface 2020-12-01 16:52:57 +01:00
Finn Stutzenstein 315bd7cdf3
Merge pull request #5696 from FinnStutzenstein/actionServiceInterface
Enhance the action interface
2020-12-01 14:37:43 +01:00
Finn Stutzenstein a87901aee0
Merge pull request #5741 from FinnStutzenstein/models
Propagate changes in OS3
2020-12-01 13:54:35 +01:00
Finn Stutzenstein 9826e763af
Propagate changes in OS3 2020-12-01 13:45:29 +01:00
Finn Stutzenstein 4c1f7b123a
Merge pull request #5698 from FinnStutzenstein/pollRestructure
Restructure polls
2020-12-01 11:51:14 +01:00
Finn Stutzenstein 4f02a236b4
small changes 2020-11-27 10:47:02 +01:00
Ludwig Reiter ed93d873a7 Add number_value to motion model. 2020-11-26 09:17:22 +01:00
Finn Stutzenstein 99b0bc6e3b
Restructure polls 2020-11-25 14:22:16 +01:00
Finn Stutzenstein 62f40d1447
move atomic parameter 2020-11-25 12:17:01 +01:00
Finn Stutzenstein 5019403a8e
Merge pull request #5722 from GabrielInTheWorld/new-compose
Deletes old docker-compose and adds a port to auth-service
2020-11-25 12:14:57 +01:00
GabrielMeyer c62cc7851d Deletes old docker-compose and adds a port to auth-service 2020-11-24 16:38:07 +01:00
Finn Stutzenstein a85a5458c6
Change the category prefix to optional 2020-11-24 15:25:48 +01:00
GabrielInTheWorld b2215131a4
Merge pull request #5712 from GabrielInTheWorld/fix-example-data
Fixes missing meeting_id in example-data
2020-11-19 15:05:35 +01:00
GabrielMeyer 371fb0c6ae Fixes meeting_id example-data 2020-11-19 15:01:53 +01:00
Finn Stutzenstein a0d0a4ac0b
Change name 2020-11-19 15:01:49 +01:00
Finn Stutzenstein cb7e91d8c5
Fixed ActionsResult 2020-11-19 13:54:53 +01:00
Finn Stutzenstein a73ae9961f
Include new transaction mode for bulk actions 2020-11-19 13:52:39 +01:00
jsangmeister c3bb1928b9
Merge pull request #5708 from r-peschke/feature_setCommittee_Meeting_protected
Set relation Committee -> Meeting protected
2020-11-19 10:56:20 +01:00
Ralf Peschke b39a2e397d Set relation Committee -> Meeting protected 2020-11-18 14:13:10 +01:00
Finn Stutzenstein c48b5277c4
Merge pull request #5646 from FinnStutzenstein/permissionService
Permission service
2020-11-17 07:51:20 +01:00
fistutzenste 945d1307ba
Permission Service 2020-11-17 07:49:14 +01:00
Joshua Sangmeister 8cd6e02772 Updated specs 2020-11-13 16:18:34 +01:00
Joshua Sangmeister c811926478 Update datastore specs 2020-11-13 13:05:26 +01:00
Finn Stutzenstein 989a5789ef
Merge pull request #5699 from FinnStutzenstein/update
Update Services
2020-11-12 07:34:09 +01:00
Finn Stutzenstein 95aa94e4ea
Update Services 2020-11-12 07:32:18 +01:00
jsangmeister 7a039469b0
Merge pull request #5697 from reiterl/dev_model_group
Add on delete Protect to group relations.
2020-11-11 13:50:42 +01:00
Ludwig Reiter 2304729545 Add on delete Protect to group relations. 2020-11-11 10:22:59 +01:00
Finn Stutzenstein 8cfa7d0a51
Result->Response, actions->action 2020-11-11 08:33:59 +01:00
Finn Stutzenstein 5b0047b093
Enhance the action interface 2020-11-10 17:37:53 +01:00
jsangmeister 1fb296038e
Merge pull request #5679 from jsangmeister/protect-first-state-of-workflow
Protect first_state_of_workflow_id & rename has_inherited_access_group_ids
2020-11-05 17:40:31 +01:00
Joshua Sangmeister ee41eb2df9 Protect first_state_of_workflow_id 2020-11-05 17:39:06 +01:00
jsangmeister 9c766de474
Merge pull request #5675 from reiterl/dev_model_lightblue
Add a default to motion_state css_class.
2020-11-04 16:03:39 +01:00
Ludwig Reiter 99011e6909 Add a default to motion_state css_class. 2020-11-04 14:53:57 +01:00
Finn Stutzenstein c104f235da
Merge pull request #5670 from FinnStutzenstein/fixMediafileExampleData
Fix eaxmple data: Add LOS for mediafiles
2020-11-03 15:23:58 +01:00
Finn Stutzenstein a183fa89cb
Fix eaxmple data: Add LOS for mediafiles 2020-11-03 15:22:24 +01:00
Finn Stutzenstein 0b6e855254
Merge pull request #5669 from FinnStutzenstein/locationToPlace
location -> place
2020-11-03 13:43:10 +01:00
Finn Stutzenstein ef78783b55
location -> place 2020-11-03 13:41:45 +01:00
Finn Stutzenstein ca069edb11
Merge pull request #5668 from FinnStutzenstein/structuredField
Structured fields, updated repos
2020-11-03 12:14:57 +01:00
Finn Stutzenstein 8bf3b3df6b
Structured fields, updated repos 2020-11-03 12:14:09 +01:00
jsangmeister 3e0ac15e49
Merge pull request #5662 from reiterl/dev_model_2
Update model assignment phase.
2020-10-30 10:33:59 +01:00
Ludwig Reiter e199e9dbe0 Update model assignment. Change enum and default of phase. 2020-10-30 10:03:40 +01:00
Finn Stutzenstein 4d8a53513a
Merge pull request #5659 from FinnStutzenstein/fixDockerComposeDev
Fix docker compose dev
2020-10-28 13:17:52 +01:00
Finn Stutzenstein c83d9cf806
Fix docker compose dev 2020-10-28 13:11:26 +01:00
Finn Stutzenstein 39d7353959
Merge pull request #5621 from FinnStutzenstein/prod
Productive setup
2020-10-28 10:42:42 +01:00
Finn Stutzenstein 9372386979
Prod setup 2020-10-28 08:46:03 +01:00
Finn Stutzenstein 399bf389d6
Merge pull request #5635 from FinnStutzenstein/dsHelperTools
Helper-tools for the DataStore
2020-10-23 08:32:03 +02:00
Finn Stutzenstein 4ff76444b2
Helper-tools for the DataStore 2020-10-23 08:31:20 +02:00
Finn Stutzenstein 1f049caf5d
Merge pull request #5650 from FinnStutzenstein/adoptExampleDataII
Adopt example data: Reenable the old version
2020-10-21 11:43:24 +02:00
Finn Stutzenstein e164e2b118
Adopt example data: Reenable the old version
This can be reverted, if every service can deal with the new syntax
2020-10-21 11:41:56 +02:00
Finn Stutzenstein ce5bb9dca5
Merge pull request #5649 from FinnStutzenstein/adoptExampleData
Adopt example data for new structured fields
2020-10-21 10:44:25 +02:00
Finn Stutzenstein a406d5ac88
Adopt example data for new structured fields 2020-10-21 10:39:44 +02:00
Finn Stutzenstein 81c00368f0
Merge pull request #5648 from FinnStutzenstein/enableMotionFeatures
Enable more features for motions
2020-10-21 09:22:58 +02:00
Finn Stutzenstein 5439e46866
Enable more features for motions 2020-10-21 09:21:27 +02:00
Finn Stutzenstein 44cfc2849f
Merge pull request #5642 from reiterl/dev_model
Update model.yml to switch enum of state.
2020-10-20 10:08:53 +02:00
Ludwig Reiter de65db33a7 Update model.yml to switch enum of state.
The motion_state css_class should include grey.
2020-10-20 09:35:29 +02:00
jsangmeister b6dd6086aa
Merge pull request #5632 from jsangmeister/change-weights
Change weights and add defaults
2020-10-15 09:55:36 +02:00
Finn Stutzenstein 77c03b5675
Merge pull request #5630 from GabrielInTheWorld/update-auth-service-interface
Update auth-service's interface and auth-service
2020-10-14 07:55:58 +02:00
Joshua Sangmeister 2664c39361 Change weights and add defaults 2020-10-13 17:16:35 +02:00
GabrielMeyer 049421bda9 Update auth-service's interface and auth-service 2020-10-13 15:06:18 +02:00
Finn Stutzenstein eded14f066
Merge pull request #5496 from GabrielInTheWorld/update-auth-service-interface
Update auth-service's interface
2020-10-13 08:26:15 +02:00
jsangmeister 27fdcc66d2
Merge pull request #5629 from jsangmeister/add-defaults
Add default type for motion_change_recommendation
2020-10-12 19:06:35 +02:00
Joshua Sangmeister 8530c87f77 Add default type for motion_change_recommendation 2020-10-12 19:02:26 +02:00
GabrielMeyer d123f0934a Updates auth-service's interface
- Also updates `example-data.json` corresponding to OpenSlides/openslides-auth-service#32
2020-10-12 17:17:30 +02:00
jsangmeister e9311083f2
Merge pull request #5620 from jsangmeister/add-on-delete
Add on_delete and meeting_id for all models
2020-10-12 16:20:07 +02:00
Joshua Sangmeister 064006474d Add on_delete, meeting_id and equal_fields 2020-10-12 15:13:01 +02:00
Finn Stutzenstein 9d52faaa6d
Merge pull request #5605 from FinnStutzenstein/models
OS4 Models: Add configuration and adopt schema changes in OS3
2020-10-12 14:46:20 +02:00
Finn Stutzenstein 2cc81c0168
OS4 Models: Add configuration and adopt schema changes in OS3 2020-10-12 14:39:12 +02:00
jsangmeister 3e655d3f12
Merge pull request #5626 from jsangmeister/add-default-agenda-item-type
Add default type to agenda item
2020-10-12 11:54:28 +02:00
Joshua Sangmeister f511b2f722 Add default type to agenda item 2020-10-12 11:48:23 +02:00
jsangmeister c83a82337b
Merge pull request #5612 from jsangmeister/fix-html-permissive
Fix typo
2020-10-08 09:31:14 +02:00
Joshua Sangmeister b311525b7d Fix typo 2020-10-08 09:27:04 +02:00
Finn Stutzenstein 31d6f93033
Merge pull request #5619 from FinnStutzenstein/update
Update services
2020-10-08 09:11:26 +02:00
Finn Stutzenstein 1891cc7e0b
Update services 2020-10-08 08:29:04 +02:00
Finn Stutzenstein 08b4f023cc
Merge pull request #5615 from GabrielInTheWorld/update-auth-service
Updates auth-service
2020-10-08 07:41:49 +02:00
GabrielMeyer 3971404764 Updates auth-service 2020-10-07 12:02:50 +02:00
jsangmeister 34dcb91744
Merge pull request #5593 from jsangmeister/adjust-models-yml
Adjust models.yml
2020-10-06 15:14:47 +02:00
Joshua Sangmeister ba03281c17 Adjust models.yml 2020-10-06 15:12:10 +02:00
Norman Jäckel a7248c2399
Merge pull request #5578 from FinnStutzenstein/updateModels
Update models
2020-10-02 09:04:41 +02:00
Finn Stutzenstein 248a0451df
Add topic to projected collections 2020-10-02 08:13:45 +02:00
Norman Jäckel 3b4a006754
Merge pull request #5589 from ostcar/modelsvalidate-version
Use a specific version of the modelsvalidater to make build reproducable
2020-10-01 21:10:21 +02:00
Oskar Hahn bd7e6b95cb Use a specific version of the modelsvalidater to make build reproducable 2020-09-30 20:15:07 +02:00
Norman Jäckel 2a479746cd
Merge pull request #5587 from normanjaeckel/FixBranch
Fix branch.
2020-09-30 20:11:39 +02:00
Norman Jäckel 5b6f6b50c1 Added through keyword for nested structured relations. 2020-09-29 23:24:12 +02:00
Norman Jäckel a4ed281c7e Fix branch. 2020-09-29 22:56:03 +02:00
Norman Jäckel e9fd1f108b
Merge pull request #5572 from normanjaeckel/modelsToYML
Models to yml
2020-09-29 22:49:03 +02:00
Norman Jäckel e80f7eb5e4 Added required flag and other properties to some models. 2020-09-29 22:43:39 +02:00
Finn Stutzenstein 49c77912ae
Merge pull request #5576 from jsangmeister/fix-example-data
Fix example data
2020-09-28 11:49:24 +02:00
Finn Stutzenstein b2eab8306e
Merge pull request #5558 from reiterl/dev1
Add calculated to motion_category/level field.
2020-09-28 10:45:24 +02:00
Joshua Sangmeister 9c6bb8ab7f Fix example data 2020-09-24 17:40:09 +02:00
GabrielInTheWorld 8ced3e0f38
Merge pull request #5573 from jsangmeister/fix-example-data
Fix example data & add direct db access script
2020-09-22 11:36:18 +02:00
Joshua Sangmeister 3b0df8de45 Fix example data & add direct db access script 2020-09-22 11:34:21 +02:00
Norman Jäckel a1925e87f3 Updated models.yml. Added GitHub action with validator. 2020-09-20 22:21:23 +02:00
Oskar Hahn c1b9de6e81 Added models.yml 2020-09-19 20:44:30 +02:00
jsangmeister 3dbc854d81
Merge pull request #5560 from jsangmeister/update-auth-backend
Update auth service and backend
2020-09-15 13:50:39 +02:00
Joshua Sangmeister 00eafb93b9 Update auth service and backend 2020-09-15 13:48:12 +02:00
Ludwig Reiter 4ea247a3f6 Add calculated to motion_category/level field. 2020-09-14 09:45:56 +02:00
Finn Stutzenstein 7e6ab82f8e
Merge pull request #5552 from FinnStutzenstein/updateModels
Update models.txt
2020-09-09 08:38:59 +02:00
Finn Stutzenstein de1cebae26
Update models.txt 2020-09-09 08:38:22 +02:00
Finn Stutzenstein 94219feb44
Merge pull request #5513 from FinnStutzenstein/media-interface
Mediaservice interface
2020-09-01 08:07:15 +02:00
Finn Stutzenstein e0df72bb06
Merge pull request #5527 from FinnStutzenstein/update
Update submodules
2020-08-25 16:36:10 +02:00
Finn Stutzenstein 3fe8b9b23c
Update submodules 2020-08-25 16:29:16 +02:00
Oskar Hahn 85bb8bbb5c
Update models.txt (#5523)
Update models.txt
2020-08-25 09:51:00 +02:00
Finn Stutzenstein 5846838a04
Merge pull request #5524 from FinnStutzenstein/update
Update models.txt
2020-08-24 15:57:13 +02:00
Finn Stutzenstein 0d2c91d8f9
Update models.txt 2020-08-24 15:56:14 +02:00
Finn Stutzenstein 829a44177a
Merge pull request #5518 from FinnStutzenstein/noteGenericRelations
Add reverse models for generic relations in models.txt (closes #5337)
2020-08-21 07:56:00 +02:00
Finn Stutzenstein 48a66d85bf
Add reverse models for generic relations in models.txt (closes #5337) 2020-08-21 07:55:01 +02:00
Finn Stutzenstein fc3b498511
Mediaservice interface 2020-08-18 10:39:20 +02:00
Finn Stutzenstein 3fb41bf800
Merge pull request #5512 from FinnStutzenstein/update
Fix HaProxy redirection and client
2020-08-17 13:43:02 +02:00
Finn Stutzenstein 0993c25e66
Fix HaProxy redirection and client 2020-08-17 13:36:42 +02:00
Finn Stutzenstein cb894c9d99
Merge pull request #5499 from FinnStutzenstein/moreCalculatedFields
Add calculated fields
2020-08-17 12:10:24 +02:00
Finn Stutzenstein 6ccf13bc6d
Merge pull request #5511 from FinnStutzenstein/update
Update Client and Auth service
2020-08-17 10:15:00 +02:00
Finn Stutzenstein b312dc9297
Update Client and Auth service 2020-08-17 10:14:14 +02:00
Finn Stutzenstein c86c3bdcbb
Merge pull request #5509 from tsiegleauq/slight-dev-docu-enhancement
Add https-info and enhance work-in-submodules doc
2020-08-14 11:16:00 +02:00
Finn Stutzenstein ae2b73a8e5
Merge pull request #5510 from FinnStutzenstein/haproxy-redirect
Added redirect from http to https
2020-08-14 11:14:51 +02:00
Finn Stutzenstein ff2569aba9
Added redirect from http to https 2020-08-14 11:13:56 +02:00
Sean Engelhardt 888e17369a Add https-info and enhance work-in-submodules doc 2020-08-14 11:09:49 +02:00
Finn Stutzenstein 5e0eda112d
Adding motion recommendation extension references as relations 2020-08-11 15:14:11 +02:00
Finn Stutzenstein 37d3591d69
Add calculated fields 2020-08-11 09:25:31 +02:00
Finn Stutzenstein 27725a7694
Merge pull request #5493 from OpenSlides/fixModels
Fix syntax of models.txt
2020-08-03 15:54:01 +02:00
Oskar Hahn cb0134a345 Fix syntax of models.txt 2020-08-03 15:19:03 +02:00
Finn Stutzenstein 8caf8e0c64
Merge pull request #5492 from FinnStutzenstein/fixExampleData
Fix example data II
2020-07-31 10:37:35 +02:00
fistutzenste 4fbf0a5438
Fix example data II 2020-07-31 10:36:20 +02:00
Finn Stutzenstein 51c27c4f12
Merge pull request #5491 from FinnStutzenstein/fixExampleData
Fix example data
2020-07-31 10:23:09 +02:00
fistutzenste 69ba33b117
Fix example data 2020-07-31 10:20:39 +02:00
Finn Stutzenstein 40fde015fc
Merge pull request #5490 from FinnStutzenstein/removeMkcert
Remove mkcert, update submodules
2020-07-31 09:23:19 +02:00
fistutzenste 3297e9c4e2
Remove mkcert, update submodules 2020-07-31 09:22:24 +02:00
Finn Stutzenstein 0671ca66c2
Merge pull request #5483 from FinnStutzenstein/fixDocs
Fix docs
2020-07-31 08:58:13 +02:00
Finn Stutzenstein 296a39929e
Merge pull request #5487 from FinnStutzenstein/smallerTimeouts
Smaller timeouts for HaProxy
2020-07-31 08:56:46 +02:00
FinnStutzenstein 584fe874ae
Fix docs and autoupdate interface 2020-07-30 09:09:09 +02:00
Finn Stutzenstein c9223329cc
Merge pull request #5489 from FinnStutzenstein/includeMediaService
WIP: Adding media service
2020-07-29 15:58:53 +02:00
FinnStutzenstein e518ef2784
WIP: Adding media service 2020-07-29 15:57:03 +02:00
Finn Stutzenstein 8c57d911a3
Merge pull request #5486 from GabrielInTheWorld/submodule-update
Submodule update backend
2020-07-29 08:35:40 +02:00
Finn Stutzenstein 6d2651650e
Merge pull request #5488 from GabrielInTheWorld/docker-setup
Fixes setup for auth-service
2020-07-28 14:25:29 +02:00
GabrielMeyer 6b6960c8fe Fixes setup for auth-service 2020-07-28 14:23:28 +02:00
FinnStutzenstein ded12bbea4
Smaller timeouts for HaProxy
This is needed to quickly detect the downage from a service. With these timeouts 12 seonds are needed for HaProxy to return an initial 503. All other 503 are instance since the service is not detected up again.
2020-07-28 10:49:09 +02:00
GabrielMeyer b81da7c979 Submodule update backend 2020-07-27 12:02:00 +02:00
Finn Stutzenstein a489742494
Merge pull request #5485 from swilde/openslides4-dev
If mkcert is not available, create certificates using openssl
2020-07-27 11:17:51 +02:00
Sascha Wilde 9bcffb08fb If mkcert is not available, create certificates using openssl 2020-07-24 17:32:28 +02:00
Finn Stutzenstein 5d7dc56684
Merge pull request #5476 from FinnStutzenstein/https
Https
2020-07-24 10:59:37 +02:00
FinnStutzenstein 79ddac9da8
Use HTTPS in development mode 2020-07-24 10:58:39 +02:00
FinnStutzenstein e47b5fff17
Merge branch 'update' into openslides4-dev 2020-07-23 12:16:59 +02:00
FinnStutzenstein cd007b0950
Update images 2020-07-23 12:16:35 +02:00
Finn Stutzenstein 5086df63b0
Merge pull request #5481 from FinnStutzenstein/update
Update submodules
2020-07-22 16:22:33 +02:00
FinnStutzenstein a17e88fa46
Update submodules 2020-07-22 16:21:46 +02:00
Finn Stutzenstein 708e176c2c
Merge pull request #5477 from FinnStutzenstein/schema
OS4 Schema: agenda items have tags
2020-07-22 13:29:28 +02:00
FinnStutzenstein 7d5cee923a
OS4 Schema: agenda items have tags 2020-07-17 08:38:55 +02:00
Finn Stutzenstein 846fb982f0
Merge pull request #5471 from tsiegleauq/ignore-more
Ignore venv
2020-07-17 07:04:54 +02:00
Sean ce3446bbe5 Ignore venv
.virtualenv should be ignored since it might still exist
from openslides 3.
2020-07-16 15:10:57 +02:00
Finn Stutzenstein 357e54ec93
Merge pull request #5474 from FinnStutzenstein/update
Updated auth service
2020-07-15 16:54:35 +02:00
FinnStutzenstein b6b041d0b6
Updated auth service 2020-07-15 16:54:01 +02:00
Finn Stutzenstein 06b520f3e6
Merge pull request #5466 from GabrielInTheWorld/add-auth-service
Adds submodule openslides-auth-service
2020-07-15 16:41:10 +02:00
GabrielMeyer 1f8e3d60e6 Adds submodule openslides-auth-service 2020-07-14 16:21:49 +02:00
Finn Stutzenstein 89f4323d11
Merge pull request #5460 from jsangmeister/update-models
Add new settings to meeting model
2020-07-09 12:53:00 +02:00
Joshua Sangmeister bedbb75c69 Add new settings to meeting model 2020-07-09 12:46:54 +02:00
Finn Stutzenstein 64628e4be9
Merge pull request #5458 from jsangmeister/update-datastore
Update datastore commit & config
2020-07-09 12:38:14 +02:00
Joshua Sangmeister 7cc6d1fda2 Update autoupdate, backend, client 2020-07-09 11:56:00 +02:00
Joshua Sangmeister 5dc22a7a60 Update datastore commit & config 2020-07-09 09:25:37 +02:00
Finn Stutzenstein 57b4dbd463
Merge pull request #5436 from FinnStutzenstein/clientStartup
Fixed client startup
2020-07-06 09:14:39 +02:00
FinnStutzenstein 8b537d32c0
Fixed client startup 2020-07-06 09:14:03 +02:00
Finn Stutzenstein c6fdb627f6
Merge pull request #5409 from FinnStutzenstein/integration
Integration of the backend and autoupdate service
2020-06-18 12:45:38 +02:00
FinnStutzenstein fe8a74ddf4
Integrate the autoupdate and backend service 2020-06-18 12:43:06 +02:00
jsangmeister b6a9d7dee8
Merge pull request #5400 from jsangmeister/fix-reserve-ids-specs
Fix reserveIds specification
2020-06-09 13:55:03 +02:00
Joshua Sangmeister 1f822d59dd Fix reserveIds specification 2020-06-09 13:55:40 +02:00
jsangmeister 38c67c6dd3
Merge pull request #5358 from jsangmeister/add-reader-to-dc
Add reader to docker compose files
2020-06-02 09:58:30 +02:00
jsangmeister 6c944eeaa8
Merge pull request #5379 from jsangmeister/change-return-types
Change return type of getAll and filter
2020-05-19 16:27:32 +02:00
Joshua Sangmeister ba69386f94 Change return type of getAll and filter 2020-05-19 16:04:48 +02:00
jsangmeister 209eff276e
Merge pull request #5357 from jsangmeister/datastore-rename-getids
Datastore: Rename getIds
2020-05-14 13:29:34 +02:00
Joshua Sangmeister 46ecb24f59 added reader to docker compose files 2020-05-13 16:29:46 +02:00
Joshua Sangmeister ff9acfe81d renamed getIds 2020-05-07 10:13:07 +02:00
jsangmeister 1196d1052b
Merge pull request #5350 from jsangmeister/updateDatastoreSpecs
Added routes to datastore spec
2020-05-05 14:24:24 +02:00
Joshua Sangmeister 66119dffda added routes to datastore spec 2020-05-05 14:24:40 +02:00
Finn Stutzenstein 8696beb6a9
Merge pull request #5327 from FinnStutzenstein/fixExampleData
Fixed example data II
2020-05-05 12:29:33 +02:00
jsangmeister ae6c214cd4
Merge pull request #5342 from jsangmeister/update-interface
Updated datastore interface
2020-05-05 10:05:52 +02:00
FinnStutzenstein 52d992d2ff
Fixed example data II 2020-04-30 09:11:11 +02:00
Joshua Sangmeister f66346405b updated datastore interface 2020-04-28 11:59:28 +02:00
Norman Jäckel bc19de9570
Merge pull request #5287 from FinnStutzenstein/fixExampleData
Small fixes for models and example data
2020-04-17 14:29:56 +02:00
FinnStutzenstein 4b1c9bc190 Small fixes for models and example data 2020-04-14 15:26:37 +02:00
jsangmeister d3b9404efd
Update datastore-service.txt 2020-04-08 11:20:55 +02:00
Norman Jäckel 952355ab94
Merge pull request #5292 from normanjaeckel/SmallFixes
Fixed typos in docs.
2020-04-03 14:08:51 +02:00
Norman Jäckel 252fe7dd51 Fixed typos in docs. 2020-04-03 13:24:15 +02:00
Norman Jäckel a45ac5d2e5
Merge pull request #5220 from normanjaeckel/RestrictionDev
Added first draft for restriction and presenter interfaces.
2020-04-03 13:14:29 +02:00
Finn Stutzenstein c4711cf714
Merge pull request #5261 from FinnStutzenstein/modelle
Refined models
2020-03-25 13:40:39 +01:00
jsangmeister 3ae373b8f1
Merge pull request #5263 from jsangmeister/minor-fixes
Adjustments for datastore spec
2020-03-25 13:04:15 +01:00
Joshua Sangmeister 1f80202218 adjustments to datastore specs 2020-03-25 13:04:20 +01:00
Norman Jäckel 642fae8bdc Fixed typos. 2020-03-24 21:14:43 +01:00
FinnStutzenstein 34ccd7abe8 Refined models 2020-03-24 15:49:02 +01:00
Finn Stutzenstein d77e1c4cd8
Merge pull request #5258 from GabrielInTheWorld/dev-auth
Adds interface for auth-service
2020-03-23 14:45:20 +01:00
Finn Stutzenstein a2da322a4d
Merge pull request #5268 from OpenSlides/autoupdate-interface
Fix autoupdate interface
2020-03-23 14:44:09 +01:00
Oskar Hahn e076fca655 Fix autoupdate interface 2020-03-23 14:43:19 +01:00
Finn Stutzenstein d7fd87d249
Merge pull request #5257 from FinnStutzenstein/serverClientStreaming
Client server communication
2020-03-23 14:36:18 +01:00
GabrielMeyer ce1df508cd Adds interface for auth-service 2020-03-23 13:30:26 +01:00
FinnStutzenstein e43e46fca7 Client server communication 2020-03-18 08:18:00 +01:00
FinnStutzenstein 73e6eddf89 Refine presenter service 2020-03-17 11:21:59 +01:00
Finn Stutzenstein 4f029d336c
Merge pull request #5256 from FinnStutzenstein/updatedClient
Updated Client
2020-03-17 09:02:50 +01:00
FinnStutzenstein 018556a542 Updated Client 2020-03-17 08:58:17 +01:00
Finn Stutzenstein c52821d864 Merge pull request #5241 from FinnStutzenstein/autoupdate-service
Autoupdate service interface
2020-03-16 16:05:14 +01:00
FinnStutzenstein 0a7557329c Interface and example changes 2020-03-16 16:01:26 +01:00
Finn Stutzenstein 8e3b25cd21
Merge pull request #5229 from FinnStutzenstein/os4-mediafiles-resources
[os4] no explicit resources for meetings
2020-03-13 09:18:01 +01:00
FinnStutzenstein 885b81cfe9 Autoupdate service interface 2020-03-09 14:52:20 +01:00
FinnStutzenstein 741a13eeb7 Production build uses commit hashes from submodules 2020-02-28 13:16:29 +01:00
Finn Stutzenstein 67e519a00f Merge pull request #5237 from FinnStutzenstein/os4-compose
Integrating the client and datastore into the main repo:
2020-02-26 15:11:29 +01:00
FinnStutzenstein 4484d1e4ef Integrating the client and datastore into the main repo:
- Added each service as a submodule for development
- Added conventions for naming environment variables
- Added required targets in makefiles of services
2020-02-26 14:47:13 +01:00
FinnStutzenstein f8c774abe7 [os4] no explicit resources for meetings 2020-02-20 10:59:08 +01:00
Norman Jäckel f5548770dd Added first draft for restriction and presenter interfaces. 2020-02-07 00:19:11 +01:00
Finn Stutzenstein f7a18cef65
Merge pull request #5181 from normanjaeckel/ActionDev
Updated action spec.
2020-02-05 06:52:52 +01:00
Norman Jäckel 3751593841 Review. 2020-02-03 23:32:24 +01:00
Finn Stutzenstein a15a35398c
Merge pull request #5182 from FinnStutzenstein/datastore-interface
More complete datastore interface
2020-02-03 06:51:17 +01:00
FinnStutzenstein f7f70098b0 More complete datastore interface 2020-02-03 06:50:11 +01:00
Norman Jäckel 6054eb76c5 Updated action spec. 2020-01-21 18:05:47 +01:00
FinnStutzenstein c187700af2 changes 2020-01-20 12:36:40 +01:00
Finn Stutzenstein 66e716bde1
Merge pull request #5178 from FinnStutzenstein/openslides4-dev
interface specs
2020-01-20 12:15:11 +01:00
FinnStutzenstein f889985326 interface specs 2020-01-20 12:14:36 +01:00
Emanuel Schütze a876eab9f3
Merge pull request #5170 from emanuelschuetze/readme
Added concept link to readme.
2020-01-05 15:15:10 +01:00
Emanuel Schütze 3eefc32ada Added concept link to readme. 2020-01-05 15:14:14 +01:00
Emanuel Schütze 9fe850fa0c
Merge pull request #5169 from emanuelschuetze/openslides4-dev
Prepare main repository for OpenSlides 4
2020-01-05 14:18:28 +01:00
Emanuel Schütze c3f1451966 Added OS4 system architecture image. 2020-01-05 14:16:52 +01:00
Emanuel Schütze a7302f0662 Prepared repository for OpenSlides 4. Removed OpenSlides 3 code. 2020-01-05 14:16:23 +01:00
Sean 7a26a87cf8
Merge pull request #5166 from tsiegleauq/service-worker-regression
Re-enable Service Worker
2019-12-17 11:01:31 +01:00
Sean Engelhardt ff271748d7 Reenable Service Worker
Fixes a regression that was preventing the service worker from loading
2019-12-17 10:00:57 +01:00
Emanuel Schütze f7e4be929c
Merge pull request #5165 from emanuelschuetze/release3.1
Release 3.1
2019-12-13 10:07:25 +01:00
Emanuel Schütze ac4174c391 Update version to 3.1.1-dev 2019-12-13 09:39:42 +01:00
Emanuel Schütze 32dfba0d5c Release 3.1 2019-12-13 09:39:11 +01:00
Emanuel Schütze e45d3aa360
Merge pull request #5164 from emanuelschuetze/translation-20191213
Updated CS translations
2019-12-13 09:33:56 +01:00
Emanuel Schütze cc4d867e06
Merge pull request #5163 from tsiegleauq/no-order-in-comments
Fix order of comments in motion detail
2019-12-13 09:22:47 +01:00
Emanuel Schütze 3bf588c013 Updated CS translations 2019-12-13 09:17:58 +01:00
Sean 8ba3037864
Merge pull request #5161 from emanuelschuetze/python38
Updated requirements for python 3.8 support
2019-12-12 15:24:22 +01:00
Sean Engelhardt f64a855b50 Fix order of comments in motion detail
Fixes an error where the order of comment section in
the motion comment section component was wrong
2019-12-12 12:10:56 +01:00
Sean Engelhardt 48c25d1e5b Use file-based database during testing 2019-12-11 16:13:59 +01:00
Emanuel Schütze 172aa14b13 Updated requirements for python 3.8 support
updated:
channels to 2.3.1
channels-redis to 2.4.1
daphne to 2.4.0

Added python 3.8 test for travis
2019-12-11 16:13:50 +01:00
Emanuel Schütze bb41125bd1
Merge pull request #5162 from tsiegleauq/search-value-selector-for-states
Fix untranslated searchable values
2019-12-10 17:00:29 +01:00
Sean Engelhardt 1e45153c0a Fix untranslated searchable values
Fixes a bug where the search value selector was not always filtering
for translated values.
Uses getTitle() in SearchValue selector rather than toString,
to allow enhance compatibility with custom values
2019-12-10 16:46:59 +01:00
Emanuel Schütze cc58f59fa1
Merge pull request #5160 from tsiegleauq/states-with-no-label
Fix null values in recommencation label
2019-12-10 14:05:02 +01:00
Sean Engelhardt af9a62abbb Fix null values in recommencation label
Fixes an issue that was showing empty values when setting
a recommendation
2019-12-10 10:56:21 +01:00
Emanuel Schütze 77bf24fe3a
Merge pull request #5159 from emanuelschuetze/translations-201912
Updated translations (DE, CS, RU)
2019-12-09 18:13:45 +01:00
Emanuel Schütze 1bababd8c1 Updated translations (DE, CS, RU) 2019-12-09 17:30:48 +01:00
Emanuel Schütze a85858f6b5
Merge pull request #5158 from emanuelschuetze/change-metabox-config
Rename config option to show meta box below title on projector.
2019-12-09 16:45:59 +01:00
Emanuel Schütze 9e81e6145f Rename config option to show meta box below title on projector. 2019-12-09 16:32:46 +01:00
Emanuel Schütze 431dc2b758
Merge pull request #5107 from tsiegleauq/changelog-for-3.1
Add changelog for 3.1
2019-12-09 16:12:53 +01:00
Emanuel Schütze 53ebbabc9b
Merge pull request #5157 from tsiegleauq/no-amendment
Add more motion filter options
2019-12-09 15:44:07 +01:00
Emanuel Schütze 72bd971f0b
Merge pull request #5154 from tsiegleauq/cleanup-small-things
Add leftover changes for 3.1
2019-12-09 15:41:04 +01:00
Sean Engelhardt c9cf99d0e4 Add leftover changes for 3.1
Adds various changes for a more complete 3.1 release

- cleaner "current slide" description in projector detail (grid with ellipsis)
- show the previously projected slides as ordered lists under the accordion
- fix a bug where everyone could access the projection manage view (although it was unfunctional without the correct permissions)
- assignment list now uses the correct ellipsis
- fixes a bug where the lable "list of speakers" was not translated on the projector slide
- Show a lock on the "list of speaker"-slide if it has been closed
- enable dialog tests that have previously been disabled
2019-12-09 15:00:32 +01:00
Sean Engelhardt ffb67638f6 Added changelog for 3.1 2019-12-09 14:35:43 +01:00
Sean Engelhardt d17ad04b6c Add more motion filter options
Adds a motion filter option for motions which have no
amendments and are no amendments
2019-12-09 14:24:05 +01:00
Emanuel Schütze 50ce5e7d61
Merge pull request #5156 from tsiegleauq/dymanic-ngrid-index-jumping
Scroll to previous offset rather than index
2019-12-09 11:07:23 +01:00
Emanuel Schütze e2630faead
Merge pull request #5149 from FinnStutzenstein/deleteUsersWithWSConnection
Fixed late autoupdates with deleted users
2019-12-09 10:41:59 +01:00
Sean 01b626d3e7 Scroll to previous offset rather than index
Changes some auto scrolling behavior in our virtual scrolling tables.
Save the scroll offset before any navigation attempt, rather than
saving the index on click.
Should work for every possible navigation action.
2019-12-06 13:50:14 +01:00
Sean 0bb2175f79
Merge pull request #5155 from tsiegleauq/duplicated-pdf-title
Add event description to PDF
2019-12-04 15:52:39 +01:00
Sean Engelhardt ae62fd69f5 Add event description to PDF
Fixes a bug where the event name was printed twice in the PDF header
2019-12-04 15:37:38 +01:00
Finn Stutzenstein 60e3282286
Merge pull request #5077 from FinnStutzenstein/readOnlyRedis
Adding a second optional redis for read only accesses
2019-12-04 11:01:21 +01:00
FinnStutzenstein cc4ca61964 Adding a second optional redis for read only accesses 2019-12-03 12:30:31 +01:00
Finn Stutzenstein 7c61076837
Merge pull request #5152 from FinnStutzenstein/lockingService
Locking service and locks the history build process (closes #4039)
2019-12-03 12:28:40 +01:00
FinnStutzenstein f7cdfb7c02 Locking service and locks the history build process (fixes #4039) 2019-12-03 12:14:49 +01:00
Sean 93d9e6b169
Merge pull request #5151 from tsiegleauq/offline-spinner-issue
Consider offline during update checks
2019-12-02 17:06:26 +01:00
Emanuel Schütze b506735cfe
Merge pull request #5148 from tsiegleauq/manual-cd-workflow-detail
Add manual cd for workflow detail
2019-12-02 17:05:49 +01:00
Sean Engelhardt a6891ef8e1 Consider offline during update checks
Hides the spinner if the update checks fail cause the server is
unreachable

use new cleansup the code a little
2019-12-02 16:55:46 +01:00
Sean Engelhardt dd272c823f Add manual cd for workflow detail 2019-12-02 16:35:51 +01:00
Emanuel Schütze 2c120dd67c
Merge pull request #5150 from tsiegleauq/no-export-inline-numbers
Remove option for inline line number PDF
2019-12-02 15:44:42 +01:00
Emanuel Schütze ed8d666fce
Merge pull request #5120 from tsiegleauq/nav-from-motion-blocks
Add navigation flag to return to custom oriring
2019-12-02 15:35:01 +01:00
Sean Engelhardt d962e55fee Remove option for inline line number PDF
- removes the option to export PDF as inline, since it's not working atm
- motions that would be exported with inline line number would be exported with outside line numbers
2019-12-02 12:54:27 +01:00
FinnStutzenstein 0d38b784bc Fixed late autoupdates with deleted users 2019-11-29 13:15:20 +01:00
Sean 876dd1f7d6
Merge pull request #5146 from FinnStutzenstein/fixBaserepoTooEarlyUpdates
Fixed too early single-model updates in the BaseRepository
2019-11-27 15:43:52 +01:00
FinnStutzenstein f392b479ba Fixed too early single-model updates in the BaseRepository 2019-11-27 15:28:12 +01:00
Sean Engelhardt ce2f711a7c Add navigation flag to return to custom oriring
Adds the state "back: 'true'" to certain router navigations to set
a custom return point for using the OpenSlides back arrow.
Allows to return to category detail, motion block detail and
amendment detail from a motion detail view.
You will keep the navigation state for as long as you don't change
the view
2019-11-27 11:16:39 +01:00
Emanuel Schütze b86054c4b9
Merge pull request #5144 from tsiegleauq/hide-long-amendment-preview-slide
Hide long amendment preview on motion slide
2019-11-26 15:34:00 +01:00
Emanuel Schütze 7d52f12770
Merge pull request #5138 from tsiegleauq/more-nested-pdf-lists
Add nested PDF lists with line numbering
2019-11-26 15:24:48 +01:00
Sean Engelhardt 4599091d57 Add nested PDF lists with line numbering
Adds support for nested PDF lists in motions with line numbering
Numbers and lines can be slightly of in extrem cases.

Lists are supposed to be relatively short lists and are not(!) a replacement
for paragraphs.
Chaning that would require me to create our own implementation of
PDFMake-Lists
2019-11-26 14:47:13 +01:00
Finn Stutzenstein 8f9e3a2b03
Merge pull request #5145 from jsangmeister/unique-error-fix
Error handling for race-based integrity errors
2019-11-26 14:07:34 +01:00
Sean 475885d0a2
Merge pull request #5143 from tsiegleauq/more-permitted-mobile-list-dots
Hide mobile list-menus by permission
2019-11-26 14:05:57 +01:00
Sean Engelhardt 50a9a89910 Hide mobile list-menus by permission
Hides some mobile list menus if the permissions
are not sufficient.
Change the layout of the assignment mobile list
2019-11-26 13:19:37 +01:00
Sean Engelhardt bb3a154ccc Hide preview on motion slide
Hides the grey amendment context
2019-11-26 13:07:34 +01:00
jsangmeister f2dd8ebdd9 try-catch for race-based integrity errors 2019-11-26 11:49:06 +01:00
Emanuel Schütze 1b40cd74e0
Merge pull request #5141 from tsiegleauq/custom-projector-resolution
Custom aspect ratio for projector
2019-11-26 11:42:35 +01:00
Emanuel Schütze 7454540b67
Merge pull request #5123 from FinnStutzenstein/fixMediafiles
Fixed mediafiles
2019-11-26 09:31:52 +01:00
FinnStutzenstein e416117b11 Fixed mediafiles 2019-11-26 09:11:18 +01:00
Finn Stutzenstein 13e9f3453f
Merge pull request #5142 from FinnStutzenstein/fixLogging
Fixed little logging mistake
2019-11-25 07:41:16 +01:00
FinnStutzenstein 7a18396a78 Fixed little logging mistake 2019-11-25 06:38:42 +01:00
Sean Engelhardt ff90f9490c Add custom aspect ratio for the projector
Change the client to accept aspect ratios like:
4:3, 16:9, 16:10 or custom over a textfield

Change server to accept aspect ratios and dropped height
2019-11-22 16:41:28 +01:00
Emanuel Schütze acab54738b
Merge pull request #5139 from tsiegleauq/mod-final-version-export-fix
Export Modified Final Version over exporter
2019-11-20 21:06:05 +01:00
Sean Engelhardt e97292afdd Export Modified Final Version over exporter
- Adjusts the motion exporter to prefer modified final versions
over "just" final versions
- enhance the change detection of motion detail a little
(editor and viewport changes)
2019-11-20 11:39:10 +01:00
Emanuel Schütze 4451fe979e
Merge pull request #5129 from tsiegleauq/assignment-order
Remove sorting poll option by weight
2019-11-13 14:48:03 +01:00
Emanuel Schütze 55cdc364f1
Merge pull request #5121 from FinnStutzenstein/htmlValidation
Added html validation for users and personal notes
2019-11-13 14:45:26 +01:00
Emanuel Schütze da3af834af
Merge pull request #5135 from FinnStutzenstein/fixAgendaItemNumber
Fix agenda item number
2019-11-13 14:36:19 +01:00
Finn Stutzenstein 5b0b320bfa
Merge pull request #5128 from FinnStutzenstein/setPasswordAuthenticationCheck
Fixed wrong permission/auth check for set password
2019-11-13 14:01:48 +01:00
FinnStutzenstein a3c97a2ccd Fix agenda item number 2019-11-13 14:00:53 +01:00
Sean e3e50c1730
Merge pull request #5106 from emanuelschuetze/mobile-views
Improved mobile views (Agenda list, motion block list)
2019-11-11 14:06:02 +01:00
Emanuel Schütze 7aaad26b68 Improved mobile views (Agenda list, motion block list/detail) 2019-11-11 13:51:22 +01:00
Sean Engelhardt 3530b625d9 Remove sorting poll option weight
Fixes a bug where entered votes did not match to the order of poll options
fixes #5125
2019-11-11 12:36:54 +01:00
FinnStutzenstein 427b17a3e9 Fixed wrong permission/auth check for set password 2019-11-11 07:07:19 +01:00
FinnStutzenstein c54e2621f2 Added html validation for users and personal notes 2019-11-08 15:39:18 +01:00
Finn Stutzenstein d248f5fbc1
Merge pull request #5122 from tsiegleauq/fix-regression-in-assignments
Fix regression in assignments
2019-11-08 11:45:42 +01:00
Sean Engelhardt b0695a25c1 Fix regression in assignments
Fixes a bug where assignment polls could not be saved
Cleaned up some code
2019-11-08 09:42:42 +01:00
Emanuel Schütze d286378524
Merge pull request #5104 from jsangmeister/csv-import-fix
Fixed CSV import
2019-11-06 11:03:08 +01:00
jsangmeister 0922f0de3f fixed csv import 2019-11-06 10:43:56 +01:00
Emanuel Schütze 69a904c058
Merge pull request #5118 from tsiegleauq/download-does-not-work
Fixes a bug where files are not known as files
2019-11-06 10:22:52 +01:00
Sean Engelhardt d482f205cd Fixes a bug where files are not known as files
This is a regression from model change.
The is_file method is missing. Replaces is_file with !is_directory
2019-11-06 10:12:15 +01:00
Sean be2e8d9584
Merge pull request #5117 from FinnStutzenstein/fixGroupsMatrix
Fixed duplicate permissions in the group matrix (fixed #5112)
2019-11-05 14:55:12 +01:00
Sean e15619806d
Merge pull request #5057 from GabrielInTheWorld/savingSearch
Shows all related items of one collection
2019-11-05 12:29:21 +01:00
FinnStutzenstein fed9f3c19b Fixed duplicate permissions in the group matrix (fixed #5112) 2019-11-05 11:39:52 +01:00
Finn Stutzenstein 1dcb496147
Merge pull request #5111 from jsangmeister/default-to-reference-projector
Change wording from 'default' to 'reference' projector
2019-11-05 10:04:11 +01:00
jsangmeister fa95859b61 change 'default' to 'reference' projector 2019-11-05 09:47:05 +01:00
Emanuel Schütze 66390fe92c
Merge pull request #5108 from emanuelschuetze/translations20191104
Updated translations
2019-11-04 16:39:42 +01:00
Emanuel Schütze 9e43d0f63e Updated German translations 2019-11-04 15:46:09 +01:00
Emanuel Schütze 8b3d0afb9e
Merge pull request #5110 from tsiegleauq/tiles-dont-do-anything
Fix motion tiles filter
2019-11-04 15:45:02 +01:00
Sean Engelhardt 24359450c7 Fix motion tiles filter
Fixes an error where motion tile filter could not be applied due
to changing category filter definition
2019-11-04 15:23:49 +01:00
Emanuel Schütze b867b02e28
Merge pull request #5058 from tsiegleauq/rework-choice-service
Rework choice service and dialog
2019-11-04 13:48:44 +01:00
Emanuel Schütze 9d7d4b8620
Merge pull request #5043 from tsiegleauq/new-projector-list
Enhance projector list
2019-11-04 13:44:53 +01:00
Sean Engelhardt 233961b466 Enhance projector list
- The projector list now scales to give a better overview
- selecting the projector for the CLOS reference is more intuitive
- editing and creating projectors now works over a dialog
- editing projectors is now possible from the detail page
- projector tiles look overall cleaner
- Editing the projector offers a preview
- no changes "on the fly"
- Dialog has apply button to allow saving without closing
- The slider has an input fild on the right side to allow the usage
  of specific values
2019-11-04 13:30:25 +01:00
Finn Stutzenstein f62b506dee
Merge pull request #5103 from jsangmeister/reference-projector-view
Added a view to change the reference projector in one api call
2019-11-01 12:19:41 +01:00
jsangmeister 96ac370f61 added a view to change the reference projector in one api call 2019-11-01 10:56:59 +01:00
Finn Stutzenstein 0ab46ed955
Merge pull request #5099 from jsangmeister/email-error-fix
Fixed error output of http service to correctly display email validation error
2019-10-30 15:22:19 +01:00
jsangmeister 85a11c8b39 fixed error output to correctly display email validation error 2019-10-30 14:01:12 +01:00
Sean 113bdc76f3
Merge pull request #5088 from emanuelschuetze/motion-slide-box
Use horizontal meta box ('pdf style table') for motion slide
2019-10-30 13:34:41 +01:00
Emanuel Schütze 5305b52dba Use horizontal meta box ('pdf style table') for motion slide 2019-10-30 13:18:40 +01:00
Sean 6081df202c
Merge pull request #5089 from emanuelschuetze/layout-fixes
Minor layout fixes (chyron, list of speakers)
2019-10-30 12:33:44 +01:00
Emanuel Schütze 68dad5561e Minor layout fixes (chyron, list of speakers)
- use bold font for names on chyron
- Fix box height for list of speakers view (for normal users in Firefox)
2019-10-30 12:14:27 +01:00
Sean 9ae4472b0d
Merge pull request #5086 from GabrielInTheWorld/editStart
Adds the 'edit-mode' to start, legal-notice and privacy-policy
2019-10-30 12:04:51 +01:00
Sean 19f3fb579b
Merge pull request #5083 from GabrielInTheWorld/hintsForTheWin
Replaces the question-marks in config with hints
2019-10-30 11:57:55 +01:00
Sean 424c59d027
Merge pull request #5094 from GabrielInTheWorld/agendaSecondLine
Sets the subtitle as a second line in agenda
2019-10-30 11:38:50 +01:00
Sean d12bf299cc
Merge pull request #5096 from jsangmeister/settings-safety-check
Added safety check before reset in config
2019-10-30 11:23:44 +01:00
Sean 985e54dcd5
Merge pull request #5087 from tsiegleauq/proxy-filter-issues
Repair motion filter for proxies
2019-10-30 11:22:32 +01:00
Sean cc2dc1eeff
Merge pull request #5092 from GabrielInTheWorld/fixDecoding
Fixes decoding caused by exceeding stack size
2019-10-30 11:21:11 +01:00
jsangmeister 66f397f189 added safety check before reset in config 2019-10-30 09:56:43 +01:00
GabrielMeyer 0c4bcd4bd8 Sets the subtitle as a second line in agenda 2019-10-29 16:22:56 +01:00
Finn Stutzenstein 98a7d4dcdf
Merge pull request #5093 from GabrielInTheWorld/fixPythonTest
Fixes python3.7 tests
2019-10-29 15:24:16 +01:00
GabrielMeyer b806b8406b Fixes python3.7 tests 2019-10-29 15:05:52 +01:00
GabrielMeyer efa8f37528 Fixes decoding caused by exceeding stack size 2019-10-29 14:02:14 +01:00
Finn Stutzenstein 8335662e9b
Merge pull request #5084 from GabrielInTheWorld/filterAgenda
Adds filtering by collection as a new filter for the agenda
2019-10-24 10:23:14 +02:00
Sean c7734a3b9e
Merge pull request #5085 from tsiegleauq/txt-encode-dep
Replace encode and decode
2019-10-24 10:19:36 +02:00
GabrielMeyer 663d230561 Adds the 'edit-mode' to start, legal-notice and privacy-policy 2019-10-24 09:15:01 +02:00
GabrielMeyer 19347f89d0 Replaces the question-marks in config with hints 2019-10-24 09:02:15 +02:00
Sean Engelhardt 342b881af4 Repair motion filter for proxies
The View Model Proxies are currently breaking all filter operations.
This reparis the motion filters
2019-10-23 15:25:56 +02:00
Sean Engelhardt 62eba77925 Rework choice service and dialog
- cleans up the choice service and the choice dialogs to make them
simpler and more usable.
- adjusts search-value-selector to also accept lists
- the search value selector allows for better filtering of models in the choice dialog
- fixes an issue where deleting all tags required a selection
2019-10-23 10:41:58 +02:00
GabrielMeyer b48c8ad1da Shows all related items of one collection 2019-10-22 17:18:04 +02:00
GabrielMeyer df1b03698c Adds filtering by collection as a new filter for the agenda 2019-10-22 15:54:46 +02:00
Sean d3efba9dd5 Replace encode and decode
Replaces encode and decode with manual functions
2019-10-21 17:25:16 +02:00
Finn Stutzenstein 62e5774c8d
Merge pull request #4878 from FinnStutzenstein/moveConfigData
Reworked config
2019-10-21 14:13:02 +02:00
Finn Stutzenstein caf05a3e87
Merge pull request #5000 from FinnStutzenstein/saml
[WIP] saml integration
2019-10-21 14:09:49 +02:00
FinnStutzenstein cf7a5ce714 Reworked config
- Move config meta data into REST
- seperate views for config groups
2019-10-21 13:45:06 +02:00
FinnStutzenstein 4a77bf1a61 saml 2019-10-21 13:34:01 +02:00
Sean 9f25f2bc34
Merge pull request #5075 from jsangmeister/personal-comment-export
Added motion export option for personal note and fixed export error
2019-10-21 11:54:17 +02:00
Sean 33e2bb3498
Merge pull request #5079 from jsangmeister/long-state-fix
Removed max-width on mat-menu-panel to display full state name
2019-10-21 11:53:31 +02:00
jsangmeister 243949de43 added motion export option for personal note and fixed export error 2019-10-21 10:01:44 +02:00
jsangmeister a328580a07 removed max-width on mat-menu-panel 2019-10-18 15:42:18 +02:00
Finn Stutzenstein bcba878e18
Merge pull request #5078 from FinnStutzenstein/fixMaster
Fixed typing from parse_qs
2019-10-18 15:15:23 +02:00
FinnStutzenstein 3f41890541 Fixed typing from parse_qs 2019-10-18 14:41:55 +02:00
GabrielInTheWorld d49f6124d3
Merge pull request #5071 from GabrielInTheWorld/prepareRecoState
Editing state and recommendation in motion-list
2019-10-16 16:16:59 +02:00
GabrielMeyer 1354fc74ef Editing state and recommendation in motion-list
- In the info-dialog opening in the motion-list the user can update the current state and the recommendation for one motion.
2019-10-16 15:58:47 +02:00
Finn Stutzenstein 2f01e46415
Merge pull request #5073 from FinnStutzenstein/ws404
Closing websocket connections to unknown urls
2019-10-16 12:04:59 +03:00
Sean 0df87fd522
Merge pull request #5076 from FinnStutzenstein/readdLastSpeakerFix
Fixed readding last speaker
2019-10-16 09:57:07 +02:00
FinnStutzenstein d1048a0d9d Fixed readding last speaker
It is not given, that null values are sorted last in the `order_by("-end_time")`
statement. This did not happens in the tests, but in a productive environment.
See https://docs.djangoproject.com/en/2.2/ref/models/querysets/#order-by for a
`.asc()`/`.desc()` option `nulls_last`. I choose another approach to just
exclude these values.
2019-10-16 09:41:30 +02:00
Sean 595f9cd201
Merge pull request #5030 from tsiegleauq/date-pipe
Add custom date pipe
2019-10-16 09:23:01 +02:00
Sean 611c0bce45
Merge pull request #5062 from FinnStutzenstein/perf
Use Proxies for ViewModels
2019-10-16 09:22:00 +02:00
FinnStutzenstein 7af74fb07a Use Proxies for ViewModels
Also reworked creation of assignments, motions and users.
2019-10-16 09:11:02 +02:00
Finn Stutzenstein 7282c541dd
Merge pull request #5069 from jsangmeister/los-edit-mode
Edit mode for List of Speakers
2019-10-15 16:08:10 +03:00
jsangmeister 943e8f22d3 Adds sort mode, delete confirmation and re-add speaker button to list of
speakers
2019-10-15 14:58:04 +02:00
Finn Stutzenstein 4466e15343
Merge pull request #5074 from tsiegleauq/motion-detail-manual-cd
use manual cd in motion detail
2019-10-15 15:17:27 +03:00
Sean Engelhardt 4ba701663b use manual cd in motion detail
Uses manual CD in motion detail
2019-10-15 13:48:56 +02:00
Sean Engelhardt 04656950cb Add custom date pipe
Adds a custom date pipe and use it on the projector
The date pipe accepts unix time, can automatically adjust date to the current language and supports custom formatting using "moment.js" formatting options

Also fixes a minor translate-tag error
2019-10-15 12:20:22 +02:00
FinnStutzenstein e4c4bc0aa0 Closing websocket connections to unknown urls 2019-10-15 10:54:31 +02:00
Sean f9cea53659
Merge pull request #5041 from GabrielInTheWorld/reworkMotionCommands
Separates the menu for multi-select of motions
2019-10-14 12:48:41 +02:00
Sean a5a40e9e11
Merge pull request #5048 from tsiegleauq/new-travis-flags
Adjust ng test to be more serverfriendly
2019-10-14 11:54:15 +02:00
Emanuel Schütze b397122694
Merge pull request #5070 from tsiegleauq/strange-pdf-line-number-issue
Fix format motions hidden change discrepancy
2019-10-11 14:35:01 +02:00
Sean Engelhardt 58541aedd3 Adjust ng test to be more serverfriendly
Uses Chrome Headless without sandboxing for running Angular karma tests
add new "test-silently" command run tests in a more discrete way,
Should enhance testspeed on servers and CI
2019-10-11 14:29:38 +02:00
Sean Engelhardt 6b1c72d526 Fix format motions hidden change discrepancy
Fixes an issue where the "formatMotion" function was working on the wrong
array.
This resulted in unexpected results of both PDF and CSV export

Fixes as issue in the diff services that deleted replaced lines rather than overwriting them
2019-10-11 14:11:45 +02:00
Emanuel Schütze c2b89c0bb2
Merge pull request #5072 from tsiegleauq/vscroll-performance
Fix flickering in tables
2019-10-11 09:51:37 +02:00
Sean 0dbec6404e
Merge pull request #5049 from GabrielInTheWorld/travisImprovement
Improves travis a little bit
2019-10-09 16:11:35 +02:00
GabrielMeyer a56d850f51 Separates the menu for multi-select of motions
- Adds a new component for the list.
- Adds the component to amendment-list and motion-list.
2019-10-09 16:10:44 +02:00
Sean Engelhardt 2d14fc2057 Fix flickering in tables
reduces the flickering during scroll events in list view tables
Adjusts some ellipsis
2019-10-09 14:59:43 +02:00
Emanuel Schütze 4a8362deaf
Merge pull request #5067 from emanuelschuetze/styles
Set h4 font-size. Added tooltips for projector controls.
2019-10-05 10:42:39 +02:00
Emanuel Schütze ef7bb01043 Set h4 font-size. Added tooltips for projector controls. 2019-10-05 10:11:03 +02:00
Emanuel Schütze 41627da5de
Merge pull request #5066 from FinnStutzenstein/notifyLogging
Logs notify messages on server
2019-10-05 08:14:55 +02:00
FinnStutzenstein 9ae66fb33b Logs notify messages on server 2019-10-04 11:58:07 +02:00
Emanuel Schütze 50bd31a9a6
Merge pull request #5064 from GabrielInTheWorld/doubleHitProjector
Enhances the autoupdate of projector by change-id
2019-10-02 17:00:25 +02:00
Emanuel Schütze c2c1186da9
Merge pull request #5063 from GabrielInTheWorld/addsTitleToAgenda
Extends the title of the agenda-items
2019-10-02 16:57:11 +02:00
GabrielMeyer c8d02788dc Enhances the autoupdate of projector by change-id 2019-10-02 16:30:30 +02:00
GabrielMeyer 6c98fbcb83 Extends the title of the agenda-items 2019-10-02 15:48:43 +02:00
Emanuel Schütze aab7a41efd
Merge pull request #5065 from tsiegleauq/apply-search-filter-bug
Refresh DataSource filter and sort
2019-10-02 14:21:46 +02:00
Sean Engelhardt d4090122ef Refresh DataSource filter and sort
Cleanup some List View Table code
Fixes a bug where the search-filter was not applied after navigation
Fixes a bug where the search-filter and the property-filter and property-sort could not be used together
2019-10-02 13:35:18 +02:00
GabrielInTheWorld 1dc96b0f2f
Merge pull request #5002 from GabrielInTheWorld/coolestAgenda
Build agenda with optional subtitle
2019-09-30 10:51:55 +02:00
Emanuel Schütze af995a1de5
Merge pull request #5061 from emanuelschuetze/noindex
Added meta noindex tag.
2019-09-28 13:58:26 +02:00
Emanuel Schütze 4a595a8abc Added meta noindex tag. 2019-09-27 18:19:47 +02:00
Emanuel Schütze a9f03b61f4
Merge pull request #5060 from FinnStutzenstein/ws
Improved WS connection failure handling
2019-09-27 09:59:07 +02:00
FinnStutzenstein 97cda14a04 Improved WS connection failure handling 2019-09-27 07:41:36 +02:00
Emanuel Schütze 29d151450c
Merge pull request #5059 from emanuelschuetze/translation-20190926
Updated translations.
2019-09-26 14:42:26 +02:00
Emanuel Schütze 3f76a19bfc Updated translations. 2019-09-26 14:17:28 +02:00
Emanuel Schütze f0dd88ddb8
Merge pull request #5056 from tsiegleauq/amendment-filter-for-motion-list
Adds amendment filter types to motion list
2019-09-25 17:01:18 +02:00
Sean Engelhardt 82fe7eea4b Adds amendment filter types to motion list
Adds the possibility to filter if a motion has amendments or is an amendment
2019-09-25 15:51:15 +02:00
Emanuel Schütze 7f49ead439
Merge pull request #5055 from tsiegleauq/fix-projector
Fix flickering projector button in lists
2019-09-24 22:04:30 +02:00
Sean Engelhardt dc60d1254b Fix flickering projector button in lists
...
2019-09-24 21:31:51 +02:00
Sean c848472642
Merge pull request #5053 from GabrielInTheWorld/savingCountdown
Saves the settings for countdown-controls
2019-09-24 20:30:56 +02:00
Emanuel Schütze 205bfa05ef
Merge pull request #5054 from emanuelschuetze/fixTranslation
Fix translation in assignment poll.
2019-09-24 20:22:55 +02:00
Emanuel Schütze 683f87b3ff Fix translation in assignment poll. 2019-09-24 19:06:44 +02:00
GabrielMeyer 7462918e43 Saves the settings for countdown-controls 2019-09-24 18:55:30 +02:00
Emanuel Schütze a82789d201
Merge pull request #5052 from tsiegleauq/show-motion-context
Fix showing content of amendments
2019-09-24 18:02:40 +02:00
Emanuel Schütze 23a7f26437
Merge pull request #5051 from tsiegleauq/amendment-pdf-overview-list-issue
Render lists in amendment overview PDF
2019-09-24 16:51:34 +02:00
Sean Engelhardt 48321fa2b7 Fix showing content of amendments
Fixes an error where the "Show entire motion text" was not giving expected results
2019-09-24 16:33:48 +02:00
Sean Engelhardt a4dd0acd53 Render lists in amendment overview PDF
Fixes an issue that lists where not sown in the amendment overview PDF
2019-09-24 16:10:21 +02:00
Emanuel Schütze b33c01f1aa
Merge pull request #5050 from emanuelschuetze/additional-html-tags
Allow <del> and <ins> html tags.
2019-09-24 13:23:36 +02:00
Emanuel Schütze 1ff616fe4f Allow <del> and <ins> html tags. 2019-09-24 12:53:15 +02:00
GabrielMeyer 71fdc28413 Build agenda with optional subtitle
- Updates the `virtual-scroll`-package.
- Updates the `list-view-table.component` for variable row-height.
- Adds config to have optional a subtitle in the `agenda-list`.
2019-09-24 11:15:28 +02:00
GabrielMeyer 49bec70042 Improves travis a little bit 2019-09-24 11:09:56 +02:00
GabrielInTheWorld 534f2d1835
Merge pull request #5037 from GabrielInTheWorld/alwaysTheSameTitle
Sets always the title 'Current LOS' if current LOS
2019-09-23 18:18:47 +02:00
Sean e3270d4302
Merge pull request #5047 from GabrielInTheWorld/configureJasmine
Updates karma to prevent cancelling tests because of timeout
2019-09-23 18:16:52 +02:00
GabrielMeyer 9e407006f6 Sets always the title 'Current LOS' if current LOS 2019-09-23 17:31:45 +02:00
Emanuel Schütze b9fe0c39cf
Merge pull request #5044 from FinnStutzenstein/isSubmitterForAnonymous
Fixed submitter check for anonymous users
2019-09-23 17:27:25 +02:00
Emanuel Schütze 398cdf02a1
Merge pull request #5045 from FinnStutzenstein/autoupdateForProjectiondefaults
Added autoupdate for changed projectiondefaults
2019-09-23 17:25:09 +02:00
GabrielMeyer 07481feba5 Updates karma to prevent cancelling tests because of timeout 2019-09-23 16:55:53 +02:00
FinnStutzenstein 1ed613629e Added autoupdate for changed projectiondefaults 2019-09-23 16:51:20 +02:00
GabrielInTheWorld a688bd0ffe
Merge pull request #5035 from GabrielInTheWorld/sortingReferMotions
Quick sorting the reference of motions by their identifier
2019-09-23 10:25:43 +02:00
FinnStutzenstein e8dec048ef Fixed submitter check for anonymous users 2019-09-23 10:12:15 +02:00
Sean 59089ebef0
Merge pull request #5042 from emanuelschuetze/event-date-format
Changed input type of event date config from datetime back to string.
2019-09-20 10:13:32 +02:00
GabrielInTheWorld 8e8fb4f3b9
Merge pull request #5036 from GabrielInTheWorld/paddingAgenda
Adds some more space for the 'speaker-button'
2019-09-20 08:45:04 +02:00
Emanuel Schütze 9e0817d2e8
Merge pull request #5038 from tsiegleauq/dynamic-scale-tiles
Scale motion tiles by viewport size
2019-09-19 19:43:40 +02:00
Sean Engelhardt faa1d9c658 Scale motion tiles by viewport size
Also puts the desktop, tablet and phone declarations into an
own scss file that can be used via mixin
2019-09-19 15:23:34 +02:00
GabrielMeyer 0cac6b1e8d Quick sorting the reference of motions by their identifier 2019-09-19 15:06:03 +02:00
Emanuel Schütze ee50191da6
Merge pull request #5026 from tsiegleauq/remove-duplicate-trust-implementation
Add trust pipe and remove duplicated functions
2019-09-19 14:56:12 +02:00
Emanuel Schütze 130e60f456 Changed input type of event date config from datetime back to string. 2019-09-19 14:48:06 +02:00
GabrielMeyer 4deabb0648 Adds some more space for the 'speaker-button' 2019-09-19 12:02:05 +02:00
Emanuel Schütze d8296f3e62
Merge pull request #5034 from GabrielInTheWorld/permsOfAgenda
Fixes seeing list of speakers in topic-detail
2019-09-17 19:10:59 +02:00
GabrielMeyer 9d181d9b14 Fixes seeing list of speakers in topic-detail 2019-09-17 18:46:39 +02:00
Emanuel Schütze 27bd053d90
Merge pull request #5033 from GabrielInTheWorld/fixProjector
Sets default display-type on 'projector-button'
2019-09-17 17:47:03 +02:00
Emanuel Schütze 2df154995a
Merge pull request #5029 from GabrielInTheWorld/ugglyMotionCard
Fixes uggly opening of motion-card
2019-09-17 17:13:27 +02:00
Emanuel Schütze 09aa5070b9
Merge pull request #5031 from tsiegleauq/projector-path-madness
Fixes a path issue in the projector
2019-09-17 17:11:12 +02:00
GabrielMeyer d27532fa3a Sets default display-type on 'projector-button' 2019-09-17 17:09:51 +02:00
Sean Engelhardt e4e239ea29 Fixes a path issue in the projector
Removes an unnecessary / in the mediafile-slide that prevented
files from being resolved correctly in some configurations
2019-09-17 16:17:17 +02:00
GabrielMeyer c3e112e7c2 Fixes uggly opening of motion-card
- Moves the `display: grid` to `.os-card`, since it causes the behavior.
2019-09-17 09:49:45 +02:00
Emanuel Schütze 43c7797226
Merge pull request #5025 from tsiegleauq/set-dont-set-identifier
Adjust workflow state naming
2019-09-16 17:36:47 +02:00
Sean Engelhardt 4e0f1409db Add trust pipe and remove duplicated functions
Adds a new shared pipe to set trusted HTML directly
from HTML components.
Removes all duplicates of "bypassSecurityTrustHtml"
2019-09-16 16:24:40 +02:00
Sean Engelhardt ca97d4472d Adjust workflow state naming
Changes "set identifier" to "do not set idnetifier"
requires an update of the translations
2019-09-16 14:33:42 +02:00
Sean 4a83aa736e
Merge pull request #5022 from GabrielInTheWorld/projectorCPU
Fixes high cpu usage on 'projector-detail'
2019-09-16 13:17:13 +02:00
Sean c538179904
Merge pull request #5023 from tsiegleauq/catch-broken-line-numbers
Catch and show line numbering errors
2019-09-16 12:23:17 +02:00
Sean Engelhardt 1cf332b15c Catch and show line numbering errors
Makes line number and motion detail more robust
2019-09-16 11:46:29 +02:00
GabrielMeyer fe55faa884 Fixes high cpu usage on 'projector-detail'
- Also improving showing the spinner to have a slightly better UX.
2019-09-16 09:14:58 +02:00
Emanuel Schütze ae55cce605
Merge pull request #5021 from emanuelschuetze/release3.0
Release 3.0
2019-09-13 15:13:19 +02:00
Emanuel Schütze a926e770ef Update version to 3.0.1-dev 2019-09-13 13:58:12 +02:00
Emanuel Schütze 97f2b723aa Release 3.0 2019-09-13 13:58:11 +02:00
Emanuel Schütze 03ab36096f Use openslides.com 2019-09-13 13:58:09 +02:00
Emanuel Schütze 902855a6e7
Merge pull request #4982 from tsiegleauq/better-mobile-tables
More mobile friendly lists
2019-09-13 13:57:36 +02:00
Emanuel Schütze b13d8a5bff
Merge pull request #5020 from emanuelschuetze/newlogo
Updated improved OpenSlides logo.
2019-09-13 13:48:42 +02:00
Sean Engelhardt bd83a74830 More mobile friendly lists
More mobile friendly lists using menus
2019-09-13 13:37:59 +02:00
Emanuel Schütze c00ce2a877 Updated improved OpenSlides logo. 2019-09-13 13:25:41 +02:00
Emanuel Schütze 483de8800a
Merge pull request #5019 from GabrielInTheWorld/calcPolls
Changes the calculation of majority-methods
2019-09-13 11:24:42 +02:00
Emanuel Schütze 5e3a9e0943
Merge pull request #5018 from emanuelschuetze/update-requirements
Updated requirements
2019-09-13 11:08:24 +02:00
Emanuel Schütze 8eb1e8f242
Merge pull request #5013 from emanuelschuetze/translation-20190912
Updated translations
2019-09-13 11:01:23 +02:00
GabrielMeyer 2a66a3233d Changes the calculation of majority-methods
- Only one method for calculation.
- Only in case of 'simple majority' a '1' will be added to the rounded result.
2019-09-13 10:55:52 +02:00
Emanuel Schütze e16ca335de Updated requirements
- Added websockets to production.txt
- Import channels_redis in redis.py only for big mode (if use_redis=true)
2019-09-13 10:29:19 +02:00
Emanuel Schütze 5af32999ab
Merge pull request #5017 from GabrielInTheWorld/fixElection
Fixes the elections and prepares for future changes
2019-09-13 10:25:05 +02:00
Emanuel Schütze 4876c44305 Updated translations 2019-09-13 10:22:00 +02:00
GabrielMeyer ba2bfdbf04 Fixes the elections and prepares for future changes 2019-09-13 10:04:39 +02:00
Emanuel Schütze 1da7ba51fd
Merge pull request #4993 from GabrielInTheWorld/trafficLights
Implements 'traffic lights' to the countdown-time
2019-09-13 09:11:28 +02:00
Emanuel Schütze 62a973234f
Merge pull request #5016 from GabrielInTheWorld/breakLabel
Ensures breaking the label of 'election-state'
2019-09-13 09:10:52 +02:00
GabrielMeyer d99a9c92c1 Implements 'traffic lights' to the countdown-time 2019-09-13 08:41:39 +02:00
GabrielMeyer 8996bd952f Ensures breaking the label of 'election-state' 2019-09-13 08:35:04 +02:00
Emanuel Schütze 7d307e5ffe
Merge pull request #4990 from emanuelschuetze/changelog3.0
Updated Changelog
2019-09-12 23:44:58 +02:00
Emanuel Schütze 8ef7dceb8b Prepared 3.0 release
Updated CHANGELOG, README, DEVELOPMENT, LICENSE and MANIFEST.
2019-09-12 23:29:55 +02:00
Emanuel Schütze d5cfdd24e6
Merge pull request #5014 from normanjaeckel/Development-File
Changed DEVELOPMENT.rst.
2019-09-12 22:02:43 +02:00
Norman Jäckel 8ef2cf5995 Changed DEVELOPMENT.rst. 2019-09-12 21:40:42 +02:00
Emanuel Schütze 11521c4ff2
Merge pull request #5012 from GabrielInTheWorld/paragraphDeleted
Fixes saving amendments with deleted paragraphs
2019-09-12 17:36:18 +02:00
Emanuel Schütze 1f3617f9ef
Merge pull request #5009 from GabrielInTheWorld/createAmendmentPerm
Fixes can create amendments if having permissions
2019-09-12 17:35:55 +02:00
GabrielMeyer ad10a2b0d7 Fixes can create amendments if having permissions 2019-09-12 17:07:11 +02:00
GabrielMeyer 7ad8a40764 Fixes saving amendments with deleted paragraphs 2019-09-12 17:06:49 +02:00
Emanuel Schütze 15b90579ae
Merge pull request #5011 from tsiegleauq/NoCdOnDestroy
Fix change detecting dead views
2019-09-12 16:27:08 +02:00
Emanuel Schütze db7f68ab6d
Merge pull request #5010 from FinnStutzenstein/fixWrongRoutingState
Fix wrong routing state on initial page load
2019-09-12 16:26:48 +02:00
FinnStutzenstein 875fc3aae0 Fix wrong routing state on initial page load 2019-09-12 15:42:38 +02:00
Sean Engelhardt 80db56c2eb Fix change detecting dead views 2019-09-12 15:11:00 +02:00
Emanuel Schütze 02c745ed75
Merge pull request #5005 from GabrielInTheWorld/freshSpinner
Hotfix: Fresh login does not get the real user.
2019-09-12 14:18:31 +02:00
GabrielMeyer 97d0f92430 Fixes loading of data and hiding spinner 2019-09-12 13:52:45 +02:00
Emanuel Schütze 0ef02c6e87
Merge pull request #5008 from GabrielInTheWorld/fixUserNoAnonymous
Fixes showing guest, if user is not yet loaded
2019-09-12 13:11:36 +02:00
GabrielMeyer 07d84759c3 Fixes showing guest, if user is not yet loaded 2019-09-12 12:45:08 +02:00
Emanuel Schütze 30502a95c6
Merge pull request #5004 from GabrielInTheWorld/buildForVerdi
Adds amount of waiting speakers for xlsx-export
2019-09-12 11:39:27 +02:00
Emanuel Schütze 5651862813
Merge pull request #5007 from CatoTH/styling-bugfix-motion-annotations
Fix location of change recommendation annotations
2019-09-12 11:36:44 +02:00
Sean 38cb75487b
Merge pull request #5006 from CatoTH/dont-include-amendments-in-changed-view
Don't include amendments into changed view
2019-09-12 11:07:37 +02:00
Tobias Hößl 3d23eb26d3
Fix location of change recommendation annotations 2019-09-12 10:47:57 +02:00
GabrielMeyer cc3047a284 Adds amount of waiting speakers for xlsx-export 2019-09-12 10:45:24 +02:00
Tobias Hößl 6be23c8d9d
Don't include amendments into changed view 2019-09-12 10:36:54 +02:00
Emanuel Schütze b0460931bb
Merge pull request #5003 from tsiegleauq/projector-performance
Add cyclic change detection for the projector list
2019-09-11 17:37:41 +02:00
Emanuel Schütze 27e9390d41
Merge pull request #5001 from GabrielInTheWorld/clearTransition
Removes transition of 'meta-text-block'
2019-09-11 17:07:40 +02:00
Sean Engelhardt 16f18c6b4a Add cyclic change detection for the projector list
The projector list went nuts if the projectors are too large,
since they were all triggering the CD too much
This saves a lot of processing power
2019-09-11 13:57:31 +02:00
Sean 11922c2a12
Merge pull request #4979 from GabrielInTheWorld/sortingCallList
Implements the possibility to sort trees by a given property
2019-09-11 11:29:09 +02:00
GabrielMeyer 95ebdd3808 Removes transition of 'meta-text-block' 2019-09-11 10:28:47 +02:00
Emanuel Schütze f4a383b81b
Merge pull request #4998 from emanuelschuetze/translation-20190910
Updated translations
2019-09-10 20:18:11 +02:00
Emanuel Schütze b4f1c7d0f4 Updated translations 2019-09-10 17:42:19 +02:00
Emanuel Schütze cb9152ca2e
Merge pull request #4995 from FinnStutzenstein/test
Hotfix for RuntimeError: Do not use asyncio semaphores
2019-09-10 17:31:26 +02:00
Emanuel Schütze b949761404
Merge pull request #4997 from GabrielInTheWorld/funWithState
Changes the order of states in filter
2019-09-10 17:31:13 +02:00
Emanuel Schütze 35bcfe39a5
Merge pull request #4996 from GabrielInTheWorld/preventLeavingChildsHere
Disables the animations
2019-09-10 17:31:03 +02:00
Emanuel Schütze 39b0168714
Merge pull request #4994 from tsiegleauq/amendment-list-pdf-overview
Add amendment overview list as PDF
2019-09-10 17:19:50 +02:00
GabrielMeyer 028ce16bb9 Changes the order of states in filter
- 'Done' and 'undone' are moved up to top.
2019-09-10 17:08:34 +02:00
GabrielMeyer 8dc359dffb Disables the animations
- No animations prevent leaving some html-elements on the site, until the routing-event has finished.
2019-09-10 15:15:33 +02:00
Sean Engelhardt c33fbc2198 Add amendment overview list as pdf
Adds an option to export the/a table of amendments as pdf
2019-09-10 15:08:55 +02:00
FinnStutzenstein 0319deba23 no semaphore 2019-09-10 15:00:55 +02:00
Emanuel Schütze 6c7db17641
Merge pull request #4992 from FinnStutzenstein/reworkPersonalNotes
Single create and update request for personal notes
2019-09-10 13:40:46 +02:00
Emanuel Schütze 44f16b6125
Merge pull request #4989 from tsiegleauq/amendment-list-title
Add the title too the amendments page
2019-09-10 13:26:49 +02:00
FinnStutzenstein 76ff4602a2 Single create and update request for personal notes 2019-09-10 12:34:26 +02:00
Sean Engelhardt 96f88b54d5 Add the title too the amendments page
Adds an observable view model of the parent motion to the amendment list page to show the title
2019-09-10 12:28:37 +02:00
Emanuel Schütze cdfaf1f313
Merge pull request #4991 from GabrielInTheWorld/noMotionText
Adds a variable to hide the motion-text on projector
2019-09-10 09:04:22 +02:00
GabrielMeyer c0ded6f32e Adds a variable to hide the motion-text on projector 2019-09-10 08:34:28 +02:00
GabrielMeyer 1ec5dfbb88 Implements the possibility to sort trees by a given property
- Separates the base sorting function to a lower service, called `base-sort.service`.
- Adds the `tree-sort.service`.
2019-09-09 15:44:08 +02:00
Emanuel Schütze 2c58d0f0fe
Merge pull request #4988 from emanuelschuetze/translations-20190909
Updated translations
2019-09-09 11:34:38 +02:00
Emanuel Schütze 89375ae133 Updated translations 2019-09-09 11:01:35 +02:00
Emanuel Schütze 3b64ca0954
Merge pull request #4987 from emanuelschuetze/nogoogletranslate
Disable Google translate on entire page.
2019-09-06 12:27:45 +02:00
Emanuel Schütze 84bb091e0f
Merge pull request #4985 from tsiegleauq/more-mediafile-permission
Add more permission checks to file manager
2019-09-06 12:16:37 +02:00
Emanuel Schütze 889786d82b Disable Google translate on entire page. 2019-09-06 12:06:40 +02:00
Sean Engelhardt f7da089332 Add more permission checks to file manager
Adds permission checks for "can manage logos and fonts" to file manger
Fixes a bug where the change detection ignored changes in menus
2019-09-06 10:44:43 +02:00
Emanuel Schütze 975f8dc169
Merge pull request #4971 from FinnStutzenstein/anonymousImprovements
Improves the sidebar for anonymous users and routing
2019-09-05 15:40:19 +02:00
Emanuel Schütze 4665c5be32
Merge pull request #4984 from tsiegleauq/motion-list-menu-order
Reorder motion list menu
2019-09-05 15:33:10 +02:00
Emanuel Schütze be77723b55
Merge pull request #4983 from tsiegleauq/mobile-edit-button
Adds the correct icon to the mobile action button
2019-09-05 15:12:39 +02:00
Sean Engelhardt ff2b520013 Reorder motion list menu
Changes the order of the motion list menu
2019-09-05 14:59:22 +02:00
Emanuel Schütze 081984d637
Merge pull request #4981 from emanuelschuetze/fixAmendmentUpdate
Fixed updating of amendments as normal user
2019-09-05 14:54:24 +02:00
Sean Engelhardt 466c72bee8 Adds the correct icon to the mobile action button
Fixes an error where the name of an icon was shown instead of the icons
Adds the projector to agenda detail
2019-09-05 14:48:04 +02:00
Emanuel Schütze a86b835c0b Fixed updating of amendments as normal user
for paragraph based amendments
2019-09-05 14:37:12 +02:00
Emanuel Schütze 20f1f982ae
Merge pull request #4976 from GabrielInTheWorld/improvingSuperSearch
Improves the global search to find IDs
2019-09-05 14:17:27 +02:00
Emanuel Schütze 5c83eb824a
Merge pull request #4974 from tsiegleauq/amendment-sort-by-line
Add sort service for amendments
2019-09-05 14:14:11 +02:00
Emanuel Schütze dd22d98c25
Merge pull request #4978 from GabrielInTheWorld/permissionsMotionBlock
Fixes permissions for motion-blocks
2019-09-05 14:11:06 +02:00
Sean Engelhardt 91329a8338 Add sort service for amendments
Adds the posibility to sort amendments by the parents identifier
and line number.

Patches the amendment model by their diff lines in runtime
2019-09-05 13:49:27 +02:00
FinnStutzenstein b3ba3dac95 Improves the sidebar for anonymous users and routing 2019-09-05 09:52:31 +02:00
Finn Stutzenstein 8ff03044de
Merge pull request #4980 from FinnStutzenstein/fixLostConfigEditorValues
Fixed lost cofig values from editor fields
2019-09-05 09:02:54 +02:00
FinnStutzenstein b9674baa6c Fixed lost cofig values from editor fields 2019-09-05 08:49:40 +02:00
GabrielMeyer bd9d93061d Fixes permissions for motion-blocks
- Only users with permission `motions.can_manage` can remove motions from motion-block.
2019-09-04 12:04:33 +02:00
GabrielMeyer 1d5b1b4fed Improves the global search to find IDs
- Considers the 'id' of objects for search.
2019-09-04 11:31:03 +02:00
Sean fffbf95a63
Merge pull request #4977 from GabrielInTheWorld/fixExpansionPanel
Fixes the expansion panel layout
2019-09-04 11:26:16 +02:00
GabrielMeyer 9b9f256cfd Fixes the expansion panel layout 2019-09-04 10:53:23 +02:00
Emanuel Schütze beaf629f1c
Merge pull request #4975 from emanuelschuetze/new-translations
Added new Russian language. Updated Czech translations.
2019-09-04 10:00:30 +02:00
Emanuel Schütze 82d9f280ed Added new Russian language. Updated Czech translations. 2019-09-04 09:34:55 +02:00
Emanuel Schütze 367c06bb02
Merge pull request #4949 from GabrielInTheWorld/lostDeep
Cleans up the stylesheets a little bit
2019-09-03 22:04:02 +02:00
Emanuel Schütze 43aeb79a76
Merge pull request #4969 from FinnStutzenstein/resetPasswordVerboseErrors
Added config for more verbose errors on reset password
2019-09-03 16:06:21 +02:00
FinnStutzenstein 9323bdef20 Added config for more verbose errors on reset password
- Added settings.py docs
- Fixed left-overs from #4920
- Reworked all server messages to a new argument formet, so that the
client can translate server messages
2019-09-03 14:47:45 +02:00
Emanuel Schütze a193cc1e3f
Merge pull request #4973 from GabrielInTheWorld/fixSpinner
Improves the spinner
2019-09-03 13:33:44 +02:00
GabrielMeyer d354461784 Cleans up the stylesheets a little bit
- Removes all `::ng-deep`
- Merges some re-used styles to one stylesheet
- The icon to open the global search will always be seen in the headbar
2019-09-02 17:33:42 +02:00
GabrielMeyer 32bfd4599a Improves the spinner
- The spinner shouldn't appear, if the user is logged in.
2019-09-02 17:01:01 +02:00
Emanuel Schütze 5ed8032c6b
Merge pull request #4972 from GabrielInTheWorld/agendaPDFExport
Removes the item-number from items in PDF
2019-09-02 16:11:13 +02:00
GabrielMeyer cc456fdb5a Removes the item-number from items in PDF
- ...for exporting the agenda-list.
- Fixes #4965
2019-09-02 15:57:43 +02:00
Emanuel Schütze 0eba52e10e
Merge pull request #4970 from FinnStutzenstein/noAutoupdateForForeignPersonalNotes
Skip autoupdates on foreign personal notes
2019-09-02 15:36:40 +02:00
Emanuel Schütze 9685d04248
Merge pull request #4959 from GabrielInTheWorld/projectorMaxTeller
Adds config to see a max number of next speakers
2019-09-02 15:29:42 +02:00
FinnStutzenstein 9518d1dab6 Small changes 2019-09-02 15:02:31 +02:00
GabrielMeyer 79e879cb6e Adds config to see a max number of next speakers
- Also updates the 'list of speakers' on the `overlay-slide`.
2019-09-02 14:03:34 +02:00
FinnStutzenstein 5baae14156 Skip autoupdates on foreign personal notes 2019-09-02 13:57:12 +02:00
Finn Stutzenstein ee0b82b93b
Merge pull request #4967 from FinnStutzenstein/removeDeepcopy
Remove deepcopy (closes #3893)
2019-09-02 12:11:12 +02:00
Finn Stutzenstein 8f0030560a
Merge pull request #4968 from emanuelschuetze/fix-submitter-check
Fixed motion submitter check.
2019-09-02 11:48:52 +02:00
FinnStutzenstein 03ad7b8abc Remove deepcopy (closes #3893)
It's about 23% faster now (testet deepcopy vs. json with random data)
2019-09-02 11:31:55 +02:00
Emanuel Schütze 216c279d48 Fixed motion submitter check. 2019-09-02 11:23:10 +02:00
Emanuel Schütze ecd107bf73
Merge pull request #4960 from GabrielInTheWorld/someUI
Improves some user-interfaces for motion-detail
2019-09-02 10:20:21 +02:00
Emanuel Schütze a450646008
Merge pull request #4963 from tsiegleauq/angular-8.2
Update to angular 8.2
2019-09-02 10:13:34 +02:00
Finn Stutzenstein d1c63f74fd
Merge pull request #4966 from FinnStutzenstein/fixAutoupdates
Fixed bug sending always all data to users, who get restricted data
2019-09-02 09:21:27 +02:00
FinnStutzenstein 366777ebfd Fixed bug sending always all data to users, who get restricted data
Due to changes in an iterator, a RuntimeError was thrown but interpred al a too low change id. Fixed the bug and make a custom exception for this.
2019-09-02 09:05:29 +02:00
Emanuel Schütze ff6302a59c
Merge pull request #4964 from emanuelschuetze/translations-20190830
Updated translations
2019-09-02 08:45:09 +02:00
Finn Stutzenstein 93fae8ef3b
Merge pull request #4961 from FinnStutzenstein/loggingRedis
Logging prefix and handling redis connection errors
2019-09-02 08:28:12 +02:00
FinnStutzenstein 2aa0275dca Logging prefix and handling redis connection errors 2019-09-02 08:09:28 +02:00
Finn Stutzenstein 4d135ff3b8
Merge pull request #4962 from FinnStutzenstein/lessUpdatesOnSort
Just autoupdate changed models on sorting
2019-09-02 07:42:16 +02:00
Emanuel Schütze d7105d91c9 Updated translations 2019-08-30 11:26:29 +02:00
GabrielMeyer ef8508d2d2 Improves some user-interfaces for motion-detail 2019-08-30 11:16:14 +02:00
Sean Engelhardt 62825f41b0 Update to angular 8.2
Increase the version of angular and our components
2019-08-30 10:57:28 +02:00
FinnStutzenstein c73b04c005 Just autoupdate changed models on sorting 2019-08-29 15:11:18 +02:00
Sean 53dbcca85a
Merge pull request #4950 from GabrielInTheWorld/config-datetimepicker
Adds a picker for date and time in config
2019-08-29 11:43:50 +02:00
Emanuel Schütze 9b7a863515
Merge pull request #4958 from tsiegleauq/mediafiles-navbar-spam
Add scrollable folderbar to mediafile
2019-08-28 15:35:36 +02:00
Emanuel Schütze 5b11b672a2
Merge pull request #4951 from tsiegleauq/better-amendments-list
Enhance amendment list and routing logic
2019-08-28 14:57:48 +02:00
Sean Engelhardt 3af30bf7a1 Add scrollable folderbar to mediafile
- Cleansup the horrizontal scroller code
- make the folder bar scrollable
- Cleanup the way folder permissions are shown
2019-08-28 14:53:05 +02:00
Sean Engelhardt 985aeb095b Enhance amendment list and routing logic
Enhances routing logic and amendment list
2019-08-28 14:30:41 +02:00
Emanuel Schütze 4400d805f5
Merge pull request #4956 from GabrielInTheWorld/projectorUI
Improves the layout of the projector
2019-08-28 12:18:36 +02:00
Emanuel Schütze 210cf4bf32
Merge pull request #4957 from GabrielInTheWorld/hotfixPreview
Hotfix for preview on firefox
2019-08-28 12:18:27 +02:00
GabrielMeyer 453e639d2f Improves the layout of the projector
- Adds a grid-layout to have a flexible view for different devices
2019-08-28 11:59:56 +02:00
GabrielMeyer c38142dc40 Hotfix for preview on firefox 2019-08-28 11:53:23 +02:00
Emanuel Schütze 899eedf403
Merge pull request #4955 from GabrielInTheWorld/hotfixSuperSearch
Hotfix for global search
2019-08-28 09:23:07 +02:00
GabrielMeyer cf2b933a70 Hotfix for global search 2019-08-27 16:50:06 +02:00
Emanuel Schütze 815f37fdc2
Merge pull request #4952 from emanuelschuetze/translations-20190827
Updated translations
2019-08-27 15:58:35 +02:00
Emanuel Schütze d336f0fea0 Updated translations 2019-08-27 15:29:11 +02:00
Joshua Sangmeister 90dd843d43 added a datetimepicker to the config, including localisation.
also changed from NativeDateAdapter to MomentDateAdapter.
2019-08-27 14:36:04 +02:00
Sean a9720b2211
Merge pull request #4944 from GabrielInTheWorld/fixMetaTextBlock
Checks, if content is too large and hide it in 'meta-text-block'
2019-08-27 10:35:28 +02:00
Sean a36cf7b0c5
Merge pull request #4947 from tsiegleauq/terminate-web-worker
Add termination to pdf webworker
2019-08-27 10:16:14 +02:00
Sean 249c975a46
Merge pull request #4946 from GabrielInTheWorld/fixDragHandler
Adds a handler for 'sorting-tree's
2019-08-27 10:00:20 +02:00
GabrielMeyer c49ea53ab1 Checks, if content is too large and hide it in 'meta-text-block'
- Also updates the library 'css-element-queries'.
- Builds a directive to check, if the scroll-height of an element
has changed.
2019-08-27 10:00:04 +02:00
Sean Engelhardt 64c6327720 Add termination to pdf webworker
Allows to cancel the PDF generation by clicking a cancel-button
2019-08-27 09:58:30 +02:00
GabrielMeyer 9a6efc0403 Adds a handler for 'sorting-tree's
- Also fixes drag-handling for mobile-devices.
2019-08-27 09:36:48 +02:00
Emanuel Schütze a05a81b1b2
Merge pull request #4948 from GabrielInTheWorld/replaceSpinner
Replaces the new spinner with the old one
2019-08-27 09:12:59 +02:00
Emanuel Schütze 0d93c5ecfc
Merge pull request #4943 from tsiegleauq/prevent-destructive-bulk
Prevent wrong bulk-change-state operations
2019-08-27 09:00:33 +02:00
GabrielMeyer 421feb8e72 Replaces the new spinner with the old one
- The spinner from Angular/Material in `global-spinner.component` is replaced by the old, custom one.
2019-08-26 18:07:18 +02:00
Sean 13e18c82e3 Prevent wrong bulk-change-state operations
Prevents to change the state of multiple motions, if given motions are
in different workflows
2019-08-26 17:11:40 +02:00
Sean e3a7cbf935
Merge pull request #4890 from GabrielInTheWorld/freshSearch
Implements the 'global search' and moves the 'global spinner' to 'site.component'
2019-08-26 16:53:38 +02:00
Emanuel Schütze 900ba55a06
Merge pull request #4942 from tsiegleauq/tinymce-mobile-save
Add usage hints to tinymce mobile
2019-08-26 15:28:04 +02:00
Emanuel Schütze dbce3d541a
Merge pull request #4945 from tsiegleauq/icon-overwork
Enhance amendment wizard
2019-08-26 14:40:10 +02:00
Sean Engelhardt af8b49450b Enhance amendment wizard
- close button instead of back-button
- "are you sure" prompt if chances to the wizard were made
- edit and save events, like every other view
- enhanced next, previous, create logic that follows validation

also:
- fixed a bug with custom cancel events in the head-bar
- mobile button has the correct icon again
2019-08-26 13:51:25 +02:00
GabrielMeyer 5f29732e26 Implements the global 'super-search.component'
- Moves the 'spinner.component' to 'site.component'
- Replaces also the 'spinner.service' with an 'overlay.service', that handles all request to
show an element on an overlay.
2019-08-26 11:30:20 +02:00
Emanuel Schütze b1c02133ee
Merge pull request #4941 from tsiegleauq/firefox-amendment-list
Add manual change detection in amendment list
2019-08-23 08:37:16 +02:00
Emanuel Schütze afb804b7a2
Merge pull request #4939 from tsiegleauq/filter-has-speaker
Add speakers-filter to motion list
2019-08-23 08:35:47 +02:00
Sean Engelhardt 49ea32f495 Add usage hints to tinymce mobile
shows "dont forget to save" and "touch the book to edit" messages if the tinymce
mobile editor was called from motion comments and personal notes
2019-08-22 17:47:31 +02:00
Sean Engelhardt 04c51949be Add manual change detection in amendment list
Again a firefox issue.
Cycleing change detection crashed the browser
2019-08-22 16:07:54 +02:00
Sean Engelhardt dee41593c4 Add speakers-filter to motion list
The motion list (and the amendment list) now have an option to filter if speakers are present on the corresponding LOS-object to the displayed motions
2019-08-22 15:39:18 +02:00
Emanuel Schütze 74c2d58e70
Merge pull request #4938 from tsiegleauq/projector-cd
Add change signals for the listview
2019-08-22 15:12:14 +02:00
Emanuel Schütze 216f34c51b
Merge pull request #4937 from tsiegleauq/pdf-empty-page
Fix empty PDF TOC page
2019-08-22 15:09:54 +02:00
Emanuel Schütze 1900ecb1ea
Merge pull request #4928 from GabrielInTheWorld/fixIE
Adds compiling to ES5 for IE11
2019-08-22 15:00:15 +02:00
Emanuel Schütze a597764917
Merge pull request #4940 from emanuelschuetze/serviceWorkerURL
Exclude urls /rest and /apps from service worker caching.
2019-08-22 14:59:16 +02:00
Emanuel Schütze 4c2f7828bc Exclude urls /rest and /apps from service worker caching. 2019-08-22 14:23:12 +02:00
Sean Engelhardt 0f606b5a7e Add change signals for the listview
The projector-button now emits a signal if changed
List-of-speaker-button is now able to detect it's own updates
2019-08-22 14:01:17 +02:00
Sean Engelhardt 0939df17c9 Fix empty PDF TOC page
Fixed a bug that occured, when the pdf TOC had no motions without a category.
In this case, an empty page, that was reserved for motions without category
was printed
2019-08-22 10:47:37 +02:00
GabrielMeyer c42a9b4a13 Adds compiling to ES5 for IE11 2019-08-21 17:34:05 +02:00
Emanuel Schütze b80ac3ac68
Merge pull request #4936 from emanuelschuetze/translation-20190821
Updated translations
2019-08-21 15:26:01 +02:00
Emanuel Schütze 8f8c359874
Merge pull request #4935 from tsiegleauq/storage-key
Readd filter store keys
2019-08-21 15:23:29 +02:00
Emanuel Schütze c0aaa2d53c Updated translations 2019-08-21 15:11:57 +02:00
Sean Engelhardt 5a7b32e3cd Readd filter store keys
Adds custom storage keys to the filter list again
prevents a problem that appears on minified code
2019-08-21 14:53:07 +02:00
Emanuel Schütze ae110b9db1
Merge pull request #4934 from tsiegleauq/firefox-exporter-comment-bug
Fix firefox comment export
2019-08-21 14:43:30 +02:00
Emanuel Schütze 7447052a1d
Merge pull request #4932 from emanuelschuetze/motionSlideRework
New config to hide referring motions in slide and detail view
2019-08-21 14:41:11 +02:00
Sean Engelhardt 323a0604a1 Fix firefox comment export
Fixes an issue where motion comments where breaking the
motion export dialog in firefox
2019-08-21 14:15:49 +02:00
Emanuel Schütze ffa16b2190
Merge pull request #4929 from tsiegleauq/earlier-pdf-progress-spinner
Earlier PDF progress bar
2019-08-21 14:04:23 +02:00
Emanuel Schütze 862d8cdee9 New config to hide referring motions in slide and detail view
Rework motion slide:
- move referring motions to h2 subtitle
- move identifier to h1 main title
- reduce subtitle line
2019-08-21 14:00:17 +02:00
Emanuel Schütze d3c56efdc5
Merge pull request #4920 from emanuelschuetze/configDefaults
Rework config defaults.
2019-08-21 13:48:55 +02:00
Sean Engelhardt 1d566feab6 Earlier PDF progress bar
Shows an indeterminate spinner before the actual PDF creation
2019-08-21 13:35:17 +02:00
Emanuel Schütze f981106524 Rework config defaults.
- move motion setttings from settings.py to config that user can change
  it while runtime
- show help text for config fields as tooltip
2019-08-21 13:19:44 +02:00
Emanuel Schütze af0c00c89a
Merge pull request #4931 from GabrielInTheWorld/offlineForTheWin
Replaces the snackbar for offline-mode with a banner.
2019-08-21 13:15:09 +02:00
Sean 180aad853b
Merge pull request #4933 from GabrielInTheWorld/fixAttachments
Fixes directories as attachments
2019-08-21 11:34:09 +02:00
GabrielMeyer 4dd79296e8 Fixes directories as attachments
- Directories are not available anymore.
2019-08-21 10:57:22 +02:00
GabrielMeyer c5f90b0972 Replaces the snackbar for offline-mode with a banner. 2019-08-20 16:56:53 +02:00
Sean df429a7d8a
Merge pull request #4930 from GabrielInTheWorld/showNumberOrLetIt
Sets the default value for sequential numbers in export dialog
2019-08-20 14:48:33 +02:00
Sean 1d1ddbd6e4
Merge pull request #4927 from tsiegleauq/better-motion-detail-ui
Overwork motion detail UI
2019-08-20 13:52:44 +02:00
Sean Engelhardt d739b982bb Overwork motion detail UI
set Default action to "create amendment" (if permitted)
put edit in the menu
put next and prev motion in the menu (mobile)
resort motion menu
move "show enitre motion text" under the motion-preview
change "show entire motion text" from button to checkbox
create a custom tooltip for the main action in os-head-bar
create a custom "cancel edit" function in os-head-bar
overwork location.back logic
2019-08-20 12:42:50 +02:00
GabrielMeyer 3b9491224f Sets the default value for sequential numbers in export dialog 2019-08-20 12:37:42 +02:00
Emanuel Schütze 14d7269959
Merge pull request #4926 from tsiegleauq/hide-amendments-from-motion-list
Add option to hide amendments
2019-08-20 12:00:25 +02:00
Sean Engelhardt e7357a5b64 Add option to hide amendments
Enables to hide amendments from the motion list
Allows to search through amendment paragraphs in the list view of amendments
2019-08-19 16:25:35 +02:00
Sean bbe294a1ad
Merge pull request #4925 from FinnStutzenstein/errorhandling
Added missing error handling
2019-08-19 14:31:50 +02:00
Finn Stutzenstein 7e2c84c2eb
Merge pull request #4921 from FinnStutzenstein/ensureChangeId
Ensures change id across multiple workers
2019-08-19 13:14:07 +02:00
FinnStutzenstein 78d2766a2c Added missing error handling 2019-08-19 12:12:22 +02:00
FinnStutzenstein d4dc13706f Ensures change id across multiple workers 2019-08-19 09:42:51 +02:00
Sean eaf4d8180d
Merge pull request #4924 from tsiegleauq/amendment-lists
Add amendment list
2019-08-16 09:41:37 +02:00
Sean Engelhardt 13e1c01bb6 Add amendment list
Adds a new ListView to show all amendments.
The list view can be acessed from both the motion list and the motion detail list
2019-08-16 09:27:41 +02:00
Emanuel Schütze bfccf4cd2b
Merge pull request #4923 from tsiegleauq/motion-block-detail-layout
Unify motion block detail
2019-08-15 14:57:45 +02:00
Sean Engelhardt 1fc0ec02a9 Unify motion block detail
Changes motion block list to look and feel like all the other lists
2019-08-15 14:40:10 +02:00
Finn Stutzenstein c641a5ba3e
Merge pull request #4917 from FinnStutzenstein/relationFix
Fixed two little issues with relations and reverse mapping
2019-08-15 13:29:02 +02:00
FinnStutzenstein 1d718dcb74 Fixed two little issues with relations and reverse mapping
- Reverse setup for normal autoupdates (no initial loading)
- reverse "set null" to be reflected to the mapping

Also fixed a bug with redis
2019-08-15 12:51:59 +02:00
Sean 7fa94ab942
Merge pull request #4919 from emanuelschuetze/fixes
Enhance meta-text-block layout and wording
2019-08-15 12:50:10 +02:00
Finn Stutzenstein a1b7b1c69d
Merge pull request #4922 from tsiegleauq/update-ngrid-to-alpha-27
Update NGrid and fix build errors
2019-08-15 12:18:33 +02:00
Sean Engelhardt 1ecd5d663b Update NGrid and fix build errors
Set NGrid fix to alpha 26, since travis has issues with 27
Uses high memory to build, since a JavaScript heap out of memory exception will now be thrown
2019-08-15 12:01:09 +02:00
Emanuel Schütze 8e38fbbccf Fixes
- fix filter and wording for new personal notes tile
- break long words in comment and personal note boxes
- remove h4 headings for comment and personal note boxes
2019-08-14 20:24:35 +02:00
Finn Stutzenstein ba5782a655
Merge pull request #4912 from FinnStutzenstein/ResetCacheException
Added missing ResetCache-handling
2019-08-14 12:00:05 +02:00
Sean 1c7b910a4a
Merge pull request #4909 from GabrielInTheWorld/layoutMotionBlock
Improves the layout of motion-block-list
2019-08-14 11:51:47 +02:00
GabrielMeyer 5106b9dc71 Improves the layout of motion-block-list
- Full size
- Adds the `sort-filter-bar.component`.
- `sort-filter-bar.component` displays the current and total count of filtered items by default, now.
2019-08-14 11:36:30 +02:00
Emanuel Schütze 4988b758ba
Merge pull request #4916 from GabrielInTheWorld/fixUserIcons
Changes the icon of 'is gremium' and 'is active'
2019-08-13 16:32:22 +02:00
GabrielMeyer dfa4cffe8c Changes the icon of 'is gremium' and 'is active' 2019-08-13 16:16:32 +02:00
Sean bcf495e49f
Merge pull request #4889 from jsangmeister/categories-vscroll
Implemented Virtual Scrolling for Categories
2019-08-13 16:05:23 +02:00
jsangmeister d65751c5da Add virtual scrolling for categories
StorageService is now required in BaseListView.
Adds a dialog to create categories
2019-08-13 15:43:54 +02:00
Emanuel Schütze 8555516a53
Merge pull request #4913 from tsiegleauq/smarter-motion-tiles
Add Smarter motion tiles and filters
2019-08-13 15:03:07 +02:00
Emanuel Schütze 385e5bc7ab
Merge pull request #4910 from emanuelschuetze/translation-typo
Fixed German translation typo.
2019-08-13 14:02:27 +02:00
Sean Engelhardt a39d9b5843 Add Smarter motion tiles and filters
Removes motion tiles for subcategories
Sort motion-special tiles always behind category tiles
Add new logic to build tiles
Filter subcateories with their parent
2019-08-13 13:54:29 +02:00
Sean 7f600d4369
Merge pull request #4908 from GabrielInTheWorld/topicSearch
Adds the option to filter a list by function-values
2019-08-13 12:03:51 +02:00
Sean 3ccf5e9bea
Merge pull request #4901 from FinnStutzenstein/reverse
Reverse relations
2019-08-13 10:01:41 +02:00
FinnStutzenstein daabbaff28 Added missing ResetCache-handling 2019-08-12 15:01:57 +02:00
GabrielMeyer 6e059cf82e Adds the option to filter a list by function-values
- In `agenda-list.component` the user can search through the name of the topic.
2019-08-12 14:43:01 +02:00
FinnStutzenstein 0e4090c901 Reverse relations 2019-08-12 14:12:55 +02:00
Emanuel Schütze ce3d320201 Fixed German translation typo. 2019-08-12 14:05:00 +02:00
Finn Stutzenstein ed99fc8c91
Merge pull request #4898 from FinnStutzenstein/cascadeCategories
Cascade categories on delete
2019-08-12 07:49:13 +02:00
Sean c593d852ef
Merge pull request #4903 from tsiegleauq/multiselect-media-files
Multiselect in mediafiles
2019-08-09 10:32:27 +02:00
Sean Engelhardt a97ca18c36 Multiselect in mediafiles
Allows multiselect on mediafiles using the new folder structure
Add bulk delete on server
Add movement logic and path view
2019-08-09 10:08:45 +02:00
Emanuel Schütze b206a5b5d4
Merge pull request #4877 from tsiegleauq/translations-2019-07
Updated translations
2019-08-08 16:49:55 +02:00
Emanuel Schütze 90eb8e04f0
Merge pull request #4907 from tsiegleauq/subcategory-for-delegates
Show subcategory in detail for every permission
2019-08-08 16:39:59 +02:00
Sean Engelhardt 490672472a Updated translations 2019-08-08 16:34:59 +02:00
Sean Engelhardt 291a3b35e8 Show subcategory in detail for every permission
Shows subcat. withoug manage rights
Hide empty recommendation field if the user cannot manage it
2019-08-08 16:22:33 +02:00
Finn Stutzenstein 91238e83bb
Merge pull request #4896 from FinnStutzenstein/cache
Major cache rewrite
2019-08-08 13:21:49 +02:00
Finn Stutzenstein 3797e71a8d
Merge pull request #4906 from FinnStutzenstein/fixExampleDataGenerator
Fixed the example data generator
2019-08-08 13:16:58 +02:00
FinnStutzenstein a8946cfe99 Fixed the example data generator 2019-08-08 12:47:47 +02:00
Finn Stutzenstein 6f715e407a
Merge pull request #4905 from FinnStutzenstein/changedEmail
changed email
2019-08-08 09:42:23 +02:00
FinnStutzenstein 5aef823807 Major cache rewrite:
- Removed the restricted data cache (it wasn't used since OS 3.0)
- unify functions for restricted and full data: Just one function, which
  accteps an optional user_id: If it is None, full data is returned, and
  with a user id given, the restricted data
- More atomic access to redis, especially for:
- Check for data-existance in redis and do an auto-ensure-cache.
- Speedup through hashing of scripts and redis' script cache.
- Save schema version into the redis cache and rebuild, if the version
  changed

Client changes:
- Simplified the ConstantsService
- Fixed bug, when receiving an autoupdate with all_data=True from the
  Server
2019-08-08 08:35:02 +02:00
FinnStutzenstein 4a19dd8d77 changed email 2019-08-08 08:07:29 +02:00
Sean f25a8aefb2
Merge pull request #4888 from jsangmeister/dialogs-everywhere
Replaced multiple inline forms with dialogs
2019-08-06 15:53:35 +02:00
Finn Stutzenstein a804f26162
Merge pull request #4755 from FinnStutzenstein/clientErrorHandling
Client error handling
2019-08-06 15:22:16 +02:00
Sean 24422a1709
Merge pull request #4900 from tsiegleauq/new-issue-templates
Update issue templates
2019-08-06 12:40:31 +02:00
Joshua Sangmeister ad432dddc0 w 2019-08-06 11:57:23 +02:00
Sean Engelhardt 314f3ae27e Update issue templates
New templates for issues
2019-08-06 11:22:13 +02:00
Joshua Sangmeister ce50ce2eb9 w 2019-08-06 10:56:37 +02:00
Joshua Sangmeister b7c9b3f2ae w 2019-08-06 09:56:38 +02:00
Joshua Sangmeister 30c93f3990 w 2019-08-06 09:26:11 +02:00
jsangmeister 1bd93f0e98 added dialogs for creating and editing tags, statute paragraphs, motion comments and motion blocks 2019-08-06 08:03:59 +02:00
FinnStutzenstein d182c2c36f Cascade categories on delete 2019-08-05 13:12:10 +02:00
Finn Stutzenstein 32bec58333
Merge pull request #4897 from FinnStutzenstein/fixLOSUsers
Fix user loading in ViewSpeaker
2019-08-05 12:37:23 +02:00
FinnStutzenstein bdb206624b Fix user loading in ViewSpeaker 2019-08-05 12:08:43 +02:00
Sean 6bd8da29db
Merge pull request #4895 from tsiegleauq/fix-compodoc
Adjust compodoc to the new location of tsconfig
2019-08-05 10:23:08 +02:00
Sean Engelhardt 357b55ae43 Adjust compodoc to the new location of tsconfig 2019-08-02 12:23:17 +02:00
Sean 1f57bcfa91
Merge pull request #4894 from tsiegleauq/deeply-unsatisfactory-meme-resolved
Change the size of search-filter-bar
2019-08-02 10:43:24 +02:00
Sean Engelhardt 9adf3f7647 Change the size of search-filter-bar
Looks less random and more homogeneous now
2019-08-02 10:02:30 +02:00
Sean 420a355ec5
Merge pull request #4893 from tsiegleauq/close-list-of-speakers
Visualize closed lists of speakers
2019-08-02 10:00:16 +02:00
Sean Engelhardt 0ce5ab1eec Visualize closed lists of speakers
Hints if a list of speakers is closed or not
2019-08-01 15:49:59 +02:00
Sean bc99750869
Merge pull request #4891 from FinnStutzenstein/fixProjectorScroll
Correct projector scroll reset
2019-08-01 14:03:45 +02:00
Sean 70b0e7c478
Merge pull request #4883 from tsiegleauq/pdf-progress-callback
Add pdf webworker and progress bar
2019-08-01 13:39:49 +02:00
Sean Engelhardt 6123216afc Add pdf webworker and progress bar
Generate PDF in the background using webworker
Shows a progress bar to estimate the PDF generation progress
2019-08-01 13:23:56 +02:00
Finn Stutzenstein 2f7937a27d
Merge pull request #4892 from FinnStutzenstein/includeConfigsInHistory
Include current configs in old history snapshots
2019-08-01 12:58:58 +02:00
FinnStutzenstein 4d4b9ac997 Include current configs in old history snapshots 2019-08-01 12:45:09 +02:00
Finn Stutzenstein 0383f824d7
Merge pull request #4874 from FinnStutzenstein/history
Improve history
2019-08-01 11:19:57 +02:00
FinnStutzenstein 35e88b8386 Correct projector scroll reset
Fixes the "everytime reset" with #4887
2019-08-01 08:03:34 +02:00
Sean 62c55094bb
Merge pull request #4887 from GabrielInTheWorld/saveTheProjector
Updates the projector
2019-07-31 15:26:46 +02:00
Sean 36833c6206
Merge pull request #4886 from GabrielInTheWorld/saveTheMemberWithStars
Adds icons to display status 'inactive', 'is present' and 'is committee'
2019-07-31 15:08:14 +02:00
Sean 2be3fa1f08
Merge pull request #4885 from GabrielInTheWorld/saveTheMember
Exports the settings for the dialogs to a separate file.
2019-07-31 13:21:05 +02:00
GabrielMeyer bd03300ee0 Exports the settings for the dialogs to a separate file.
- Includes a constant for small, medium and large dialogs.
2019-07-30 15:59:15 +02:00
GabrielMeyer 6fdd2de3c0 Updates the projector
- The height is resetting by changing the slide.
- The user does not see a 'moving'-cursor by hovering over the projector-icon in the queue.
2019-07-30 14:24:50 +02:00
GabrielMeyer e487b8fec8 Adds icons to display status 'inactive', 'is present' and 'is committee'
- In `user-list.component` and in `user-detail.component`
- Also removes the method `getUserTooltip()` from `base-list-view.ts`
2019-07-30 13:44:15 +02:00
Finn Stutzenstein 1ed9aab380
Merge pull request #4872 from FinnStutzenstein/postgresIdSequence
Restarting the id sequence for postgresql
2019-07-30 13:27:43 +02:00
Finn Stutzenstein 29e06bf7ea
Merge pull request #4884 from FinnStutzenstein/superadminDirective
Added IsSuperAdmin directive
2019-07-30 13:27:05 +02:00
Sean 56db9b0723
Merge pull request #4882 from GabrielInTheWorld/savingSearchInBar
Saves the value of the local search in 'list-view-table'
2019-07-30 11:27:54 +02:00
GabrielMeyer 2a1a44ee5a Saves the value of the local search in 'list-view-table'
- Builds a new component 'rounded-input' to have a input-field with rounded borders.
- Saves the input on every change in the local storage.
- In the `OnInit`-function this value is restored.
2019-07-30 10:57:55 +02:00
FinnStutzenstein 408ef6d3f2 Restarting the id sequence for postgresql 2019-07-30 10:42:11 +02:00
FinnStutzenstein a0501ccf74 Improve history 2019-07-30 10:40:36 +02:00
FinnStutzenstein f876d1c1fa Added IsSuperAdmin directive 2019-07-30 10:12:21 +02:00
Finn Stutzenstein 60098af22d
Merge pull request #4880 from FinnStutzenstein/tslint
New linting rules and ordering of imports
2019-07-30 10:07:05 +02:00
FinnStutzenstein 51a3fbdf3e New linting rules and ordering of imports 2019-07-30 09:53:14 +02:00
Finn Stutzenstein 1b26c03ef9
Merge pull request #4866 from FinnStutzenstein/RepoUpdate
Generic relations for the repos
2019-07-30 09:25:50 +02:00
FinnStutzenstein dd66244d84 Generic relations for the repos 2019-07-30 09:07:51 +02:00
Sean 13e8bbb168
Merge pull request #4873 from GabrielInTheWorld/uiFixes
Fixes some UI issues
2019-07-26 12:04:56 +02:00
Sean 4cf61ba6ce
Merge pull request #4879 from tsiegleauq/mediafile-manual-change-detection
Add better change detection to MediaFiles
2019-07-26 11:53:25 +02:00
GabrielMeyer b5b3e60e81 Fixes some UI issues corresponding to the theme
- Fixes white page at 'legalnotice' and 'privacypolicy'
- Fixes the button to collapse the sidenav
- Fixes a too long text in the headbar
- Reworked the login data service:
    * make order of operations clear
    * prevent setting invalid data into the storage
2019-07-26 11:47:04 +02:00
Sean Engelhardt db30831d3e Add better change detection to MediaFiles
There was a chance that the file browser did not update after creating or renaming a folder.
2019-07-26 10:41:46 +02:00
Sean ec853e5aba
Merge pull request #4868 from FinnStutzenstein/userBulkViews
Group add/remove bulk view
2019-07-25 11:27:28 +02:00
Sean 85fa114fa0
Merge pull request #4860 from GabrielInTheWorld/fixSorting
Implements a custom sorting for categories
2019-07-25 10:28:57 +02:00
Sean ff7978b8ae
Merge pull request #4843 from GabrielInTheWorld/uiImprovements
Fixes dynamic growing cells in workflows
2019-07-25 10:26:20 +02:00
Sean 1d89bc6b30
Merge pull request #4875 from tsiegleauq/table-no-data
Add various UI refinement
2019-07-25 09:52:31 +02:00
Sean d330a4ca97
Merge pull request #4876 from tsiegleauq/refactor-PDF-TOC
Fix PDF TOC header
2019-07-25 09:42:42 +02:00
Sean Engelhardt 31ab7d387c Fix PDF TOC header
Fixes an error where the PDF TOC header could not be repeated.
PDFmake seems to ignore soft references to objects. It will print them exactly once and then ignore them.

Also Adds the name of a parent category in a TOC-Table
2019-07-24 16:56:22 +02:00
Sean Engelhardt 0c9732ec7d Add various UI refinement
- "no data" in VScroll tables
- "no data" in File manager
- VScroll to angular theme (dark mode, etc)
- Prettier history table
2019-07-23 15:59:24 +02:00
Finn Stutzenstein 20cbe37d74
Merge pull request #4869 from FinnStutzenstein/emailConnectionRefusedError
Added error message for connection refused errors sending emails
2019-07-23 15:40:34 +02:00
GabrielMeyer ac9bcf8539 Implements a custom sorting for categories
- If the motion-list is sorted by categories, the category is internal sorted by the `category_weight` of the motion
- Adds a slot to pass a custom sorting function to the `sort-filter-bar.component`
2019-07-23 15:27:21 +02:00
GabrielMeyer bb55110245 Fixes dynamic growing cells in workflows
- The cells in the table of a workflow are dynamically growing
- The colors of the states get new labels
- If multiple selection in motion-list is active, the button to change the view won't be seen
2019-07-23 15:01:35 +02:00
Sean 93e37720dc
Merge pull request #4871 from FinnStutzenstein/cleanupPermissions
Cleanup unused permissions
2019-07-23 14:37:07 +02:00
FinnStutzenstein a60719bcc4 Added error message for connection refused errors sending emails 2019-07-23 14:12:05 +02:00
Sean 54c5410bb8
Merge pull request #4870 from tsiegleauq/firefox-mediafiles
Hotfix mediafiles for firefox
2019-07-23 13:57:41 +02:00
Sean Engelhardt 2d908c9ee6 Hotfix mediafiles fore firefox
firefox requires special treatment. Again.
2019-07-23 13:08:29 +02:00
FinnStutzenstein c2a73c5146 Cleanup unused permissions 2019-07-23 12:52:28 +02:00
FinnStutzenstein bbb8a84f5c Group add/remove bulk view 2019-07-23 12:06:26 +02:00
Sean e28f0f6685
Merge pull request #4867 from tsiegleauq/file-manager-permissions
Add permissions to media files
2019-07-23 11:19:48 +02:00
Sean Engelhardt 2071cbe4c4 Add permissions to media files
Adds a set of permissions to the new file manager
2019-07-23 10:42:06 +02:00
Finn Stutzenstein 20dc306106
Merge pull request #4861 from FinnStutzenstein/userBulkViews
Bulk views for users: state, password and delete
2019-07-23 10:25:15 +02:00
FinnStutzenstein 1e177917d0 Bulk views for users: state, password and delete 2019-07-23 08:41:39 +02:00
Finn Stutzenstein 61002a6bad
Merge pull request #4865 from FinnStutzenstein/MotionCommentSectionSorting
sorting of motion comment sections
2019-07-22 16:03:13 +02:00
Sean Engelhardt ce57f88adb Add motion comment section sort view 2019-07-22 15:46:26 +02:00
Sean 5c660a373f
Merge pull request #4863 from tsiegleauq/ngrid-real-search-filter
Implement NGrids filter function
2019-07-22 12:19:04 +02:00
Sean d5746f95cb
Merge pull request #4864 from FinnStutzenstein/LogoFontMigration
Added logo and font migrations
2019-07-22 11:44:45 +02:00
Sean e3f3108f8c
Merge pull request #4841 from GabrielInTheWorld/globalSearch
Refactores the 'global search'
2019-07-19 15:24:54 +02:00
Sean bccdb43d58
Merge pull request #4837 from FinnStutzenstein/projectorImprovements
Projector improvements
2019-07-19 15:00:23 +02:00
FinnStutzenstein 74647dc75d sorting of motion comment sections 2019-07-19 14:37:59 +02:00
Sean Engelhardt 2372408e4c Implement NGrids filter function
- Implements NGrids new "filteredData" function, to restore old filter behavior.
Export a quick-filtered list is now possible.

- More controll about List-View-Table UI

- Use NGrid target-events for better mutli-select behavior

- Changes the behavior of hidden headers to ignore paddings-changes

- filters are more resistant to errors and storage loss
2019-07-19 14:35:24 +02:00
FinnStutzenstein e9ef293cf7 Added logo and font migrations 2019-07-19 13:45:39 +02:00
FinnStutzenstein 23c704b5da Projector improvements
- Moved projector configs to group "General"
- Removed unused projector config related to CLOS
- debounce projector data requests for many projectors
- add (foreground) color
- custom, modifiable CSS classes per projector to cascade dynamic styles into slides
2019-07-19 12:43:45 +02:00
Finn Stutzenstein 8cb9892426
Merge pull request #4862 from FinnStutzenstein/splitClientBuilds
Split client production builds in travis (closes #4849)
2019-07-19 12:42:49 +02:00
Sean ee559500fb
Merge pull request #4792 from GabrielInTheWorld/formValidationForTheWin
Form validation
2019-07-19 12:32:31 +02:00
FinnStutzenstein 2f5688a653 Split client production builds in travis (closes #4849) 2019-07-17 16:16:38 +02:00
GabrielMeyer 5e922f66d2 Refactores the 'global search' 2019-07-17 15:11:36 +02:00
GabrielMeyer 4e0e641002 Form validations
The system validates the input of the users.
In most cases, if a form is invalid, the user has no chance to save his changes.
2019-07-17 15:09:38 +02:00
Sean 450819c035
Merge pull request #4858 from FinnStutzenstein/littleFixes
Little fixes
2019-07-17 13:54:54 +02:00
Sean ee9909308f
Merge pull request #4856 from GabrielInTheWorld/util-fixes
Fixes some autocompleted inputs
2019-07-17 13:38:48 +02:00
FinnStutzenstein 88162dd1e9 Little fixes
- Fixed bug for deleted candidates
- Prevent deleting group 1 and 2
- Creation of topics
2019-07-17 13:16:36 +02:00
GabrielMeyer f23b901622 Fixes some autocompleted inputs 2019-07-17 08:32:46 +02:00
Sean 51130da791
Merge pull request #4844 from MaximilianKrambach/sortList
fixing multiselect sort in sorting lists
2019-07-16 11:38:03 +02:00
Sean bb7b702e05
Merge pull request #4846 from tsiegleauq/subcat-filter-and-ui
Enhance subcategories
2019-07-16 11:29:33 +02:00
Sean 4de1c526e9
Merge pull request #4842 from GabrielInTheWorld/headbar
Removes the second row for the headbar
2019-07-16 11:26:46 +02:00
Sean b9cf1ef93a
Merge pull request #4850 from GabrielInTheWorld/csvCommentsExportTwo
Exporting comments in CSV
2019-07-16 11:06:21 +02:00
GabrielMeyer 457fc570a0 Removes the second row for the headbar
- Instead of the second row there is a toggle-button at the bottom of the side-nav
2019-07-16 10:52:21 +02:00
Sean Engelhardt 530dcf490a Enhance subcategories
- show parents over children in motion list, motion detail and PDF
- indent children of categories in the filter list
2019-07-16 10:48:48 +02:00
GabrielMeyer 8337f8928c Exporting comments in CSV 2019-07-16 10:39:53 +02:00
Sean bb33496f71
Merge pull request #4855 from tsiegleauq/firefox-file-manager
Add file manager patches for firefox
2019-07-16 10:16:20 +02:00
Sean Engelhardt d036fe6046 Add file manager patches for firefox
Lowers the change detection attempts to fix the file manager
for firefox
2019-07-15 17:49:30 +02:00
Emanuel Schütze 1c3d60fe39
Merge pull request #4853 from emanuelschuetze/comments-fix
Fixed XLSX export for empty comments.
2019-07-14 21:15:03 +02:00
Emanuel Schütze a365cb9edb
Merge pull request #4854 from CatoTH/OS3-bugfix-missing-text-in-pdf-diff-view
Bugfix: missing text in PDF-exported diff view
2019-07-14 20:59:50 +02:00
Emanuel Schütze 1347c1fb64 Fixed XLSX export for empty comments. 2019-07-14 20:54:38 +02:00
Tobias Hößl e5a27205d3
Bugfix: missing text in PDF-exported diff view 2019-07-14 08:43:19 +02:00
Emanuel Schütze 2bdba5ac8e
Merge pull request #4852 from emanuelschuetze/translations-20190713
Updated translations
2019-07-13 22:55:26 +02:00
Emanuel Schütze 6e8e962d5c
Merge pull request #4848 from FinnStutzenstein/fixMediafiles
Fix mediafiles for non superadmins
2019-07-13 22:54:40 +02:00
FinnStutzenstein b4e9b28397 Fix mediafiles for non superadmins 2019-07-13 19:37:49 +02:00
Emanuel Schütze cf3879957b Updated translations 2019-07-13 14:55:55 +02:00
Emanuel Schütze 19f47e1bef
Merge pull request #4847 from GabrielInTheWorld/csvCommentsExport
Exporting comments for XLSX
2019-07-13 13:28:12 +02:00
Emanuel Schütze d1ffea4fd7
Merge pull request #4845 from emanuelschuetze/pdf-toc
Motion PDF improvements
2019-07-13 13:08:53 +02:00
GabrielMeyer 07fb4e2167 Exporting comments for XLSX 2019-07-12 16:50:59 +02:00
Emanuel Schütze 4e6eddef98 Motion PDF improvements
- show motion export dialog for all users
- print recommendation in table of content lines in italic
- only print categories of filtered motions in table of content
- add page break after each (sub)category
- reduce font size for footer date
2019-07-12 14:30:24 +02:00
Emanuel Schütze 3fd519e0d4
Merge pull request #4821 from FinnStutzenstein/directories
Directories and access permissions for mediafiles
2019-07-12 13:34:46 +02:00
Emanuel Schütze 437d10f693
Merge pull request #4838 from FinnStutzenstein/configMigrationVersion
Recover-strategy to detect an updated server without a reload
2019-07-12 13:30:14 +02:00
Emanuel Schütze b67ccf0c29
Merge pull request #4836 from FinnStutzenstein/agendaPermissions
Requires agenda.can_manage for settings agenda item information
2019-07-12 13:17:19 +02:00
Sean Engelhardt e2adc8911f Add NGrid UI for MediaFiles 2019-07-12 13:09:07 +02:00
FinnStutzenstein 56c1da352e Directories and access permissions for mediafiles 2019-07-12 13:08:07 +02:00
Maximilian Krambach e199926451 fixing multiselect sort in sorting lists 2019-07-12 12:51:54 +02:00
FinnStutzenstein 77dee0d977 Recover-strategy to detect an updated server without a reload 2019-07-11 19:23:25 +02:00
FinnStutzenstein 0d5e795f50 Requires agenda.can_manage for settings ageda item information on content object creation 2019-07-11 19:10:55 +02:00
Sean af538436e3
Merge pull request #4832 from emanuelschuetze/supporters-in-pdf
Show supporters in motion pdf
2019-07-11 11:45:02 +02:00
Emanuel Schütze 3fe18bad7b
Merge pull request #4839 from tsiegleauq/motion-detail-jumping-prevention
Prevent motion-detail jumps
2019-07-10 23:10:11 +02:00
Emanuel Schütze 2f795593f3
Merge pull request #4840 from tsiegleauq/xlsx-does-not-build
Downgrade exceljs to 1.10.0
2019-07-10 22:56:32 +02:00
Emanuel Schütze 9a08ba59b0 Show supporters in motion pdf 2019-07-10 21:58:43 +02:00
Sean Engelhardt f2e9c558e1 Downgrade exceljs to 1.10.0
Upstream bugs exceljs prevent the writebuffer from working
2019-07-10 20:44:29 +02:00
Sean Engelhardt e5621ad1ab Prevent motion-detail jumps
- Fixes an error where the extension label could open automatically due to state changes by others.
- Changes the quick-navigation div to a host-listener
- Changes the quick-navigation keys to meta+alt+arrow to shift+alt+arrow, since Firefox does not recognize meta
- Removed the ID from all os-sort-lists and moves it into the extra controls of category-motion-sort-list
2019-07-10 19:25:06 +02:00
Emanuel Schütze 6e8aa75162
Merge pull request #4833 from tsiegleauq/add-extension-to-label
Enhance motion extension field
2019-07-10 11:03:57 +02:00
Emanuel Schütze 49049562eb
Merge pull request #4834 from FinnStutzenstein/sortGlobalSearchResults
Sort global search results
2019-07-10 09:09:59 +02:00
Emanuel Schütze 6295240cfc
Merge pull request #4835 from tsiegleauq/even-smarter-back-button
Prevent double mobile back buttons
2019-07-10 09:08:04 +02:00
Sean Engelhardt 719f1f8031 Enhance motion extension field
Enhances the motion extension field to make it even more easily
accessible.

Also allows to quickly jump between motions using:
Meta + Alt(left) + ArrowKeyLeft/Right
2019-07-10 09:07:35 +02:00
FinnStutzenstein fa22d651dd Sort global search results 2019-07-10 07:51:23 +02:00
Sean Engelhardt 78f6e06dd8 Prevent double mobile back buttons
Fixes an error where a close and a back button
could be shown in mobile mode
2019-07-09 23:22:58 +02:00
Emanuel Schütze 3f6fe28f35
Merge pull request #4831 from emanuelschuetze/translationfix
Translation typo
2019-07-08 21:40:57 +02:00
Emanuel Schütze 3d6b355468
Merge pull request #4830 from emanuelschuetze/without-aot
Run production build (ng build --prod) without --aot
2019-07-08 20:27:08 +02:00
Emanuel Schütze 58033422c1 Translation typo 2019-07-08 20:16:30 +02:00
Emanuel Schütze a8ae878cd2 Run production build (ng build --prod) without --aot
aot is already set in angular.json.
2019-07-08 19:57:06 +02:00
Emanuel Schütze 2f2e415b78
Merge pull request #4829 from tsiegleauq/id-in-sort
Use ID in search value and sort view
2019-07-08 19:52:47 +02:00
Sean Engelhardt f9cab8162d Use ID in search value and sort view
Allows the search value selector to search IDs as well.
Show the ID in the Os-Sort-Tree
2019-07-08 18:14:52 +02:00
Sean 596b9516e6
Merge pull request #4725 from GabrielInTheWorld/form-control
Separates the attachment field to a custom component
2019-07-08 13:50:02 +02:00
Emanuel Schütze 68ab7e9a1b
Merge pull request #4828 from tsiegleauq/larger-build-size
Increase build budget to prevent warning
2019-07-08 13:19:18 +02:00
Sean Engelhardt 6c4ff4fb52 Increase build budget to prevent warning 2019-07-08 12:56:04 +02:00
Emanuel Schütze f301e9c5af
Merge pull request #4827 from tsiegleauq/extension-hotfix
Hotfix clearing of extensions on navigation
2019-07-08 12:13:42 +02:00
Sean Engelhardt 5817c45e01 Hotfix clearing of extensions on navigation 2019-07-08 11:34:14 +02:00
Emanuel Schütze b5b03f34ec
Merge pull request #4826 from emanuelschuetze/translations-20190708
Updated translations
2019-07-08 10:49:36 +02:00
GabrielMeyer dfa80e9cd0 Separates the attachment field to a custom component
- Refactores also the 'search-value-selector.component'
2019-07-08 10:45:11 +02:00
Emanuel Schütze 1cdfea666b Updated translations 2019-07-08 10:22:19 +02:00
Emanuel Schütze 1a31fc9068
Merge pull request #4825 from GabrielInTheWorld/fixPermissions
Corrects the permission-handling
2019-07-08 09:52:33 +02:00
Sean 46f39f96e8
Merge pull request #4823 from GabrielInTheWorld/fixAutoUpdate
Separates the field of state and recommendation
2019-07-08 09:41:14 +02:00
GabrielMeyer 7e9190ea84 Corrects the permission-handling
- Projector-controls aren't seen, if no permission 'can_manage'
- The 'more options'-menu is removed
- New config option: Hide amount of speakers in list of speakers slide subtitle.
2019-07-08 09:27:45 +02:00
GabrielMeyer 0d52aaaa45 Separates the field of state and recommendation
- New component for similar situations
- Prevents overwriting and discarding of changes, if an 'autoupdate' is triggered
2019-07-08 09:10:05 +02:00
Emanuel Schütze 3cd9c5497c
Merge pull request #4822 from tsiegleauq/motion-export-dialog-addons
Add more option to motion export
2019-07-05 12:22:42 +02:00
Sean Engelhardt f79aa763c2 Add more option to motion export
Add optional TOC, date and page numbers to the motion export dialog.
Save and restore the last selected entries in the dialog
2019-07-05 11:57:05 +02:00
Emanuel Schütze e416231ef4
Merge pull request #4818 from CatoTH/OS3-title-change-recommendation
Change recommendations for titles
2019-07-05 11:53:23 +02:00
Tobias Hößl 2592862384 Change recommendations for titles
- Title changes in PDF, Diff-view and slides
2019-07-05 11:17:42 +02:00
Sean b06f879602
Merge pull request #4819 from tsiegleauq/angular-8.0.6
Update to Angular 8.0.6
2019-07-04 14:51:51 +02:00
Sean Engelhardt bc0fea3310 Update to Angular 8.0.6
Updates to angular 8 and updates all used components

- removed wrapper class for ngx/pwa LocalStorrace
- removed database lock service due to bugs
- tried to work around a cycle of dependancies
- changed some structure to be more close to default angular
- removed legacy angular packages
- removed date-picker since it was not currently used and
  is not compatible anymore
- upgrade tinyMCE
2019-07-04 14:20:57 +02:00
Emanuel Schütze 7943d15dae
Merge pull request #4811 from FinnStutzenstein/recommendationReferencingMotions
Show from recommendation referencing motions
2019-07-04 12:42:04 +02:00
FinnStutzenstein 2ae7776392 Show from recommendation referencing motions 2019-07-04 07:12:31 +02:00
Emanuel Schütze ea425996f9
Merge pull request #4817 from CatoTH/OS3-bugfix-repeated-motion-texts
Bugfix: Amendment with multiple changed paragraphs shows motion text …
2019-07-03 13:08:08 +02:00
Tobias Hößl 6b70e8a4ab Bugfix: Amendment with multiple changed paragraphs shows motion text multiple times when context is shown 2019-07-03 12:20:44 +02:00
Emanuel Schütze 47f1ca9691
Merge pull request #4816 from tsiegleauq/motion-pdf-sub-categories
Add motion PDF TOC subcategories
2019-07-03 12:08:41 +02:00
Sean Engelhardt cfc09d8cad Add motion PDF TOC subcategories
Adjust the motion catalog PDF TOC to indicate Subcategories
2019-07-03 10:38:20 +02:00
Finn Stutzenstein 8a8684b27a
Merge pull request #4820 from FinnStutzenstein/compatibilityToPytest5
Compatibility to pytest 5
2019-07-03 08:00:16 +02:00
FinnStutzenstein 78dcc3f902 Compatibility to pytest 5 2019-07-03 07:46:23 +02:00
Emanuel Schütze bf4f93c502
Merge pull request #4815 from tsiegleauq/multiselect-stack-calls
Enhance Choice service.
2019-07-02 13:08:53 +02:00
Sean ec9760216a
Merge pull request #4790 from FinnStutzenstein/cleanup
Cleanup
2019-06-28 12:02:07 +02:00
Sean Engelhardt 1e7a5b33d7 Enhance Choice service.
- Enhance the behavior on small screens and resolutions
- Only scroll content
- fixes an issue where choices could not be made if no content option where available
2019-06-28 11:44:16 +02:00
Finn Stutzenstein b71e73fe7f
Merge pull request #4785 from FinnStutzenstein/historyQuicklink
Quicklink to history (closes #4777)
2019-06-28 08:50:54 +02:00
FinnStutzenstein e604da3240 Quicklink to history (closes #4777) 2019-06-28 08:32:21 +02:00
FinnStutzenstein b8d3fa2614 Cleanup 2019-06-28 07:58:36 +02:00
Emanuel Schütze 45f6916036
Merge pull request #4814 from emanuelschuetze/translation-20190627
Updated translations
2019-06-27 23:36:44 +02:00
Emanuel Schütze 5d3bb1fd4a Updated translations 2019-06-27 23:20:49 +02:00
Emanuel Schütze 964712c77d
Merge pull request #4774 from GabrielInTheWorld/pdf-checkbox
Implements checkboxes
2019-06-27 22:44:49 +02:00
Emanuel Schütze a63891e98c
Merge pull request #4813 from tsiegleauq/remove-restriction-for-filter
Remove restrictions for filters
2019-06-27 22:38:28 +02:00
Emanuel Schütze cc0e8f0829
Merge pull request #4807 from emanuelschuetze/text-encode
Use npm package text-encoding to fix IE11/Edge login.
2019-06-27 22:24:27 +02:00
GabrielMeyer e5b25d7695 Implements checkboxes
In every motion the user has the option to follow the recommendation or not.
2019-06-27 22:20:43 +02:00
Emanuel Schütze bd4365eb30
Merge pull request #4812 from tsiegleauq/show-active-filter
Add detailed filter information
2019-06-27 20:51:57 +02:00
Sean Engelhardt b4cbf5646f Add detailed filter information
Adds detailed filter information into the table custom head bar.
Filters are scroll-able horizontally
2019-06-27 16:38:21 +02:00
Sean Engelhardt db672f1405 Remove restrictions for filters
Removes the restictions for filters
2019-06-27 16:20:31 +02:00
Emanuel Schütze b7d35d1fa1
Merge pull request #4789 from tsiegleauq/user-list-sort
Fix sorting with empty strings
2019-06-27 15:21:38 +02:00
Sean Engelhardt 1aa41945c5 Fix sorting with empty strings
Empty strings can now be sorted using the base filter service
2019-06-27 14:32:14 +02:00
Emanuel Schütze f2c6213901
Merge pull request #4810 from emanuelschuetze/pwa-color
Redefine colors for PWA.
2019-06-26 16:31:38 +02:00
Emanuel Schütze a8af0595a6
Merge pull request #4808 from emanuelschuetze/email
New email sender name and reply-to config options.
2019-06-26 16:30:17 +02:00
Emanuel Schütze 2657401a65 Redefine colors for PWA. Fetch fonts for offline usage. 2019-06-26 09:55:05 +02:00
Emanuel Schütze 585b569bbf
Merge pull request #4809 from FinnStutzenstein/fixRestrictionWithoutRestrictedDataCache
Fix restriction without restricted data cache
2019-06-25 20:56:31 +02:00
Emanuel Schütze 29dd81ba39 New email sender name and reply-to config options. 2019-06-25 17:26:38 +02:00
FinnStutzenstein b7e98a565a Fix restriction without restricted data cache 2019-06-25 16:57:29 +02:00
Emanuel Schütze 611d0f4610 Use npm package text-encoding to fix IE11/Edge login.
IE11/Edge does not support TextDecoder/TextEncoder.
Solved by using the npm package 'text-encoding'.
2019-06-25 14:59:04 +02:00
Emanuel Schütze ae618fce20
Merge pull request #4806 from tsiegleauq/smarter--back-button
Smarter back button
2019-06-25 11:56:24 +02:00
Sean Engelhardt 9d37989ec7 Makes navigation from Legal notice and pp always possible.
Tracks the last history and evaluates if the last visited URL is safe to navigate to

also increases the version of djangorestframework.

fixes #4705
2019-06-25 10:45:24 +02:00
Sean 19a389cae6
Merge pull request #4805 from tsiegleauq/more-listview-patches
Adds custom filter predicates for native object data
2019-06-24 17:04:57 +02:00
Sean Engelhardt 2758441552 Adds custom filter predicates for native object data
Supports properties like motion submitter and more.

Does at the moment "not" support tunneled properties, i.e filters
that need to go over a repository
(i.w workflow-state-label)

Fixes some small issues
2019-06-24 16:30:27 +02:00
Sean 582be687eb
Merge pull request #4803 from tsiegleauq/sorted-next-motion
Enhance surrounding motion detection
2019-06-24 16:29:00 +02:00
Sean Engelhardt a5620624e2 Enhance surrounding motion detection
Uses the new sort and filter list in the motion
detail page to offer the same sorting of surrounding
motions from the list view
2019-06-24 15:54:52 +02:00
Sean 7d03fddfcf
Merge pull request #4801 from FinnStutzenstein/numberingPrefetchingFix
Fixed prefetching and ordering of motions during numbering
2019-06-24 13:08:53 +02:00
Emanuel Schütze 3d573441ca
Merge pull request #4759 from FinnStutzenstein/optionalAgendaItem
Optional agenda items
2019-06-24 12:37:29 +02:00
Sean dcfedb9864
Merge pull request #4804 from tsiegleauq/remove-fs-package
Remove unnecessary fs package
2019-06-24 12:13:13 +02:00
Sean Engelhardt 582db8bf2c Remove unnecessary fs package
Remove a dev package and update the readme accordingly.
2019-06-24 11:45:35 +02:00
FinnStutzenstein ac303d9f3d Fixed prefetching and ordering of motions during numbering 2019-06-20 14:03:57 +02:00
Sean 7aaa971c0a
Merge pull request #4800 from tsiegleauq/personal-note-render-html
Fix HTML rendering in personal note
2019-06-19 17:57:25 +02:00
Sean Engelhardt f5fdc37e8e Fixes not rendered in personal note
Use sanitize HTML in personal note component
2019-06-19 16:49:14 +02:00
Emanuel Schütze db3bf4de66
Merge pull request #4798 from FinnStutzenstein/fixClos
Fixed clos
2019-06-19 12:04:09 +02:00
Emanuel Schütze d5db8429b0
Merge pull request #4799 from tsiegleauq/ngrid-filter-predicates
Add Filter predicate for ID
2019-06-19 11:59:20 +02:00
Sean Engelhardt afda3e03ec Add Filter predicate for ID
All List View Tables can get custom filter predicates.
Per default, they now filter their primitive content
as well as their ID
2019-06-19 11:38:14 +02:00
Finn Stutzenstein f8fabbabd1
Merge pull request #4797 from FinnStutzenstein/fixSelfReferencingRelationshipUpdates
Fixed updates for self references in BaseRepository (closes #4796)
2019-06-19 09:15:24 +02:00
FinnStutzenstein 4ac5d1dbc2 Fixed clos 2019-06-19 09:15:07 +02:00
FinnStutzenstein c2f14397f2 Fixed updates for self references in BaseRepository (closes #4796) 2019-06-19 09:05:09 +02:00
Emanuel Schütze c7088a4b73
Merge pull request #4786 from GabrielInTheWorld/FinnStutzenstein/categoryNameWithParents
Labelling of subcategories
2019-06-19 08:15:47 +02:00
Emanuel Schütze c67ad7f41d
Merge pull request #4795 from tsiegleauq/vlist-refinements
Refine Virtual Scrolling Tables
2019-06-19 08:10:56 +02:00
Sean Engelhardt 6cc8c8b531 Refine Virtual Scrolling Tables
- Enabled Word Wrapping
- Fixed an error where the projection dialog did not apear in the agenda
- Better promise handling to decide between motion table and tiles
- Fixed a projector permission bug
- disabled mat-row stagger animation
- Exchanged ngrid-grey theme with OpenSlides mat-card background. Looks cleaner
2019-06-18 23:46:10 +02:00
Emanuel Schütze a39971c194
Merge pull request #4787 from GabrielInTheWorld/prepair-theming
Ensures theming of components
2019-06-18 19:47:27 +02:00
Emanuel Schütze 7dd59cc477
Merge pull request #4782 from GabrielInTheWorld/tab-title-more
Sets more tab title
2019-06-18 19:44:22 +02:00
Emanuel Schütze ae76a1991d
Merge pull request #4788 from GabrielInTheWorld/aNameForThisBranch
Fixes correct displaying for 'Active filters'
2019-06-18 19:38:45 +02:00
Emanuel Schütze 7cf604918f
Merge pull request #4784 from tsiegleauq/user-list-toggle
Add more user list options
2019-06-17 17:26:29 +02:00
Emanuel Schütze 578efe3345
Merge pull request #4791 from GabrielInTheWorld/tile-enhances
Sorts categories in tile-view by prefix
2019-06-17 17:17:38 +02:00
GabrielMeyer c136a1b691 Sorts categories in tile-view by prefix 2019-06-17 17:03:43 +02:00
GabrielMeyer 086571d7fe Fixes correct displaying for 'Active filters' 2019-06-17 14:57:26 +02:00
GabrielMeyer 4fc7731f1a Ensures theming of components
- If there is no theme applied, the default theme is loaded and applied.
2019-06-17 14:48:34 +02:00
GabrielMeyer f63838ff83 Adds extended label to pdf-export 2019-06-17 13:55:42 +02:00
GabrielMeyer 31161398c0 Sets more tab title
Sets the titles for the tab on more pages.
Fixes #4773.
2019-06-17 13:15:06 +02:00
FinnStutzenstein 295c69e3fb Changed category label for motion views 2019-06-17 13:06:06 +02:00
Sean Engelhardt bb443fd4af Add more user list options
- Adds an icon with tooltip if a user is inactive to the user list
- always show the 'present'-column, even though the user is not active
- add a info icon if the user has a "comment". The content of the content
  is displayed in the tooltip
2019-06-17 12:50:54 +02:00
FinnStutzenstein 8ff0f73477 Optional agenda items 2019-06-17 12:38:17 +02:00
Emanuel Schütze cab8dba016
Merge pull request #4781 from tsiegleauq/faster-animations
Speed up animations.
2019-06-17 12:25:59 +02:00
Sean Engelhardt 161873b68c Speeds up the animations.
Removed the on-transition-fade class
The current way to trigger animation seemed not reliable enough.
2019-06-14 15:19:52 +02:00
Emanuel Schütze a5e1646f3c
Merge pull request #4780 from emanuelschuetze/translations-20190614
Updated translations
2019-06-14 14:44:05 +02:00
Emanuel Schütze 5247ced71f Updated translations 2019-06-14 14:27:14 +02:00
Emanuel Schütze ded7bac4f7
Merge pull request #4779 from MaximilianKrambach/sequentialNumber
config to show/hide motion sequential numbers
2019-06-14 14:21:27 +02:00
Emanuel Schütze e2e5fe07d0
Merge pull request #4766 from GabrielInTheWorld/pdf-make-enhancement
Implementation of exporting submitters and recommendation
2019-06-14 14:17:13 +02:00
Maximilian Krambach ac1703242e config to show/hide motion sequential numbers 2019-06-14 14:10:34 +02:00
GabrielMeyer 26cc6556a0 Implementation of exporting submitters and recommendation
The user can choose the option to export the informtion about submitters and the recommendation including the extension of motions to the 'table of contents'.
2019-06-14 13:59:19 +02:00
Emanuel Schütze 184bb17596
Merge pull request #4737 from tsiegleauq/virtual-scroll-components
Add virtual scrolling to tables
2019-06-14 11:31:09 +02:00
Sean Engelhardt 15e9ea898b Add virtual scrolling to tables
Replaces most mat-tables with tables using the NGrid library, supporting
extremly performant virtual scrolling.

The ListViewBaseComponent have been extremly simplified.
All list-view code is now mich shorter and way less repitative

The group list and the workflow list have not been altered.

**Works:**
- Fast virtual Scrolling without pagination
- Click Filter
- Search Filter
- Sorting
- Export filtered values (using click filters)
- Export sorted values in correct order
- Right-Click-new-tab
- Hiding/showing columns by permission and screen size
- Multi select
- Auto Updates in MultiSelectMode keep the correct items selected
- OsHeadBar shows the correct amount of data
- Restore scroll position after navigation
- Shared-Table Component
- Clean-Up base-list-view
- Motion List
- Motion Block List
- Motion Block Detail
- User List
- Agnnda List
- Assignment List
- MediaFile List
- Tag List

**TODO:**
- Formulate filter predicates
- LOS Badge autoupdate (change detection)
- Better ellipses in lists
- Horrizontal Scrolling, if the screen get's too small.
- Issues in the change detection
- Some Layouting

**BUG:**
- Using the seach filter prevents the sorting from working.
- NGrid currently has no way to get the filtered list
  using search filter. Thus, search-filtered list cannot
  be exported.
2019-06-14 11:18:54 +02:00
Emanuel Schütze 6fa458cc89
Merge pull request #4778 from emanuelschuetze/translations-20190613
Updated translations
2019-06-13 13:38:16 +02:00
Emanuel Schütze f66b0d1e98 Updated translations 2019-06-13 13:11:05 +02:00
Emanuel Schütze 3aa6b8048b
Merge pull request #4762 from GabrielInTheWorld/startpage
Fixes correct rendering of images and styles at startpage
2019-06-13 12:08:51 +02:00
Emanuel Schütze face97a2a2
Merge pull request #4767 from normanjaeckel/HistoryRebuild
Refactored OpenSlides history (HistoryInformation is not a root rest …
2019-06-13 11:50:14 +02:00
GabrielMeyer 165a920c8c Fixes correct rendering of images and styles at startpage 2019-06-13 11:45:41 +02:00
Emanuel Schütze cabaffab94
Merge pull request #4760 from GabrielInTheWorld/new-components
Adds a new component for icons
2019-06-13 11:44:00 +02:00
FinnStutzenstein ff98ee1b96 Refactured client 2019-06-13 10:09:08 +02:00
Norman Jäckel 5a5bc77e62 Refactored OpenSlides history (HistoryInformation is not a root rest element anymore.). 2019-06-13 09:14:58 +02:00
GabrielMeyer 5e3f710e4d Adds a new component for icons
- An icon followed by text (or something else) can replaced by this new component, to verify a unified size and layout.
- Replaces also existing components with this new one.
2019-06-13 08:23:44 +02:00
Emanuel Schütze 35c8dc97f5
Merge pull request #4756 from FinnStutzenstein/subcategories
Subcategories
2019-06-12 15:08:46 +02:00
FinnStutzenstein bf9973a4a7 Subcategories 2019-06-12 14:37:19 +02:00
Emanuel Schütze a570cf16b0
Merge pull request #4753 from FinnStutzenstein/compression
Compression
2019-06-12 14:36:31 +02:00
FinnStutzenstein 6d027f0f75 Compression: Sending compressed messages 2019-06-12 08:25:25 +02:00
FinnStutzenstein d9c88c02b3 Compression: Recieving compressed messages 2019-06-12 08:21:16 +02:00
Finn Stutzenstein 8f2160d44e
Merge pull request #4775 from FinnStutzenstein/prettierUpdate
Update prettier
2019-06-12 08:20:28 +02:00
FinnStutzenstein 213fc30800 Update prettier 2019-06-12 08:01:33 +02:00
Emanuel Schütze 5a5264046e
Merge pull request #4772 from FinnStutzenstein/itemNumberFix
Temporary fix for the agenda item number during updates.
2019-06-07 15:25:57 +02:00
FinnStutzenstein 4151797f60 Temporary fix for the agenda item number during updates.
The changes in the agenda reposiroty can be reverted with #4738
2019-06-06 10:03:34 +02:00
Emanuel Schütze 1e8560c9a4
Merge pull request #4768 from normanjaeckel/Review
Added detail to set permission response.
2019-06-05 20:01:42 +02:00
Emanuel Schütze 16f2ee57fc
Merge pull request #4771 from emanuelschuetze/translation-20190605
Updated Translations
2019-06-05 19:56:20 +02:00
Emanuel Schütze 7fac04afa7 Updated Translations 2019-06-05 17:56:18 +02:00
Emanuel Schütze 6895b5db67
Merge pull request #4651 from MaximilianKrambach/assignmentBallots
Assignment ballots (and refactoring motion ballots)
2019-06-05 17:24:42 +02:00
Emanuel Schütze b5287a4e57
Merge pull request #4656 from MaximilianKrambach/callListBulk
fixing bulk sort trees from list view
2019-06-05 16:35:41 +02:00
Emanuel Schütze 59e83736b6
Merge pull request #4761 from GabrielInTheWorld/utilities
Fixes the break of very long messages in 'mat-chip'
2019-06-05 16:34:18 +02:00
Emanuel Schütze eb1f1c3b53
Merge pull request #4757 from GabrielInTheWorld/tile-layout
Enhances the tile view
2019-06-05 16:33:57 +02:00
Maximilian Krambach 79ef8e99c4 assignment poll ballot pdfs
- refactoring poll-pdf service
- adding ballots for AssignmentPolls
2019-06-05 16:30:54 +02:00
GabrielMeyer 9e4b90461d Enhances the tile view
- Adds subscriptions to the subscriptions-array from parent to clear them, after destroying the view
- Removes filter and sort service, if the selected view is the tile-view
Adds a second variable to hold the current selected view by user
- Increases the size of the badge
2019-06-05 15:45:18 +02:00
Emanuel Schütze 3338039627
Merge pull request #4765 from GabrielInTheWorld/hotfixAgendaList
Fixes error of 'listOfSpeakersUrl'
2019-06-05 15:02:37 +02:00
Emanuel Schütze 9651a058c3
Merge pull request #4763 from GabrielInTheWorld/tab-title
Sets the TabTitle
2019-06-05 14:49:02 +02:00
GabrielMeyer 403d82f781 Fixes the break of very long messages in 'mat-chip' 2019-06-05 14:46:42 +02:00
Norman Jäckel fc7f82c625
Merge pull request #4769 from normanjaeckel/Hotfix
Hotfix
2019-06-05 13:58:35 +02:00
Norman Jäckel 5d38099695 Hotfix 2019-06-05 13:42:01 +02:00
Emanuel Schütze 9dcc11f909
Merge pull request #4752 from GabrielInTheWorld/quick-dialog
Adds dialogs to create/edit
2019-06-05 12:53:21 +02:00
GabrielMeyer 23fe9f1a94 Sets the TabTitle
Motions, users and elections reset the title of a tab in their detail-view.
2019-06-05 12:19:18 +02:00
Norman Jäckel b17a0f154f Added detail to set permission response. 2019-06-05 11:57:29 +02:00
Maximilian Krambach d9c5ff68b2
Merge pull request #4718 from MaximilianKrambach/sortTreeFilter
more sorting tree view filters
2019-06-04 17:51:52 +02:00
Maximilian Krambach 5f424aa7c1 tree sorting: fix sorting multiple items 2019-06-04 17:22:50 +02:00
Maximilian Krambach 37f0baf165 sorting tree view filters
- callList
 - refactored agendaSort
2019-06-04 17:21:38 +02:00
Emanuel Schütze 5e33c500c3
Merge pull request #4758 from GabrielInTheWorld/util-fixes
Hotfix for pagination in motion-list
2019-06-04 17:13:35 +02:00
Emanuel Schütze 3ea864c3f4
Merge pull request #4750 from MaximilianKrambach/multiMoveInCategory
Multi move motions in category
2019-06-04 17:10:52 +02:00
GabrielMeyer b2a70f271b Fixes error of 'listOfSpeakersUrl' 2019-06-04 15:32:34 +02:00
Emanuel Schütze eded9acc60
Merge pull request #4746 from GabrielInTheWorld/fix-hammer
Add amendments to Motion-PDF-Summary-Box
2019-06-04 15:14:31 +02:00
GabrielMeyer 514252a6ef Hotfix for pagination in motion-list 2019-06-03 16:22:53 +02:00
Finn Stutzenstein ea1c3437b6
Merge pull request #4754 from FinnStutzenstein/littleLayoutFix
Little motion toolbar layout fix
2019-06-03 11:33:12 +02:00
FinnStutzenstein 0dbba32d0e Client error handling 2019-06-03 11:12:09 +02:00
FinnStutzenstein 820bc214aa Little motion toolbar layout fix 2019-06-03 10:25:07 +02:00
Maximilian Krambach 6eeab5fc1e Multi move motions in category
- if there is a multiselection, a 'move to' button will be active
- TODO: better position/layout  for that button and dialogue
2019-06-03 09:29:29 +02:00
Emanuel Schütze ce701333a2
Merge pull request #4747 from emanuelschuetze/translation-20190528
Updated translations
2019-05-31 11:37:56 +02:00
Emanuel Schütze 708de917e1 Updated translations 2019-05-31 11:09:31 +02:00
GabrielMeyer 744b92f5f3 Adds dialogs to create/edit
- user-groups
- mediafile-list
2019-05-29 17:53:26 +02:00
Sean Engelhardt bbe966efa9 Add amendments to Motion-PDF-Summary-Box
Adds amendments to motion pdf summary box - only if the state of them accepts the merge into the parent motion.
Adds a new flatMap function to array.prototype (should be safe to use until
Array.flatMap made it into official JS. I expect it in ES 2019.

Refactors some PDF and ChangeReco / Amendment related code
2019-05-29 14:36:19 +02:00
Finn Stutzenstein 32af73cfb7
Merge pull request #4748 from MaximilianKrambach/travisAngular
Pin angular/cli version in travis-ci
2019-05-29 14:25:59 +02:00
Maximilian Krambach da282a501e Pin down angular/cli version in travis-ci 2019-05-29 13:54:07 +02:00
Emanuel Schütze 9d678092ee
Merge pull request #4745 from GabrielInTheWorld/motionBlockInternal
Internal flag for motion blocks
2019-05-28 15:52:07 +02:00
FinnStutzenstein 658b1a360d Internal flag for motion blocks
- ServerSide
- Adds the 'internal'-flag to the edit view of motion blocks
2019-05-28 15:24:22 +02:00
Emanuel Schütze a3b5f083d5
Merge pull request #4743 from GabrielInTheWorld/theming
Improves the SpinnerComponent
2019-05-28 12:52:01 +02:00
GabrielMeyer 6aa2508e39 Improves the SpinnerComponent
- The AppComponent listens to `stable`-state and `user` to determine whether the spinner should be hidden.
- Show the spinner only if the login data are correct.
- If the user is anonymous, the spinner will be hidden when the app is stable.
2019-05-28 12:05:57 +02:00
Emanuel Schütze a6f2147c93
Merge pull request #4744 from GabrielInTheWorld/assignment-list
Refactores sorting of assignment-list
2019-05-28 11:21:24 +02:00
GabrielMeyer 0c0a3f302b Refactores sorting of assignment-list
- In case of the name the list is sorted by `title` instead of `assignment`
- For the case of 'creation date' the list will be sorted by `id`
2019-05-28 09:56:53 +02:00
Emanuel Schütze 8bf1dad10e
Merge pull request #4708 from GabrielInTheWorld/tile-layout
Adds a new view with tiles to the motion-list
2019-05-27 22:47:24 +02:00
Emanuel Schütze 484d9b23e0
Merge pull request #4742 from FinnStutzenstein/autonomicSlides
Partially scale and scroll the motion slide
2019-05-27 22:43:40 +02:00
Emanuel Schütze 39d77dac29
Merge pull request #4391 from boehlke/mediafiles-projector
Show PDF, PNG and JPEG files in projector
2019-05-27 22:38:16 +02:00
FinnStutzenstein 1f7ace6b4b Partially scale and scroll the motion slide 2019-05-27 22:28:18 +02:00
Emanuel Schütze 2cfff9e1b9 Template rework and fullscreen mode 2019-05-27 22:15:16 +02:00
Maximilian Krambach b2c2d78c79
Merge pull request #4717 from MaximilianKrambach/sortTreeMulti
Drag/Drop multiselect
2019-05-27 17:26:03 +02:00
Maximilian Krambach bd27951648 drag/Drop multiselect 2019-05-27 17:07:12 +02:00
GabrielMeyer 39d891f851 Adds a new view with tiles to the motion-list
- New components 'Tile' and 'GridLayout'
- Adds a grid-layout to the view
- The grid-layout can have an optional title section
2019-05-27 16:17:23 +02:00
FinnStutzenstein 469084a1b6 Work on the presentation controls 2019-05-27 16:08:14 +02:00
Maximilian Krambach efbce9b645 fixes 2019-05-27 16:08:13 +02:00
FinnStutzenstein 78d107e37c some controls, integrate the pdfviewer 2019-05-27 16:08:11 +02:00
André Böhlke b3ff250d38 WIP: show PDF, PNG and JPEG files in projector 2019-05-27 16:08:10 +02:00
Emanuel Schütze 7e2045aa76
Merge pull request #4709 from GabrielInTheWorld/utilities
Implements the export of assignment-list as pdf
2019-05-27 14:42:58 +02:00
Emanuel Schütze 6f36094cde
Merge pull request #4730 from FinnStutzenstein/motionBlockSlideLayout
Improved motion block slide layout
2019-05-27 14:39:10 +02:00
Emanuel Schütze 441e10ed59
Merge pull request #4339 from MaximilianKrambach/finalVersion
editor for final modified version of a motion
2019-05-27 14:38:02 +02:00
FinnStutzenstein 7106e06ca1 Improved motion block slide layout 2019-05-27 14:25:30 +02:00
Finn Stutzenstein 318533cf68
Merge pull request #4659 from MaximilianKrambach/presentSpeakers
Filter present speaker search-value selector
2019-05-27 13:02:16 +02:00
Maximilian Krambach ea0a605018 modified final version edit 2019-05-27 12:59:44 +02:00
GabrielMeyer 8a1588dd33 Implements the export of assignment-list as pdf
- Exporting the whole list of assignments
- Exporting a selected list of assignments
2019-05-27 12:32:05 +02:00
Maximilian Krambach 16477a4e92 filter potential speakers
- filter by those already on list
- filter by present, if configured
2019-05-27 11:40:15 +02:00
Finn Stutzenstein 1599e91fa5
Merge pull request #4741 from FinnStutzenstein/noErrorPageOnLogout
Prevent error page flickering on logout
2019-05-27 09:30:52 +02:00
Finn Stutzenstein b027bbfac8
Merge pull request #4740 from FinnStutzenstein/permissionSetViewFix
Fixed updating user data after changing permissions with the new view
2019-05-27 08:50:23 +02:00
FinnStutzenstein 69903192a2 Prevent error page flickering on logout 2019-05-27 08:48:04 +02:00
FinnStutzenstein d57c5bd132 Fixed updating user data after changing permissions with the new view 2019-05-24 18:22:39 +02:00
Emanuel Schütze 309b8118f6
Merge pull request #4739 from FinnStutzenstein/fixChangeOwnPasswortViewPermissions
Fix permissions for the change-own-password-view
2019-05-24 15:31:17 +02:00
FinnStutzenstein 0aedc77fd4 Fix permissions for change-own-password-view and user-profile-view 2019-05-24 15:09:44 +02:00
Finn Stutzenstein f77f876996
Merge pull request #4639 from FinnStutzenstein/splitAgendaAndLOS
Split AgendaItem and ListOfSpeakers
2019-05-24 11:38:48 +02:00
FinnStutzenstein 9f12763f8b Split AgendaItem and ListOfSpeakers
Server:
- ListOfSpeakers (LOS) is now a speprate model, containing of an id,
speakers, closed and a content_object.
- Moved all speaker related views from ItemViewSet to the new
ListOfSpeakersViewSet.
- Make Mixins for content objects of items and lists of speakers.
- Migrations: Move the lists of speakers from items to the LOS model.

Client:
- Removed the speaker repo and moved functionality to the new
ListOfSpeakersRepositoryService.
- Splitted base classes for agenda item content objects to items and
LOS.
- CurrentAgendaItemService -> CurrentListOfSpeakersSerivce
- Cleaned up the list of speakers component.
2019-05-24 08:21:59 +02:00
Emanuel Schütze 61057a6e09
Merge pull request #4735 from tsiegleauq/allow-stored-filter-with-empty-options
Allow stored filter without options
2019-05-23 11:12:27 +02:00
Sean Engelhardt 10684cf1cf Allow stored filter without options
Fixes an issue where stored filters where considered to be wrong if
their set of options was empty
2019-05-23 10:13:53 +02:00
Emanuel Schütze a403715736
Merge pull request #4734 from emanuelschuetze/motionMobileView
Fixed motion mobile view on iOS.
2019-05-22 23:17:01 +02:00
Emanuel Schütze df6dd6a1dc
Merge pull request #4733 from tsiegleauq/default-sorting
Fixes an issue where sorting was tried with undefined valued
2019-05-22 22:59:28 +02:00
Emanuel Schütze 63daac7b65 Fixed motion mobile view on iOS. 2019-05-22 22:52:35 +02:00
Sean Engelhardt c3c98f06e3 Fixes an issue where sorting was tried with undefined valued
Hot-Fixes agenda sorting
2019-05-22 18:35:58 +02:00
Sean f52ca7d941
Merge pull request #4732 from tsiegleauq/load-valid-filters-only
Check if the loaded filter definition has the valid format
2019-05-22 12:49:24 +02:00
Sean Engelhardt bd4da53255 Check if the loaded filter definition has the valid format
Fixes an issue where malformated or old filter-definition where considered
to be valid filters which could cause some issues
2019-05-22 12:33:05 +02:00
Emanuel Schütze d2b81e2a28
Merge pull request #4731 from FinnStutzenstein/fixAgendaSorting
Readded default sorting for agenda
2019-05-21 17:50:43 +02:00
FinnStutzenstein 5c4d7af917 Readded default sorting for agenda
The default sorting was removed here: https://github.com/OpenSlides/OpenSlides/pull/4671/files#diff-c72ce8d0c2c339385819bf10c685c276L128
Readded it in the repository (instead of the filter-/sortingservices), so the agenda is always well sorted.
2019-05-21 17:27:29 +02:00
Emanuel Schütze 294d324419
Merge pull request #4727 from GabrielInTheWorld/csv-import
Adds import of tags to csv import
2019-05-21 15:17:47 +02:00
GabrielMeyer cd4e73b6d3 Adds import of tags to csv import 2019-05-21 14:58:46 +02:00
Emanuel Schütze e907599cef
Merge pull request #4726 from GabrielInTheWorld/pdf-make
Adds config-variable for pdf-export
2019-05-21 12:23:38 +02:00
GabrielMeyer eb7b203b33 Adds config-variable for pdf-export
- Adds the page-size 'A5' for pdf-export
2019-05-21 11:58:59 +02:00
Emanuel Schütze 31274873f1
Merge pull request #4719 from FinnStutzenstein/chyronColor
Added custom color for the projector chyron and reset buttons for colors
2019-05-20 22:12:32 +02:00
FinnStutzenstein e267279f60 Added custom color for the projector chyron and reset buttons for colors 2019-05-20 21:50:03 +02:00
Emanuel Schütze 0a99c2b0f5
Merge pull request #4722 from FinnStutzenstein/motionTextNotRequiredForParagraphAmendments
Do not require the motion text for paragraph based amendments
2019-05-20 21:46:15 +02:00
FinnStutzenstein 11fd8c5762 Do not require the motion text for paragraph based amendments 2019-05-20 20:47:28 +02:00
Emanuel Schütze bcd7a3d74f
Merge pull request #4723 from FinnStutzenstein/preventDeletionOfLastWorkflow
prevent deletion of last workflow and update configs on deletion
2019-05-20 20:43:38 +02:00
Finn Stutzenstein e4dfd75ab9
Merge pull request #4721 from FinnStutzenstein/fixPermissionSorting
Fix sorting of permissions if plugins are available
2019-05-20 17:20:38 +02:00
FinnStutzenstein 6f798357fa prevent deletion of last workflow and update configs on deletion 2019-05-20 12:54:20 +02:00
Maximilian Krambach a09269cf2a
Merge pull request #4640 from MaximilianKrambach/pollCalculations
Poll calculations
2019-05-20 11:59:31 +02:00
Maximilian Krambach 014701442c refactor poll calculations 2019-05-20 11:31:27 +02:00
FinnStutzenstein ba73d50886 Fix sorting of permissions if plugins are available 2019-05-20 10:32:40 +02:00
Sean 7ab040823d
Merge pull request #4671 from tsiegleauq/rework-sort-filter
Rework sort and filter
2019-05-20 10:02:12 +02:00
Sean Engelhardt 850fcbe243 Rework sort and filter
More observable based, more scaleable filtering
based on an old branch of @FinnStutzenstein.

cleans some functions and provides some differend features.
2019-05-17 13:03:48 +02:00
Emanuel Schütze 0f03eb1446
Merge pull request #4679 from tsiegleauq/assignment-ui
Rework Assignment UI
2019-05-16 22:17:20 +02:00
Sean Engelhardt 654c54e9ab Rework Assignment UI
Reworks the Assignment UI to fit to the current MockUps
2019-05-16 21:56:09 +02:00
Emanuel Schütze fef386ddf8
Merge pull request #4713 from FinnStutzenstein/tooHighChangeIdHandling
Handles 'change id too high' and generic websocket error message format
2019-05-16 20:25:13 +02:00
Emanuel Schütze 65dbf37106
Merge pull request #4704 from FinnStutzenstein/setPermissionRequest
Request for settings a permission in a group (closes #4698)
2019-05-16 14:14:33 +02:00
Emanuel Schütze 93ef573e09
Merge pull request #4707 from FinnStutzenstein/fixTreeSorting
fix tree sorting
2019-05-16 14:10:14 +02:00
Finn Stutzenstein 0ed00ff603
Merge pull request #4703 from normanjaeckel/ChangeDefaultWorkflows
Changed default workflows.
2019-05-15 15:54:31 +02:00
Finn Stutzenstein abe281e475
Merge pull request #4682 from FinnStutzenstein/motionSlideFixed
Fixed getting states of amendments (closes #4677)
2019-05-15 15:54:11 +02:00
FinnStutzenstein 284e90961a Fixed getting states of amendments (closes #4677) 2019-05-15 15:21:11 +02:00
Norman Jäckel 349fe49e1c Changed default workflows. 2019-05-15 15:18:43 +02:00
Emanuel Schütze 183f671fee
Merge pull request #4693 from tsiegleauq/no-notification-on-projector
Enhance update service
2019-05-15 14:58:59 +02:00
Finn Stutzenstein 8dda317b18
Merge pull request #4702 from normanjaeckel/BulkViewsMotions
Bulk views motions
2019-05-15 14:52:48 +02:00
FinnStutzenstein 5ad94cb2f4 Handles 'change id too high' and generic websocket error message format 2019-05-15 14:25:54 +02:00
Norman Jäckel cf29f97613 Added view for bulk category set and bulk motion block set.
Due to rebasing this PR, this are the appropriate authorships:
Server: @normanjaeckel and @FinnStutzenstein
Client: @MaximilianKrambach
2019-05-15 14:18:36 +02:00
Finn Stutzenstein 8983f6aef3
Merge pull request #4542 from FinnStutzenstein/removeChatMessage
Remove ChatMessage
2019-05-15 14:15:16 +02:00
FinnStutzenstein 10c329da8d fix tree sorting
Assigns the weight in the preorder traversal of the tree. Now one without every
object (e.g. missing motions/items) still have the correct sorting. Intorduces
the level attribute of items giving the amount of parents in the agenda. This
allows to reduce complexits in the client.
2019-05-15 14:14:32 +02:00
FinnStutzenstein 665426e954 Remove ChatMessage 2019-05-15 13:44:45 +02:00
Finn Stutzenstein b3c2b5f899
Merge pull request #4645 from FinnStutzenstein/renameManageRestriction
Rename the manage restriction field
2019-05-15 13:40:16 +02:00
Emanuel Schütze 7f5ec6a840
Merge pull request #4715 from CatoTH/OS3-final-version-in-csv
Support other text versions in CSV
2019-05-14 22:03:42 +02:00
Tobias Hößl f8a56ed136
Support other text versions in CSV 2019-05-14 20:58:21 +02:00
Emanuel Schütze 0b22688a3f
Merge pull request #4716 from emanuelschuetze/userExport
Improved users PDF and CSV export
2019-05-14 20:37:08 +02:00
Emanuel Schütze 2b163af5d7 Improved users PDF and CSV export
- PDF: use full_name (with structure_level and number) instead of short_name.
- CSV: add gender column
2019-05-14 20:20:21 +02:00
FinnStutzenstein f9bac798aa Rename the manage restriction field
Renamed 'managers_only' to 'motions.can_maange' to adapt the (new) behavior of #4638. Closes #4643.
2019-05-14 16:02:59 +02:00
Maximilian Krambach 6b25e62cec
Merge pull request #4712 from MaximilianKrambach/fix4711
fix sorting tree condition #4711
2019-05-14 15:57:39 +02:00
Maximilian Krambach 71e2ef65fc fix sorting tree condition 2019-05-14 15:11:25 +02:00
Finn Stutzenstein 8403b4622d
Merge pull request #4710 from GabrielInTheWorld/util-fixes
Hotfix: MediaUpload went wrong...
2019-05-14 14:24:24 +02:00
GabrielMeyer 5ad70bd02d Hotfix: MediaUpload went wrong... 2019-05-14 14:10:58 +02:00
Finn Stutzenstein ae107dc0d1
Merge pull request #4706 from FinnStutzenstein/hotfixAgendaList
Fixed false visible items in the agenda
2019-05-13 16:03:19 +02:00
Finn Stutzenstein af717fe018
Merge pull request #4680 from FinnStutzenstein/unifyUrlsPrefixes
Added beginning slash to all request urls
2019-05-13 14:49:51 +02:00
Finn Stutzenstein 6f014279d4
Merge pull request #4687 from FinnStutzenstein/catchDoubleCreationOfPersonalNotes
Fix doulbe create requests for personal notes.
2019-05-13 14:49:42 +02:00
FinnStutzenstein c860f45041 Fixed false visible items in the agenda
The fix has to be reworked with #4671 and can be eliminated with #4639
2019-05-13 13:42:03 +02:00
FinnStutzenstein 5e13299ae3 Request for settings a permission in a group (closes #4698) 2019-05-13 10:17:24 +02:00
Emanuel Schütze c2abe8a0a0
Merge pull request #4700 from emanuelschuetze/fixProjectorLogo
Fixed projector logo
2019-05-11 10:02:32 +02:00
Emanuel Schütze 7792c47656 Fixed projector logo 2019-05-11 09:40:14 +02:00
Emanuel Schütze 4495985d4c
Merge pull request #4695 from FinnStutzenstein/logging
Logging the cache buildup process
2019-05-10 16:39:29 +02:00
Emanuel Schütze 7e6b793e2a
Merge pull request #4699 from emanuelschuetze/fixUsersRoutingPerms
Fixed permission for reset password in routing module.
2019-05-10 16:38:49 +02:00
Emanuel Schütze ca70944d0c Fixed permission for reset password in routing module. 2019-05-10 16:09:35 +02:00
FinnStutzenstein 171f05e7b8 Logging the cache buildup process 2019-05-10 14:20:01 +02:00
FinnStutzenstein 7c80aebe75 Added beginning slash to all request urls 2019-05-10 14:05:28 +02:00
Sean Engelhardt 1a02b845b8 Enhance update service
Updates will be observed from site component
(Makes pure projectors ignore updates, unless the user navigates manually)

Updates can now be delayed using the "noInterruption" route data.
If the "noInterruption" route data was set, updates notifications
will not be shown in this view.
The update notification will appear, after the user navigates
to a view without "noInterruption" flag.
2019-05-10 13:11:42 +02:00
Norman Jäckel ba9fcef5a1
Merge pull request #4692 from FinnStutzenstein/reloadOnPrioritizedProjectorclients
Refresh projector data after *every* (re)connect (closes #4691)
2019-05-10 12:41:24 +02:00
FinnStutzenstein c4402f733e Refresh projector data after *every* (re)connect (closes #4691) 2019-05-10 12:24:41 +02:00
Emanuel Schütze 643bab111c
Merge pull request #4688 from MaximilianKrambach/multiFilter
fix number array filter options
2019-05-10 11:32:28 +02:00
Maximilian Krambach 6648f3a17d fix number array filter options 2019-05-10 10:47:35 +02:00
Emanuel Schütze 3b7cb23e1f
Merge pull request #4686 from FinnStutzenstein/fixWebSocketAndEncodingErrors
Fixed websocket and encoding errors
2019-05-10 08:42:49 +02:00
Emanuel Schütze 6f7f25727c
Merge pull request #4684 from emanuelschuetze/fixUserList
Fix access for user meta info dialog in user list view.
2019-05-10 08:39:11 +02:00
FinnStutzenstein 635fd3fad5 Fix doulbe create requests for personal notes.
When this is done, the clients needs handle this error @tsiegleauq
2019-05-10 08:18:28 +02:00
FinnStutzenstein 5728b65824 Fixed websocket and encoding errors 2019-05-10 07:35:19 +02:00
Emanuel Schütze 91cb6c132c Fix access for user meta info dialog in user list view. 2019-05-10 07:17:09 +02:00
Emanuel Schütze c868a04571
Merge pull request #4681 from FinnStutzenstein/fixClos
Fix self-referencing projectors with new dependency management
2019-05-10 07:08:31 +02:00
FinnStutzenstein b445946f54 Fix self-referencing projectors with new dependency management 2019-05-10 06:45:49 +02:00
Emanuel Schütze cef2e45b34
Merge pull request #4675 from tsiegleauq/personal-note-bug
Update personal note in motion
2019-05-08 20:55:37 +02:00
Emanuel Schütze 2c92ae9304
Merge pull request #4674 from emanuelschuetze/translation-20190507
Updated translations
2019-05-08 20:53:41 +02:00
Sean Engelhardt 7d49187123 Update personal note in motion
Fixes an issue where personal notes were not update
during a view motions update process
2019-05-08 20:07:04 +02:00
Emanuel Schütze bbe0b16701 Updated translations 2019-05-08 19:56:31 +02:00
Norman Jäckel dd66e7505d
Merge pull request #4644 from FinnStutzenstein/noProjectiondefaultChanges
prohibit changes in projectiondefaults
2019-05-08 09:28:08 +02:00
Emanuel Schütze 30232f3f08
Merge pull request #4673 from emanuelschuetze/new-logo
Added redesigned OpenSlides logo (svg only)
2019-05-07 23:09:39 +02:00
Emanuel Schütze 1faf088eca Added redesigned OpenSlides logo (svg only) 2019-05-07 22:01:16 +02:00
Emanuel Schütze f22596a98b
Merge pull request #4672 from tsiegleauq/motion-block-new-tab
Add anchor tag to motion block
2019-05-07 21:16:30 +02:00
Emanuel Schütze 51b4b6aba6
Merge pull request #4578 from GabrielInTheWorld/theming
Implements a mechanism for a fallback theme
2019-05-07 21:13:55 +02:00
Emanuel Schütze b3de965a66
Merge pull request #4660 from FinnStutzenstein/logging
Logging
2019-05-07 17:42:37 +02:00
Emanuel Schütze 294ccf7301
Merge pull request #4667 from FinnStutzenstein/motionNumberingFIx
Fix numbering with amendments
2019-05-07 17:38:20 +02:00
Sean Engelhardt f0ffaef1e5 Add anchor tag to motion block
Adds `<a ...>` tags to motion block list and motion block detail
Allowing opening details in a new tab
2019-05-07 17:35:28 +02:00
GabrielMeyer 376f4e2a31 Implements a mechanism for a fallback theme
- If the previously selected theme is not available the default OpenSlides theme will be displayed.
- Before the current selected theme was loaded, no theme is displayed.
2019-05-07 17:32:28 +02:00
Emanuel Schütze 8bc7f8cb70
Merge pull request #4630 from MaximilianKrambach/assignment_globalno
include global abstain/no option
2019-05-07 17:30:43 +02:00
Emanuel Schütze 5d64ea1519
Merge pull request #4668 from GabrielInTheWorld/fixes-checkbox
Fixes state of the checkboxes in amendments
2019-05-07 17:25:09 +02:00
Emanuel Schütze 67b99c1baa
Merge pull request #4665 from GabrielInTheWorld/utilities
Fixes scrollbar in old firefox versions
2019-05-07 17:18:51 +02:00
Emanuel Schütze 38d572b34f
Merge pull request #4670 from FinnStutzenstein/fixMotionBlockSlide
Fix motion block slide
2019-05-07 17:14:01 +02:00
Finn Stutzenstein 82a2189b04
Merge pull request #4666 from FinnStutzenstein/operatorService
Proper updating of the viewUser in the OperatorService
2019-05-07 16:39:52 +02:00
FinnStutzenstein 02d82e20c1 websocket logging 2019-05-07 16:37:38 +02:00
Emanuel Schütze 95161d5dea
Merge pull request #4654 from GabrielInTheWorld/util-fixes
Some fields are only available if they are available
2019-05-07 16:25:39 +02:00
FinnStutzenstein 72a7a6fde0 Fix motion block slide 2019-05-07 16:18:13 +02:00
FinnStutzenstein f53d3c2069 Fix numbering with amendments 2019-05-07 16:12:47 +02:00
GabrielMeyer 41e2fb2f93 Fixes scrollbar in old firefox versions 2019-05-07 16:04:18 +02:00
GabrielMeyer e6c4e1d27b Fixes state of the checkboxes in amendments 2019-05-07 15:58:36 +02:00
FinnStutzenstein afb28f0f72 Proper updating of the viewUser in the OperatorService 2019-05-07 15:54:14 +02:00
GabrielMeyer 3d5f79a76c Fields are only available if they are available
- The user can change information about motions
- The user can send an invitation email
2019-05-07 15:03:57 +02:00
Finn Stutzenstein c560f511b5
Merge pull request #4607 from FinnStutzenstein/prioritizeClients
Prioritize clients and WS ping-pong-mechanism
2019-05-07 14:04:09 +02:00
Emanuel Schütze 17dbcca757
Merge pull request #4664 from emanuelschuetze/motionBlockPermission
Fixed motion block permission
2019-05-07 13:54:36 +02:00
FinnStutzenstein febbe9bba2 Prioritize clients with the right operator and added ping-pong mechanism 2019-05-07 13:43:52 +02:00
Emanuel Schütze 41c30eb730 Fixed motion block permission 2019-05-07 13:27:42 +02:00
Emanuel Schütze d218a86f69
Merge pull request #4662 from FinnStutzenstein/repoSpeed
Speedup DS and repo updates, DSUpdateSlots, lazyloading history objects
2019-05-07 13:26:21 +02:00
Emanuel Schütze a3bf5481ed
Merge pull request #4663 from GabrielInTheWorld/sorting
Fixes the listing of motions in a category
2019-05-07 12:47:20 +02:00
GabrielMeyer 11c565282f Fixes the listing of motions in a category
- Sorting by motion.category_weight
2019-05-07 12:26:25 +02:00
Emanuel Schütze 179ef39aca
Merge pull request #4661 from tsiegleauq/pdf-comment-paragraph
Fix Parsing for personal comments in bulk export
2019-05-06 16:59:49 +02:00
FinnStutzenstein fe81ea6ff9 Speedup DS and repo updates, DSUpdateSlots, lazyloading history objects 2019-05-06 16:33:36 +02:00
Emanuel Schütze 801010a936
Merge pull request #4655 from MaximilianKrambach/weight
fix sorting in category-sort
2019-05-06 16:25:36 +02:00
Sean Engelhardt 0f7733a25d Fix Parsing for personal comments in bulk export
Fixes an error where HTML in motion comments was parsed
wrong during PDF bulk export
2019-05-06 16:22:35 +02:00
Sean e1b8e74e8d
Merge pull request #4657 from tsiegleauq/service-worker-addons
Service Worker Updates
2019-05-06 13:59:07 +02:00
Sean Engelhardt e4d3e119d3 Service Worker Updates
Introdcues a new update service.
Listens to service-worker updates and shows a snack-bar to inform about updates.
Provides a function to manually check for updates.

The service worker tries to be consistent in it's own version and
updates in the background.
Some manuall trigger will be required to update, which is either a
reload or the execution of the provded check function

with help from
@FinnStutzenstein
2019-05-06 13:13:09 +02:00
Finn Stutzenstein 8fb12a6882
Merge pull request #4658 from FinnStutzenstein/fixUserSlide
Fixed user slide
2019-05-04 12:13:57 +02:00
FinnStutzenstein cc931bc8bf Fixed user slide 2019-05-04 08:35:54 +02:00
Maximilian Krambach 52c6e05aba fix sorting in category-sort 2019-05-02 11:45:49 +02:00
Maximilian Krambach f00303d753 include global abstain/no option
election polls with 'one vote per candidate' should have a
 global no/abstain option
2019-05-02 10:51:00 +02:00
Emanuel Schütze d7c6583b7e
Merge pull request #4647 from GabrielInTheWorld/extend-user-dialog
Adds the structure-level and participant-number to the user-list
2019-04-30 16:39:49 +02:00
Emanuel Schütze 9f5226c1d9
Merge pull request #4648 from FinnStutzenstein/motionBlockSlideTwoColumns
Dynamic a two column layout in motion block slides
2019-04-30 16:38:58 +02:00
Sean addc0cc3cc
Merge pull request #4653 from GabrielInTheWorld/sorting
Save motion category weight, handle auto update in categories
2019-04-30 16:18:48 +02:00
GabrielMeyer 33044a6eaa Handles 'auto-update'
- New motions in a category are appended to the end of the list.
- Removed motions are extracted from the list of motions.
2019-04-30 15:48:22 +02:00
Sean 524ff4a981
Merge pull request #4652 from FinnStutzenstein/sortMotionInCategories
Sort motions in categories
2019-04-30 14:28:09 +02:00
FinnStutzenstein 76880100f5 Sort motions in categories 2019-04-30 14:14:41 +02:00
Sean 83044acde5
Merge pull request #4650 from tsiegleauq/xlsx-addons
Add various extensions to the xlsx exporter
2019-04-30 10:55:46 +02:00
Sean Engelhardt d05a30bccb Add various extensions to the xlsx exporter 2019-04-30 10:34:01 +02:00
Emanuel Schütze 4507840788
Merge pull request #4646 from FinnStutzenstein/resetClientCache
Added button to reset the clients cache
2019-04-30 10:24:19 +02:00
Emanuel Schütze bccd9db076
Merge pull request #4649 from tsiegleauq/pdf-font-size-parsing
use ParseInt in PDF generation
2019-04-29 19:54:18 +02:00
Sean Engelhardt 945b2ce72a use ParseInt in PDF generation
Replace "+"(string) with parseInt(val, 10), since apparently some editors
copy `style="xy.zpt"` into a style tag
2019-04-29 12:43:22 +02:00
Sean 3dd659ae36
Merge pull request #4636 from FinnStutzenstein/assignmentAttachments
Add attachments to assignments
2019-04-29 11:35:39 +02:00
FinnStutzenstein ec7a7aadae Added button to reset the clients cache 2019-04-29 11:27:35 +02:00
FinnStutzenstein c234cfe698 Dynamic a two column layout in motion block slides 2019-04-29 11:20:12 +02:00
GabrielMeyer 8b489fcdc0 Adds the `structure-level` to the `user-list`
- The dialog shows the structure level of one user
- In the list-view the structure level and the participant number are displayed.
2019-04-29 10:35:24 +02:00
FinnStutzenstein 44b683e361 Add attachments to assignments 2019-04-29 10:31:28 +02:00
Emanuel Schütze 29aa6acdc5
Merge pull request #4574 from ostcar/new_django_version
Update django and other dependencys
2019-04-29 08:58:39 +02:00
FinnStutzenstein 1b15f6ea14 prohibit changes in projectiondefaults
resolves question in #4541
2019-04-29 08:25:49 +02:00
Oskar Hahn 65161cbbf8 Update django and other dependencys 2019-04-28 14:03:11 +02:00
Emanuel Schütze 3584dd5646
Merge pull request #4627 from tsiegleauq/virtual-scroll-statute
Add virtual scrolling to statute list
2019-04-28 13:57:30 +02:00
Emanuel Schütze 483d759c88
Merge pull request #4641 from normanjaeckel/FixMotionStateCreation
Server should not require restriction field for motion state. Fixed #…
2019-04-28 13:46:21 +02:00
Emanuel Schütze e20ff16755
Merge pull request #4642 from CatoTH/diff-bugfix-ins-beyond-paragraphs
Diff-Bugfix: Insertions/Deletions beyond paragraph boundaries
2019-04-28 13:44:43 +02:00
Tobias Hößl bc8739f017
Diff-Bugfix: Insertions/Deletions beyond paragraph boundaries 2019-04-28 11:27:28 +02:00
Emanuel Schütze 652968add3
Merge pull request #4634 from MaximilianKrambach/lastEmailSent
last_email_sent display and resend email
2019-04-27 21:32:16 +02:00
Maximilian Krambach d1eed23158 last_email_sent display and resend email 2019-04-27 21:16:28 +02:00
Norman Jäckel 3d6e87e1ef Server should not require restriction field for motion state. Fixed #4622. 2019-04-27 16:23:31 +02:00
Emanuel Schütze 0675bdcf46
Merge pull request #4635 from MaximilianKrambach/commentExport
make comment exportable if readable
2019-04-26 21:49:01 +02:00
Emanuel Schütze 23103362a5
Merge pull request #4617 from tsiegleauq/assignment-pdf
Create assignment PDF service
2019-04-26 21:46:04 +02:00
Emanuel Schütze ea93c65c3f
Merge pull request #4637 from tsiegleauq/catch-pdf-creation-bugs
Show errors during PDF generation
2019-04-26 21:41:46 +02:00
Emanuel Schütze 78c77efd7c
Merge pull request #4638 from FinnStutzenstein/fixRestrictionCheck
Fix restriction check for motions
2019-04-26 21:35:09 +02:00
Sean Engelhardt e520dd99e0 Create assignment PDF service
Exports the assignment detail as PDF
2019-04-26 16:23:48 +02:00
Emanuel Schütze 2a10dd4675
Merge pull request #4615 from FinnStutzenstein/silenceWsSendErrosAfterTermination
Silence errors after sending to a closed connection
2019-04-26 16:10:16 +02:00
Emanuel Schütze 729b7f151b
Merge pull request #4621 from tsiegleauq/workflow-state-creation
Temp Fix creation of Workflow States
2019-04-26 16:07:27 +02:00
FinnStutzenstein 7cfe22436e Fixed motion state and restriction
- Fixed restriction check for motions
- Send users via autoupdate on statechanges
2019-04-26 15:57:21 +02:00
Sean Engelhardt 680b6e04e4 Show errors during PDF generation
A lot of PDF-Erros are resolveable by the users themselves.
This helpes users to show them, which of their motions have
malformated HTML
2019-04-26 15:34:27 +02:00
FinnStutzenstein 6de9616c47 Silence errors after sending to a closed connection 2019-04-26 14:07:13 +02:00
Maximilian Krambach 395dfaf63f
Merge pull request #4628 from MaximilianKrambach/assignmentLayout
small assignment layout updates/fixes
2019-04-26 13:06:31 +02:00
Maximilian Krambach f16884388e make comment exportable if readable
conditions for the export button:
- comment is present and  readable for user
- comment is not in 'edit' mode
2019-04-26 12:45:57 +02:00
Sean Engelhardt afc6bb629e Fix layout of search value selector 2019-04-26 12:41:55 +02:00
Emanuel Schütze 7ed59a57b0
Merge pull request #4629 from tsiegleauq/export-order-adjustment
Adjust the export order and dialog order
2019-04-26 12:15:33 +02:00
Sean Engelhardt fdc169f1e9 Adjust the export order and dialog order
The order of the motion export dialog now fits to the motionImportExportHeaderOrder.
It will update dynamically
2019-04-26 11:54:08 +02:00
Sean 7c503024cc
Merge pull request #4633 from FinnStutzenstein/fixRequestingAllChanges
Fixed requesting all data after a connection lost
2019-04-26 11:13:00 +02:00
Maximilian Krambach ab6a53c2de small assignment layout updates/fixes 2019-04-26 10:11:30 +02:00
FinnStutzenstein 2a73c194dd Fixed requesting all data after a connection lost 2019-04-26 09:51:44 +02:00
Emanuel Schütze 11322a7231
Merge pull request #4632 from emanuelschuetze/translation20190425
Updated translations
2019-04-25 23:49:43 +02:00
Emanuel Schütze 8985d5c5e1 Updated translations 2019-04-25 23:35:57 +02:00
Emanuel Schütze 1e62501f05
Merge pull request #4608 from FinnStutzenstein/autoupdateOnPermissionChangeViaStateRestrictions
send autoupdate on state update for motions
2019-04-25 22:34:52 +02:00
Emanuel Schütze b7ae5fd8a8
Merge pull request #4631 from CatoTH/Bugfix-replacing-text-at-end-of-paragraph
Bugfix: inline diff for replaced text at end of paragraph
2019-04-25 22:26:38 +02:00
Emanuel Schütze ddd4588a1c
Merge pull request #4625 from MaximilianKrambach/assignmentSlide
Assignment/Assignment poll slide
2019-04-25 22:18:31 +02:00
Tobias Hößl e533fbad6d
Bugfix: inline diff for replaced text at end of paragraph 2019-04-25 22:08:21 +02:00
Emanuel Schütze a61a655715 More slide style improvements 2019-04-25 22:02:36 +02:00
Maximilian Krambach 1b1499a660 Assignment slides 2019-04-25 17:12:21 +02:00
Emanuel Schütze 6800f99ef0
Merge pull request #4624 from tsiegleauq/angular-7.2.14
Migrate to Angular version 7.2.14
2019-04-25 16:44:53 +02:00
Sean Engelhardt 03d935d633 Migrate to Angular version 7.2.14
New version of TS-Lint
New version of ngx-file-drop with breaking changes
npm audits
Removed Terser, should work out of the box again
2019-04-25 13:15:24 +02:00
Sean Engelhardt 98dec23b2f Add virtual scroling to statute list
"experimental" Virtual scrolling on the list of statutes.
It should load and behave way faster on huge amounts of data.
2019-04-25 12:57:11 +02:00
Emanuel Schütze 45609fadc0
Merge pull request #4610 from MaximilianKrambach/assignmentMobile
Assignment mobile
2019-04-25 10:42:25 +02:00
Emanuel Schütze e4f8346e49
Merge pull request #4626 from CatoTH/improve-inserted-lines
Bugfix: better detection for inserted paragraphs
2019-04-25 10:38:08 +02:00
Finn Stutzenstein 0c4076fbd7
Merge pull request #4616 from FinnStutzenstein/basicAssignmentSlide
Basic assignment slide
2019-04-25 10:11:23 +02:00
Maximilian Krambach 4b6e314e45 basic display for mobile view 2019-04-25 09:01:49 +02:00
Emanuel Schütze 5a8db608e6
Merge pull request #4623 from gsiv/dev/examplecom
Don't use yourdomain.com as an example domain
2019-04-25 08:22:59 +02:00
Tobias Hößl cbcc01d8e1
Bugfix: better detection for inserted paragraphs 2019-04-24 22:43:57 +02:00
Maximilian Krambach 259a408287
Merge pull request #4613 from MaximilianKrambach/assignmentFix
fix assignment calculations
2019-04-24 17:09:14 +02:00
Maximilian Krambach 847173cda3 fix assignment calculations 2019-04-24 16:49:54 +02:00
Emanuel Schütze 677caa4524
Merge pull request #4620 from MaximilianKrambach/tags_in_amendment
copy parent's tags to a new amendment
2019-04-24 16:19:16 +02:00
Gernot Schulz 5427cfe183 Don't use yourdomain.com as an example domain 2019-04-24 16:02:20 +02:00
Maximilian Krambach e77fdc6707 copy parent's tags to a new amendment 2019-04-24 16:00:17 +02:00
Emanuel Schütze c04c59b666
Merge pull request #4614 from FinnStutzenstein/verboseErrorOnMissingConfigs
verbose error message on missing configs
2019-04-24 15:23:53 +02:00
Sean Engelhardt 8bd57321a9 Temp Fix creation of Workflow States
Offers an empty error during the creation of new workflow states
2019-04-24 15:20:53 +02:00
Sean d4ac7441fa
Merge pull request #4606 from GabrielInTheWorld/motion-quick-dialog
Implements a dialog to edit meta information of one motion
2019-04-24 13:55:18 +02:00
GabrielMeyer 69b6aec288 Implements a dialog to edit meta information of one motion 2019-04-24 13:36:17 +02:00
Finn Stutzenstein 7a00f26537
Merge pull request #4618 from GabrielInTheWorld/tree-sort-agenda
Fixes showing the arrow to expand.
2019-04-24 10:38:51 +02:00
FinnStutzenstein 55dd2d1d6f Basic assignment and poll slide 2019-04-24 10:34:44 +02:00
Maximilian Krambach dc9fb73aba
Merge pull request #4619 from MaximilianKrambach/recoLabel
remove distracting empty mat-chip
2019-04-24 10:28:49 +02:00
Maximilian Krambach 18a3ea28b9 remove distracting empty mat-chip 2019-04-23 18:22:35 +02:00
GabrielMeyer c87c41ac56 Fixes showing the arrow to expand. 2019-04-23 16:35:41 +02:00
FinnStutzenstein 624a56d546 verbose error message on missing configs 2019-04-23 14:23:49 +02:00
Finn Stutzenstein d0c6fd1dd1
Merge pull request #4611 from tsiegleauq/error-page-redirect
Fix AuthGuard race conditions and false redirects
2019-04-23 13:44:59 +02:00
Sean Engelhardt 6a04d3ed0b Fix AuthGuard race conditions and false redirects
Fixes an error where the auth guard had race conditions
with the OpenSlides bootup routine (kinda hacky tbh)
Fixes false redirects in the Auth.Service

Also adjustes the file uploader to be a little more
usable.
2019-04-23 13:23:19 +02:00
Maximilian Krambach f4fb79d51c
Merge pull request #4595 from MaximilianKrambach/tagDisplay
add tag display in several views
2019-04-18 13:01:57 +02:00
Maximilian Krambach 9cdeaf9245 add tag display in several views
- call list sorting
- category sorting
- motion list
2019-04-18 12:46:07 +02:00
Sean 2b9f1a21a9
Merge pull request #4612 from MaximilianKrambach/personalNotebutton
personal note pdf only if personal note is present
2019-04-18 12:26:00 +02:00
Maximilian Krambach 4472ba9690 personal note pdf only if personal note is present 2019-04-18 11:37:49 +02:00
Sean 16ea66e9ed
Merge pull request #4609 from MaximilianKrambach/exportImportOrder
sort import/export columns for motions
2019-04-18 11:01:01 +02:00
Maximilian Krambach dc41c1ed78 sort import/export columns for motions
definitions are in motion-import-export-order.ts
2019-04-18 10:44:21 +02:00
Sean bf525cf852
Merge pull request #4575 from GabrielInTheWorld/tree-sort-agenda
Implements filtering the `sorting-tree.component`
2019-04-17 13:14:57 +02:00
GabrielMeyer cdc849de6d Implements filtering the `sorting-tree.component`
- Added filtering by visibility, like internal, public or hidden items
- Added option to collapse or expand all nodes
- Added also style for the dark theme
2019-04-17 12:41:16 +02:00
Sean 637c0fb78e
Merge pull request #4601 from MaximilianKrambach/callListPDF
call list improvements
2019-04-17 10:38:22 +02:00
FinnStutzenstein 3eb5273b8e send autoupdate on state update for motions 2019-04-16 15:45:59 +02:00
Sean d2260b02a7
Merge pull request #4598 from GabrielInTheWorld/package-crawler
Implements a crawler to find all directly used packages
2019-04-16 14:50:24 +02:00
Sean b581c350c6
Merge pull request #4584 from GabrielInTheWorld/form-validation-new
Validates creating a new user
2019-04-16 14:49:51 +02:00
GabrielMeyer 6de79fc96a Implements a crawler to find all directly used packages
- Holds a 'default' `README.md` with the default content.
- Writes down all found packages with links to their repositories.
2019-04-16 14:20:59 +02:00
Sean ebbb369124
Merge pull request #4605 from tsiegleauq/excel-frozen-rows
Enhance excel exporting
2019-04-16 13:25:29 +02:00
Maximilian Krambach aec7280002
Merge pull request #4351 from MaximilianKrambach/cleanup
cleanup of TODOS
2019-04-16 13:24:38 +02:00
Sean Engelhardt 9b9bf244c1 Enhance excel exporting 2019-04-16 13:04:10 +02:00
Maximilian Krambach 217186f435 cleanup of outdated TODOS and stubs 2019-04-16 12:47:48 +02:00
Maximilian Krambach 5f35fe8460 call list improvements (WIP)
- add extended recommendation label
- remove motion blocks, use the column for 'notes'
- don't break up tables
2019-04-16 12:00:45 +02:00
Sean f622d9b546
Merge pull request #4577 from MaximilianKrambach/assignmentLayout
Assignments layout and fixes
2019-04-16 11:31:33 +02:00
Maximilian Krambach 9dfac94099 assignment improvements
- layouting
- fix one-vote polls
- filter candidate list
- candidate sorting
- fix adding/removing of candidates
- avoid ui jumping
- fix quorum calculations
2019-04-16 09:42:07 +02:00
Finn Stutzenstein 0f1df91915
Merge pull request #4602 from FinnStutzenstein/clearClientCacheOnMigrations
Refresh clients cache when the database was migrated
2019-04-15 16:30:33 +02:00
FinnStutzenstein a715c0e432 Refresh clients cache when the database was migrated 2019-04-15 16:13:52 +02:00
Maximilian Krambach 72c3f27dba
Merge pull request #4600 from MaximilianKrambach/importfix
fix motion import oddity
2019-04-15 16:10:40 +02:00
Sean 7db327020f
Merge pull request #4604 from tsiegleauq/fix-select-export-motions
Hotfix exporting of selected motions
2019-04-15 15:55:47 +02:00
Sean Engelhardt 8a40ee3cbc Fix exporting of selected motions
Fixes an issue where the export button has been put in the
wrong view
2019-04-15 15:28:03 +02:00
GabrielMeyer b7799c2337 Validates creating a new user
- If a new user is created and neither the username, first name nor last name is set, a hint is displayed and the user is still in the creating mode.
- Also prevents that the client queries a user that does not exist.
2019-04-15 15:07:23 +02:00
Maximilian Krambach a831ccd2b2
Merge pull request #4593 from MaximilianKrambach/multiSelectMotionExport
Multi select motion export
2019-04-15 13:33:05 +02:00
Finn Stutzenstein e9a60a54fd
Merge pull request #4597 from GabrielInTheWorld/migrations
Adds a migration for projector changes
2019-04-15 13:27:36 +02:00
Maximilian Krambach 7d9ea4e55a multiselect motion export 2019-04-15 13:24:43 +02:00
Maximilian Krambach 48593acc25 disable multiselect options if nothing selected 2019-04-15 13:24:42 +02:00
Maximilian Krambach a670d85267 fix motion import ooddity
- lag due to undefined submitters
- additional text separator
2019-04-15 12:43:16 +02:00
Sean 2bd9172006
Merge pull request #4591 from MaximilianKrambach/tagFilter
Adds a 'tag' filter to motion lists
2019-04-15 12:30:07 +02:00
Sean 1bd9f09dd6
Merge pull request #4592 from MaximilianKrambach/manyStars
bulk set/unset favorite status
2019-04-15 12:24:46 +02:00
Finn Stutzenstein de7394d1cc
Merge pull request #4599 from FinnStutzenstein/fixCommentSectionUpdates
Updates the cache on comment section updates. Implements missing client
2019-04-15 11:11:18 +02:00
GabrielMeyer 79cd8e9917 Adds a migration for projector changes 2019-04-15 11:02:39 +02:00
FinnStutzenstein ce216204f1 Updates the cache on comment section updates. Implements missing client
code.
2019-04-15 10:54:34 +02:00
Maximilian Krambach 81c50f5b2f bulk set/unset favorite status 2019-04-15 10:52:18 +02:00
Finn Stutzenstein 259afa7f88
Merge pull request #4594 from FinnStutzenstein/modelStructureForAssignments
Background structure for assignments
2019-04-15 10:43:54 +02:00
FinnStutzenstein 9cfc0bbd42 Background structure for assignments
- moved some components
- added consistend namin scheme: (View)Assignment, (View)AssignmentPoll
(View)AssignmentPollOption and (View)AssignmentRelatedUser.
- Added precisionPipe, which needs to be added everywhere.
- Cleaned up converting deciml fields (as strings in the REST API) to
floats
- The repository creates the View* structure and enabled user updates.
2019-04-15 10:29:26 +02:00
Finn Stutzenstein e7624c0d1e
Merge pull request #4585 from FinnStutzenstein/projectorListCleanup
Put projector cards in own components in the listview
2019-04-15 08:10:01 +02:00
Maximilian Krambach b5a6669359 Adds a 'tag' filter to motion lists 2019-04-12 11:50:32 +02:00
FinnStutzenstein f44590b519 Put projector cards in own components in the listview 2019-04-12 07:15:22 +02:00
Finn Stutzenstein b05cd3af5a
Merge pull request #4580 from GabrielInTheWorld/form-validation
Fixes error from `mediafile-list.component` when logging out
2019-04-12 07:12:58 +02:00
Emanuel Schütze 2f9328c2d2
Merge pull request #4590 from emanuelschuetze/translations-201904
Updated translations
2019-04-11 23:23:10 +02:00
Emanuel Schütze 8072c26983
Merge pull request #4586 from FinnStutzenstein/unsetFontOnDelete
Unset font if the mediafile is deleted
2019-04-11 23:14:51 +02:00
Emanuel Schütze 9059191e91 Updated translations 2019-04-11 23:09:13 +02:00
Emanuel Schütze 58b5ec3f5e
Merge pull request #4573 from CatoTH/OS3-multi-paragraph-amendments
Creating multi-paragraph amendments
2019-04-11 21:18:16 +02:00
Tobias Hößl 5978868c37 Creating multi-paragraph amendments
- new config option to enable/disable multiple paragraphs
2019-04-11 17:00:25 +02:00
Emanuel Schütze cf7d3487d4
Merge pull request #4589 from MaximilianKrambach/updateFormPatch
don't autoupdate detail forms during editing
2019-04-11 16:43:54 +02:00
Maximilian Krambach a2b75194a1 don't autoupdate detail forms during editing 2019-04-11 16:06:05 +02:00
Emanuel Schütze e959ef9c52
Merge pull request #4587 from normanjaeckel/FixProjector
Fixed countdown on projector.
2019-04-10 16:45:38 +02:00
Norman Jäckel 8927982554 Fixed countdown on projector. 2019-04-10 08:48:57 +02:00
Emanuel Schütze c0564e0f5e
Merge pull request #4583 from FinnStutzenstein/fixProjectorSerializer
Protect element fields from the projector model. Fixes creation of
2019-04-09 21:19:26 +02:00
FinnStutzenstein 648aabc310 Unset font if the mediafile is deleted 2019-04-09 19:38:01 +02:00
FinnStutzenstein 5a1f638f8d Protect element fields from the projector model. Fixes creation of
projectors.
2019-04-09 17:15:16 +02:00
Emanuel Schütze f54360290f
Merge pull request #4582 from FinnStutzenstein/fixUnregisteredCollections
Fixed handling of unregistered resources
2019-04-09 16:38:30 +02:00
FinnStutzenstein dfaf8b552a Fixed handling of unregistered resources 2019-04-09 16:15:23 +02:00
GabrielMeyer 4994cc6ce8 Fixes error from `mediafile-list.component` when logging out
- If the user is seeing the mediafiles and wants to log out, an error occurred causing by querying an attribute from undefined object.
2019-04-09 15:30:49 +02:00
Finn Stutzenstein fc5f6f4e54
Merge pull request #4521 from normanjaeckel/RefactorStateAccessLevel
Refactored state access level by renaming state field to restriction.
2019-04-08 15:28:21 +02:00
FinnStutzenstein 23264849c9 client and small changes in the serializer 2019-04-08 14:56:32 +02:00
Norman Jäckel 6f24b7c169 Refactored state access level by renaming state field to restriction. 2019-04-08 14:56:14 +02:00
Maximilian Krambach 6f62e5c7e4
Merge pull request #4537 from MaximilianKrambach/assignments
assignment detail and list views
2019-04-08 10:25:56 +02:00
Emanuel Schütze 54ec8bbe55
Merge pull request #4576 from gsiv/bug/redis-config-typo
Fix typo in SESSION_REDIS configuration
2019-04-08 10:22:57 +02:00
Sean Engelhardt 054f76a5d4 Cleanups and enhancements
Cleans up and reviews some methods
2019-04-08 10:16:48 +02:00
Maximilian Krambach 464fb89b53 include per-poll values, some travis fix 2019-04-08 10:16:47 +02:00
Norman Jäckel e6daf32924 Added check for double serializer class registering.
Removed AssignmentShortPollSerializer.
2019-04-08 10:16:47 +02:00
Maximilian Krambach 52193e9fb2 Assignments 2019-04-08 10:16:46 +02:00
Gernot Schulz 58a0da7945 Fix typo in SESSION_REDIS configuration 2019-04-08 09:52:04 +02:00
Emanuel Schütze 3fd5d19daa
Merge pull request #4531 from ostcar/fix_config_key_to_id
Fixes problems with config.key_to_id
2019-04-08 09:02:52 +02:00
Sean 2f330933a0
Merge pull request #4461 from tsiegleauq/permission-list-view
Add permissions to ListViews
2019-04-06 21:33:44 +02:00
Sean Engelhardt bd33c59ddf Add permissions to ListViews
Adds the AuthGuard to certain routes
Adds an error-component
Also hides certain other elements where
permissions should apply
2019-04-06 21:13:17 +02:00
Oskar Hahn 41aed15426 Make the projector-system explicit async.
Also lock config.build_key_to_id
2019-04-06 06:40:15 +02:00
Maximilian Krambach 028c358a7f
Merge pull request #4567 from MaximilianKrambach/csvExportLabeledRecommend
export recommendations with extra labels
2019-04-05 13:17:42 +02:00
Emanuel Schütze 4ca8fccbea
Merge pull request #4571 from tsiegleauq/motion-list-show-id
Show sequential number in motion list
2019-04-05 13:11:06 +02:00
Maximilian Krambach e3c673b55e export recommendations with extra labels 2019-04-05 13:08:45 +02:00
Norman Jäckel aa9af9db8c
Merge pull request #4557 from FinnStutzenstein/removeUnnecessaryView
Remove unnecessary view (fixed #4549)
2019-04-05 12:44:36 +02:00
Sean Engelhardt 1dd8562dfc Show sequential number in motion list
Shows the sequential number (ID) in motion list
2019-04-05 11:48:48 +02:00
Emanuel Schütze 3c959df374
Merge pull request #4568 from MaximilianKrambach/motionNextPrev
set surrounding motions according to sorting in list view (fixes #4566)
2019-04-04 23:23:17 +02:00
Emanuel Schütze df915aad6d
Merge pull request #4561 from GabrielInTheWorld/administration
Checks the permissions
2019-04-04 23:02:22 +02:00
Emanuel Schütze bb98e9b120
Merge pull request #4569 from tsiegleauq/list-view-page-size
Enlarge page size
2019-04-04 22:47:38 +02:00
Emanuel Schütze 74713d78b7
Merge pull request #4570 from tsiegleauq/amendments-in-main-motion
Motion Amendments into PDF
2019-04-04 22:40:44 +02:00
Sean Engelhardt 995fa7af32 Motion Amendments into PDF
Support Amendments of initial motions in PDF
2019-04-04 13:22:12 +02:00
Sean Engelhardt 8236d1bf5b Enlarge page size
Enlarges the page size of all list views.
Also move the declaration of the page size into the base list view component
2019-04-04 12:10:45 +02:00
GabrielMeyer 4cdd4b3c34 Checks the permissions
- If the user has not the permissions to edit mediafiles, than he cannot edit or delete any files.
2019-04-04 11:08:54 +02:00
Emanuel Schütze 6364a04d22
Merge pull request #4562 from FinnStutzenstein/redisSessionTimeout
Set a longer socket timeout for redis session
2019-04-03 22:13:52 +02:00
Emanuel Schütze ab0e83ff0b
Merge pull request #4563 from FinnStutzenstein/catchEmailExceptions
Catch more email exceptiopns
2019-04-03 21:22:21 +02:00
Emanuel Schütze 58e0e4155e
Merge pull request #4556 from FinnStutzenstein/postgresAuthGroupSequence
Restart the AuthGroup id sequence on postgres
2019-04-03 21:16:42 +02:00
Emanuel Schütze a4319390ae
Merge pull request #4532 from ostcar/update_requirements
Update python requirements
2019-04-03 21:09:31 +02:00
Maximilian Krambach 9e2faefc79 set surrounding according to sorting in list view 2019-04-03 12:05:43 +02:00
Emanuel Schütze 492372d81c
Merge pull request #4554 from tsiegleauq/simple-excel-export
Export motions as excel document (.xlsx)
2019-04-03 09:18:45 +02:00
Emanuel Schütze 8dfeaa5b09
Merge pull request #4547 from tsiegleauq/projector-messages-rework
Add better projector messages
2019-04-03 09:05:11 +02:00
FinnStutzenstein b058bda4f6 Catch more email exceptiopns 2019-04-02 16:08:52 +02:00
FinnStutzenstein 231cb60f5a Set a longer socket timeout for redis session
Related to #4555
2019-04-02 14:24:39 +02:00
Sean Engelhardt a973ad1719 Export motions as excel document (.xlsx)
Adds exceljs library.
Extends the "motion export dialog" to support xlsx export with a specific set of rules similar
to CSV
2019-04-02 14:23:01 +02:00
Finn Stutzenstein fc3098b08f
Merge pull request #4560 from FinnStutzenstein/removeChatMessageClient
Remove the ChatMessage from the client
2019-04-02 13:24:55 +02:00
Finn Stutzenstein 864ab50306
Merge pull request #4552 from FinnStutzenstein/lostSessionMessageFix
Fix endless reconnections after a late WhoAmI
2019-04-02 12:36:34 +02:00
Sean Engelhardt 80dbe60749 Add better projector messages
Adds messages like in the mock ups
2019-04-02 12:31:21 +02:00
Finn Stutzenstein 29762ad89e
Merge pull request #4541 from FinnStutzenstein/projectionDefaults2
Projectiondefaults, width slider direct save
2019-04-02 12:30:20 +02:00
FinnStutzenstein 2c73b9b781 Remove the ChatMessage from the client 2019-04-02 12:28:19 +02:00
Finn Stutzenstein 2f10fad375
Merge pull request #4553 from FinnStutzenstein/removeMotionLogs
Remove motion logs
2019-04-02 12:12:31 +02:00
FinnStutzenstein d3e98ac158 Remove unnecessary view (fixed #4549) 2019-04-02 12:11:26 +02:00
Emanuel Schütze 2cd51728fe
Merge pull request #4559 from emanuelschuetze/offlineIndicator
Redesign offline indicator on projector
2019-04-02 11:51:59 +02:00
Emanuel Schütze 8c26f5286b Redesign offline indicator on projector 2019-04-02 11:32:34 +02:00
Emanuel Schütze ff41aa8061
Merge pull request #4551 from normanjaeckel/MotionReasonRequired
Fixed bug that motion reason is required if respective config value i…
2019-04-02 11:08:44 +02:00
Emanuel Schütze 7acfb7f080
Merge pull request #4548 from ostcar/fix_mass_decoding
decode only the needed data when calculating the required users
2019-04-02 11:03:39 +02:00
FinnStutzenstein 018df697fa Restart the AuthGroup id sequence on postgres 2019-04-02 07:51:13 +02:00
FinnStutzenstein 4308de3164 Remove motion logs 2019-04-01 09:04:22 +02:00
Finn Stutzenstein 55c162809c
Merge pull request #4540 from FinnStutzenstein/trackFirefoxIssues
Track storage fallbacks via count users
2019-04-01 08:49:55 +02:00
FinnStutzenstein cee6d55b82 Projectiondefaults, width slider direct save 2019-04-01 08:48:52 +02:00
FinnStutzenstein 042fe29ffc Fix endless reconnections after a late WhoAmI 2019-04-01 08:20:57 +02:00
Norman Jäckel 861dc1c02e Fixed bug that motion reason is required if respective config value is set. 2019-03-30 15:00:54 +01:00
Oskar Hahn 206eb9bcba decode only the needed data when calculating the required users 2019-03-29 22:38:12 +01:00
Norman Jäckel 8f393a1877
Merge pull request #4546 from tsiegleauq/websocket-debugging
Add websocket debug output
2019-03-29 11:53:27 +01:00
Norman Jäckel 193514ec9a
Merge pull request #4545 from tsiegleauq/projector-offline-indicator
Add offline indicator to projector
2019-03-29 11:49:40 +01:00
Sean Engelhardt 615e33f396 Add websocket debug output
Adds socket.warn functions to have a higher change to find errors
2019-03-29 11:37:47 +01:00
Sean Engelhardt 488690dc8d Add offline indicator
Also adds a function to the offline service to "actually" determinate if we are offline or not
2019-03-29 11:09:52 +01:00
Finn Stutzenstein b130a28a4c
Merge pull request #4544 from FinnStutzenstein/delayedOfflineMessage
delay the offline message
2019-03-29 09:11:04 +01:00
Emanuel Schütze 13364c7475
Merge pull request #4543 from ostcar/redis_connection_pool
Use redis connection pool
2019-03-29 08:40:28 +01:00
FinnStutzenstein ccf37758d4 delay the offline message 2019-03-29 08:36:18 +01:00
Oskar Hahn 77a1975369 Use redis connection pool 2019-03-27 22:51:33 +01:00
FinnStutzenstein f8699450fb Track storage fallbacks via count users 2019-03-26 12:29:08 +01:00
Maximilian Krambach 5d51c798fe
Merge pull request #4166 from MaximilianKrambach/adminResetWarning
prevent accidental self- lockout in multiSelect
2019-03-26 11:42:47 +01:00
Maximilian Krambach 85491b6c8f prevent accidental self-lockout in multiSelect 2019-03-26 09:49:55 +01:00
Emanuel Schütze b38ff3fb96
Merge pull request #4539 from FinnStutzenstein/localStorageFirefox
Uses storage fallback on incorrect IndexedDB initialization
2019-03-25 17:30:41 +01:00
Emanuel Schütze 9df28ae9bc
Merge pull request #4535 from MaximilianKrambach/sortings
add default sorting of tags and motion blocks
2019-03-25 17:16:06 +01:00
Emanuel Schütze 3a520705f1
Merge pull request #4538 from tsiegleauq/history-storrage
Fix history mode store access
2019-03-25 17:13:57 +01:00
Finn Stutzenstein da553b129a
Merge pull request #4534 from GabrielInTheWorld/util-fixes
Adjusts pagination's listener to default code style.
2019-03-25 16:18:00 +01:00
FinnStutzenstein b267722901 Uses storage fallback on incorrect IndexedDB initialization 2019-03-25 16:12:42 +01:00
Sean de3681454f
Merge pull request #4533 from tsiegleauq/speaker-item-sorting
Add manual sorting to Speaker list
2019-03-25 15:28:50 +01:00
Sean 527c31f9aa
Merge pull request #4536 from GabrielInTheWorld/fix-hammer
Includes `hammerjs`.
2019-03-25 15:28:14 +01:00
Sean Engelhardt 4e975af915 Fix history mode store access
prevents local storage access from certain services
when in history mode
2019-03-25 15:03:26 +01:00
GabrielMeyer cd2907381b Includes `hammerjs`. 2019-03-25 14:41:47 +01:00
Maximilian Krambach 4efede0396 add default sorting of tags and motion blocks 2019-03-25 13:44:41 +01:00
Sean Engelhardt c0a2072cc2 Add manual sorting to Speaker list
Also create CSS Theme file to prevent side effects from theming
2019-03-25 13:34:10 +01:00
GabrielMeyer 15ca6cfec7 Adjusts pagination to default code style. 2019-03-25 13:04:42 +01:00
Sean 279b8b1d25
Merge pull request #4524 from GabrielInTheWorld/util-fixes
Adds listener to the pagination
2019-03-25 10:09:01 +01:00
Sean dbe26df610
Merge pull request #4511 from tsiegleauq/clean-the-repocleanup
Cleanup the repo-cleanup
2019-03-25 10:05:24 +01:00
Sean Engelhardt 3cd58aa6c5 Cleanup the repo-cleanup
Adds a "patch" function to allow more modles to send patches with minimal data
rather than just the whole model.

Re-Adds the throwing of some errors to prevent developers from calling
methods that should not be called
2019-03-25 09:45:12 +01:00
Oskar Hahn 5dde08b4b5 Update python requirements 2019-03-23 21:31:53 +01:00
Emanuel Schütze 0532a23219
Merge pull request #4530 from emanuelschuetze/translation-20190322
Updated translations
2019-03-22 17:05:56 +01:00
Emanuel Schütze fdfb3b9088 Updated translations 2019-03-22 16:13:33 +01:00
Emanuel Schütze 16159fb60d
Merge pull request #4529 from emanuelschuetze/fixCSS
Fixed CSS styling error
2019-03-22 16:06:32 +01:00
Emanuel Schütze 0cc59c6596 Fixed CSS styling error 2019-03-22 15:47:22 +01:00
Emanuel Schütze faa0a6077e
Merge pull request #4527 from tsiegleauq/list-of-speakers-template
Add prettier list of speakers
2019-03-22 15:30:22 +01:00
Sean Engelhardt ab19d66022 Add prettier list of speakers
Also cleans up some CSS and unifies some Drag-N-Drop Component
styles.
2019-03-22 13:25:03 +01:00
GabrielMeyer 6e628ea4cd Adds listener to the pagination
- Subscription to change events from pagination are used to set the made settings initial.
2019-03-22 13:05:03 +01:00
Emanuel Schütze 5c0be51c7e
Merge pull request #4525 from GabrielInTheWorld/correct-rendering-text
Sanitizing the inner html text.
2019-03-22 11:52:26 +01:00
GabrielMeyer fca92ef9e2 Sanitizing the inner html text. 2019-03-21 17:39:57 +01:00
Emanuel Schütze 0527b814bc
Merge pull request #4522 from emanuelschuetze/improvements
Minor layout improvements
2019-03-21 15:38:50 +01:00
Emanuel Schütze b9a3308b60
Merge pull request #4523 from tsiegleauq/motion-amendment-fixes
Add motion to motion change observation
2019-03-21 15:38:31 +01:00
Sean Engelhardt b472a3851b Add motion to motion change observation
Also fixes an some navigation for motion and amendments
2019-03-21 11:31:02 +01:00
Emanuel Schütze e54d0cf087 Minor layout improvements
- Improved motion block slide layout
- Increase width of statute paragraph title form field
- hide identifier in motion form for unprivileged users/submitters
2019-03-20 22:00:35 +01:00
Emanuel Schütze 63a2c6b05b
Merge pull request #4520 from tsiegleauq/websocket-fixes
Fix websocket connection for port 80
2019-03-20 15:08:01 +01:00
Sean Engelhardt 56289af867 Fix websocket connection for port 80
port 80 was interpretet as <IP>:/ws before.
Certain browser did not like the colon...
2019-03-20 14:44:35 +01:00
Emanuel Schütze fbbd5fa135
Merge pull request #4516 from normanjaeckel/FixCommands
Fixed commands.
2019-03-20 13:19:09 +01:00
Emanuel Schütze 68175b8cb7
Merge pull request #4519 from tsiegleauq/list-z-levels
Fix some z-level related issues
2019-03-20 13:13:15 +01:00
Emanuel Schütze a3ed1ae00c
Merge pull request #4518 from normanjaeckel/NewPermInternalMotions
Added new permission to see motions in internal state (so called auth…
2019-03-20 13:03:48 +01:00
Sean 460c99e683
Merge pull request #4515 from emanuelschuetze/fixStatuteAmendment
Fixed statute amendment detection in motion form
2019-03-20 12:56:12 +01:00
Norman Jäckel 16cde2cd96 Added new permission to see motions in internal state (so called authorized users). 2019-03-20 12:47:26 +01:00
Sean Engelhardt ca18d59ac3 Fix some z-level related issues
Fixes some z-layer effects
2019-03-20 12:45:34 +01:00
Norman Jäckel 35198f6e64 Fixed commands. 2019-03-20 08:50:57 +01:00
Norman Jäckel 94080df663
Merge pull request #4517 from emanuelschuetze/fixComments
Fixed permission check for manage comments
2019-03-20 08:47:11 +01:00
Emanuel Schütze a20803401f Fixed permission check for manage comments 2019-03-19 21:26:28 +01:00
Emanuel Schütze d62f1538ab
Merge pull request #4489 from GabrielInTheWorld/tree-sort-agenda
Replaces the DragDrop-Tree
2019-03-19 19:46:03 +01:00
Sean 5fbf682754
Merge pull request #4472 from tsiegleauq/countdown-control-component
Add Countdowns in projector detail
2019-03-19 17:52:08 +01:00
Sean Engelhardt 183d2738e0 Add Countdowns in projector detail
Adds Pretty countdown controls, detetion and edit in
Projector template.

Countdown list was removed
2019-03-19 17:20:38 +01:00
Emanuel Schütze dfab9730dc Fixed statute amendment detection in motion form 2019-03-19 16:49:45 +01:00
GabrielMeyer 76d760bd41 Replaces the old `angular2tree` with a custom drag&drop tree
Calculates the direction of the moving.

Finishes the moving of nodes in same level

Adds some style

Sets the padding dynamically

Adds placeholder depends on the horizontal movement

Set the placeholder at the correct place, so the user can see, where he will drop the moved node

Finishes moving of nodes

- Old parents change their option to expand.
- New parents change their option to expand.
- If the user moves a node between nodes with a higher level, the node will be moved to the next index with same or lower level.

Fixes the visibility of moved node

- If the new parent is not visible, the moved node will not be seen.

If the user moves an expanded node, the new parent should expanded, too, if it's not already.

Sending successfully data to the server

- Sorting the items

Handles moving nodes between parent and children

- If the user moves a node between a parent and its children, the children will be relinked to the moved node as their new parent.

Replaces the old `sorting-tree` to a new one

- The new `sorted-tree` replaces the old `sorting-tree`.
- The old package `angular-tree-component` was removed.
- The user will only see the buttons to save or cancel his changes, if he made changes.
- The buttons, that do not work currently, were removed.

Adds a guard to check if the user made changes.

- If the user made changes but he has not saved them, then there is a dialog that will prompt to ask for confirmation.

Before cancelling the changes the user has to confirm this.
2019-03-19 13:19:35 +01:00
Emanuel Schütze 5d045a894a
Merge pull request #4514 from CatoTH/amendmentsInViewMotion
Add amendments as dependencies in ViewMotion [2]
2019-03-17 22:04:22 +01:00
Tobias Hößl 5d9128403a
Bugfix: Diff 2019-03-17 20:31:25 +01:00
FinnStutzenstein 6cb4b9a691 Add amendments as dependencies in ViewMotion 2019-03-17 18:01:10 +01:00
Emanuel Schütze 1c02d5f496
Merge pull request #4513 from CatoTH/OS3-Bugfix-Amendment-Diff-Extraction
Bugfix in motion's diff-view: correct amendment diff
2019-03-16 20:43:54 +01:00
Emanuel Schütze 5482157536
Merge pull request #4510 from CatoTH/OS3-Line-Highlighting-Bugfixes
Bugfixes: Highlighting wo CRs, better scrolling
2019-03-16 20:39:39 +01:00
Tobias Hößl 1764447704
Bugfix in motion's diff-view: correct amendment diff 2019-03-16 14:07:05 +01:00
Tobias Hößl e62648c719
Bugfixes: Highlighting wo CRs, better scrolling 2019-03-16 13:34:55 +01:00
Emanuel Schütze e03ec00567
Merge pull request #4512 from FinnStutzenstein/fixOpenSlidesServiceOnLogin
Fixed errors on login
2019-03-16 12:11:44 +01:00
FinnStutzenstein cd7b700aea Fixed errors on login 2019-03-15 15:29:02 +01:00
Sean 398ffc30ea
Merge pull request #4411 from MaximilianKrambach/sort_alternative
fix sort performance issues for dropdowns
2019-03-15 09:58:32 +01:00
Maximilian Krambach 9c67b1c773 sorting from inside base repositories
Authors: FinnStutzenstein, MaximilianKrambach, tsiegleauq
2019-03-15 08:12:50 +01:00
Emanuel Schütze ccc81df434
Merge pull request #4509 from tsiegleauq/more-user-permission-fixes
Fix certain permission checks
2019-03-14 18:22:29 +01:00
Sean Engelhardt 5d35a0fa5f Fix certain permission checks
Fixed permissions in topic detail, agenda list and user detail.
Fixes Z-Level of head bar and mat-spinner.
2019-03-14 17:50:33 +01:00
Sean 09ddc83d30
Merge pull request #4508 from tsiegleauq/cleanup-motion-detail-ds-repos
Cleanup Repos
2019-03-14 11:40:56 +01:00
Emanuel Schütze 4950ca084f
Merge pull request #4507 from normanjaeckel/ManyToManyMigrationsFix
Hotfix for #4501: Skipped many to many related objects autoupdate sig…
2019-03-14 11:34:48 +01:00
Emanuel Schütze 52be65a315
Merge pull request #4506 from normanjaeckel/Hotfix4491
Hotfix for #4491: Autoupdate for motion when change recommendation ch…
2019-03-14 11:34:34 +01:00
Sean Engelhardt d4e10702cc Cleanup Repos
Add an getViewModelListBehaviorSubject that simplifies
how to get most model lists in the view

unified update, delete and create methods and removed redundant code from the repos
(where it was possible)

cleaned up the motion detail to not directly use the DataStore

Add information about the "main model" to all ViewModels, to call the
correct constructor in the BaseRepo
2019-03-14 10:46:33 +01:00
Sean 74bcc4bcea
Merge pull request #4500 from tsiegleauq/workflow-order
workflow table state sort
2019-03-13 16:09:44 +01:00
Sean ae3ce54f57 workflow table state sort
Sorts the Workflow table to be more predictable

Adds new shared SCSS table rules.
Adds a default with as 100% (there have never been half tables)
Overwrites the rules for sticky tables
2019-03-13 15:54:35 +01:00
Sean 7734a502d8
Merge pull request #4502 from FinnStutzenstein/fixRedirectionOnDelayedWhoAmI
Fixed redirection on login subpages (fixed #4474)
2019-03-13 15:31:21 +01:00
Norman Jäckel baacda2b8e Hotfix for #4501: Skipped many to many related objects autoupdate signal during migrations. 2019-03-13 10:58:01 +01:00
Norman Jäckel 8f50caf481 Hotfix for #4491: Autoupdate for motion when change recommendation changes. 2019-03-13 09:40:04 +01:00
Finn Stutzenstein 6d66ec5b5d
Merge pull request #4493 from FinnStutzenstein/baseComponent
Cleanup optional parameter from BaseComponent
2019-03-12 12:41:09 +01:00
FinnStutzenstein e6ec164fe9 Fixed redirection on login subpages (fixed #4474) 2019-03-12 12:01:05 +01:00
Emanuel Schütze b30340b72f
Merge pull request #4497 from tsiegleauq/motionslides-linenumber-height
Fix motion slide line number alignment
2019-03-11 14:25:01 +01:00
Finn Stutzenstein 3ac7788fe8
Merge pull request #4471 from FinnStutzenstein/permissionsInWhoAmI
rework login system (again)
2019-03-11 14:03:46 +01:00
Sean 35b27b967f Fix motion line number alignment 2019-03-11 13:56:25 +01:00
FinnStutzenstein eb4537c1bf rework login system (again) 2019-03-11 13:45:17 +01:00
Emanuel Schütze e13a849c19
Merge pull request #4498 from tsiegleauq/fix-path-matching
Fix path matching
2019-03-11 13:23:03 +01:00
Emanuel Schütze 0ac9125d66
Merge pull request #4496 from emanuelschuetze/translation-20190311
Updated translations
2019-03-11 12:58:22 +01:00
Sean 245f3a5a27 Fix path matching
Fixed an error where navigation to not-lazy-loaded was prevented by full
path-matching.
Was preventing the sites for Search, Legal Notice and PP to show up
2019-03-11 12:33:55 +01:00
Emanuel Schütze 5139fe8365 Updated tranlstions 2019-03-11 12:28:34 +01:00
Emanuel Schütze d251bd15e6
Merge pull request #4492 from tsiegleauq/history-filter
Fix history history filter for null
2019-03-11 12:25:37 +01:00
Emanuel Schütze 8ce8286ea2
Merge pull request #4494 from tsiegleauq/agenda-filter-opendone
Fix agenda status filter
2019-03-11 12:23:24 +01:00
Emanuel Schütze 3684701ab6
Merge pull request #4495 from FinnStutzenstein/viewItemTitle
ViewItem title (fixes #4464)
2019-03-11 12:21:21 +01:00
FinnStutzenstein aa81bf38c3 ViewItem title (fixes #4464) 2019-03-11 11:21:34 +01:00
Sean 8ca1a4256c Fix agenda status filter
Fixes an issue where the status filter in the agenda list did not do
nothing
2019-03-11 11:04:29 +01:00
FinnStutzenstein 64eab79d3b Cleanup optionalparameter from BaseComponent 2019-03-11 10:49:57 +01:00
Sean 4e62e9253e Fix history history filter for null
Fixes an issue where the history filter was throwing an error
if there were deleted objectsy
2019-03-11 10:29:12 +01:00
Finn Stutzenstein d10dfb0915
Merge pull request #4469 from MaximilianKrambach/speakertime
clarifying duration service usage
2019-03-11 08:07:41 +01:00
Emanuel Schütze 0419ea629f
Merge pull request #4487 from CatoTH/OS3-Bugfix-Amendment-Status-Handling
Bugfix: Amendment statuses
2019-03-09 23:14:29 +01:00
Tobias Hößl 6b685924d9 Bugfix: Amendment statuses 2019-03-09 22:48:21 +01:00
Emanuel Schütze 1ecc7f4baa
Merge pull request #4485 from tsiegleauq/user-detail-template-fixes
User detail template fixes
2019-03-09 22:06:15 +01:00
Emanuel Schütze f4b798d6a2
Merge pull request #4479 from FinnStutzenstein/losSpeakerCount
(current) list of speakers: show amount of waiting speakers
2019-03-09 21:54:59 +01:00
Emanuel Schütze cee7c39c7d
Merge pull request #4481 from tsiegleauq/speaker-list-perms
Prevent drag and final versions without perms
2019-03-09 21:49:08 +01:00
Emanuel Schütze a26c44ca73
Merge pull request #4483 from tsiegleauq/motion-block-perms
Motion block permission fixes
2019-03-09 21:41:12 +01:00
Emanuel Schütze 2e2bf9bf54
Merge pull request #4482 from FinnStutzenstein/sortAgendaOnProjector
Fallback to id when sorting the agenda
2019-03-09 21:40:51 +01:00
Emanuel Schütze 023eb54773
Merge pull request #4488 from ostcar/fix_config_key_to_id
Fix a race condition when creating config.key_to_id
2019-03-09 21:27:24 +01:00
Sean Engelhardt 6acecccc6e Motion block permission fixes
Adds fixes to motion block permission checks.
Users with "Can See motion"
Can see motion blocks in list view

The menu-column in motion blocks list will be completely hidden
without "Motion Can Manage" permissions

In motion block list view, the motion will be displayed with
identifier rather than just the title
2019-03-09 21:22:56 +01:00
Oskar Hahn 8409378e00 Fix a race condition when creating config.key_to_id 2019-03-09 18:55:58 +01:00
Emanuel Schütze fc7a3a7f51
Merge pull request #4486 from tsiegleauq/amendment-wizzard-fixes
Fix amendment creation
2019-03-08 20:56:43 +01:00
Emanuel Schütze 5e7c604c4b
Merge pull request #4480 from FinnStutzenstein/sortMotionBlocksOnSlide
Sort motions on the motion block slide
2019-03-08 20:49:18 +01:00
Sean Engelhardt 07d3ea4c25 Fix amendment creation
Categories and blocks not appear after (paragraph based) amendment
creation.
Reason for amendments is now required if the config was set
accordingly
2019-03-08 16:45:45 +01:00
Emanuel Schütze 07c723a7dc
Merge pull request #4475 from FinnStutzenstein/addTextDecorationToHtmlWhitelist
Add text-decoration to bleach whitelist
2019-03-08 16:19:32 +01:00
FinnStutzenstein d90e88fa53 Sort motions on the motion block slide 2019-03-08 16:16:05 +01:00
FinnStutzenstein 66ebdc4f8a Add text-decoration to bleach whitelist, fix tinymce toolbar 2019-03-08 15:11:55 +01:00
Sean Engelhardt 62e3256c54 User detail template fixes
Adds a new template to user detail, to show user information in multiple
lines

Also adds a new feature to the headbar. Long titles (over title slot) will
break using ellipsis
2019-03-08 14:51:48 +01:00
Emanuel Schütze 3490ff3ca4
Merge pull request #4477 from FinnStutzenstein/projectorScroll
projector scroll and contdown offset
2019-03-08 14:32:42 +01:00
FinnStutzenstein 5fff7d24ec projector scroll and contdown offset 2019-03-08 13:17:43 +01:00
Emanuel Schütze 0290449b8b
Merge pull request #4452 from FinnStutzenstein/reworkPersonalNotes
rework personal notes
2019-03-08 12:45:54 +01:00
FinnStutzenstein f198a21543 rework personal notes 2019-03-08 12:09:53 +01:00
Emanuel Schütze 40e5ea0a1d
Merge pull request #4473 from FinnStutzenstein/themeInLoginData
Added theme to login data
2019-03-08 12:01:32 +01:00
FinnStutzenstein 887c1a3516 Fallback to id when sorting the agenda 2019-03-08 11:59:07 +01:00
Sean Engelhardt 985fe9cc8b Prevent drag and final versions without perms
Fixes an issue where users without manage rights
were able to use the drag and drop feature of the
list of speakers.
Also hides "modified final version" prints without
sufficient permissions.

Alters OSPerms to support "and" operators,
so "perm" and "other condition" is now possible
2019-03-08 11:53:25 +01:00
Emanuel Schütze 16b6c814cf
Merge pull request #4478 from FinnStutzenstein/AmendmentNumbering
Fix blanks for amendments
2019-03-08 11:27:42 +01:00
FinnStutzenstein f60e66c1a8 (current) list of speakers: show amount of waiting speakers 2019-03-08 11:15:53 +01:00
FinnStutzenstein 138a52d278 Fix blanks for amendments 2019-03-08 11:05:42 +01:00
Sean 83ff758977
Merge pull request #4456 from tsiegleauq/motion-modules
Add more motion modules
2019-03-08 11:01:19 +01:00
Sean Engelhardt 6a421f8f6b Add more motion modules
Seperates the previously large motion module in various smaller
and very small feature modules.
Motion Detail, and all direct dependancies to Motion Detail
is now an own module.
This significantly increases the response time of openslides 3
2019-03-08 10:43:54 +01:00
FinnStutzenstein a1018e62e2 Added theme to login data 2019-03-08 09:19:05 +01:00
Emanuel Schütze 70191ce455
Merge pull request #4470 from FinnStutzenstein/motionSLideRecommendationFix
Replace recommendation on client and server for motion slide
2019-03-07 16:55:53 +01:00
Emanuel Schütze 6b7aaeac6f
Merge pull request #4442 from MaximilianKrambach/zindex
fix legalnotice and privacy z-index issue
2019-03-07 15:40:32 +01:00
Maximilian Krambach 9cdc909d25 fix legalnotice and privacy z-index issue 2019-03-07 15:06:41 +01:00
FinnStutzenstein ed4b1c80f1 Replace recommendation on client and server for motion slide 2019-03-07 08:52:33 +01:00
Maximilian Krambach e05874cf6f clarifying duration service usage 2019-03-06 16:54:00 +01:00
Finn Stutzenstein cc21c77667
Merge pull request #4466 from MaximilianKrambach/ripple
disable some unnecessary ripples in motion detail view
2019-03-06 15:49:02 +01:00
Maximilian Krambach 21893f00b8 disable some unnecessary ripples in motion detail view 2019-03-06 15:35:27 +01:00
Finn Stutzenstein 4fedae63a8
Merge pull request #4468 from FinnStutzenstein/fixIsort
Resort python import for isort 4.3.11 (fixes #4467)
2019-03-06 15:14:12 +01:00
Jochen Saalfeld dcccfb41b5
Merge pull request #4462 from FinnStutzenstein/fixIsStable
Fixed SW registration issues due to pending mikrotasks
2019-03-06 15:09:43 +01:00
FinnStutzenstein ecdfdf4b87 Resort python import for isort 4.3.11 (fixes #4467)
One dot imports are again behind two dot imports since this new isort
release.
2019-03-06 14:54:03 +01:00
Maximilian Krambach b978029fff
Merge pull request #4432 from MaximilianKrambach/csvExport
csv example export refactor
2019-03-06 11:29:55 +01:00
Maximilian Krambach 0ddded4a86 csv example export refactor
- make csv example data respect config separators
- refactor at a more central place
2019-03-06 11:03:51 +01:00
Norman Jäckel d9369ab9c1
Merge pull request #4201 from normanjaeckel/ManyToManyFix
Fixed autoupdate for m2m relation.
2019-03-06 09:31:18 +01:00
Emanuel Schütze ad653de915
Merge pull request #4450 from FinnStutzenstein/offlineOperator
offline operator
2019-03-06 09:24:52 +01:00
Norman Jäckel 01a61ab292 Fixed autoupdate for m2m relation. Fixed #4055. 2019-03-06 08:58:52 +01:00
Emanuel Schütze 6588cd9cd4
Merge pull request #4463 from FinnStutzenstein/fixInSomeGroups
Fix inSomeGroups for the superadmin
2019-03-06 08:57:36 +01:00
FinnStutzenstein b0d4851651 Fix inSomeGroups for the superadmin, delete empty comments 2019-03-06 08:35:00 +01:00
FinnStutzenstein e1fcda7890 Fixed SW registration issues due to pending mikrotasks 2019-03-06 08:15:19 +01:00
FinnStutzenstein 0c6a7b9c4b offline operator 2019-03-06 07:50:54 +01:00
Emanuel Schütze 118b853a91
Merge pull request #4458 from tsiegleauq/foce-service-worker
Add Service Work(e|a)r(round)
2019-03-05 15:03:40 +01:00
Emanuel Schütze 1fecf941c8
Merge pull request #4459 from FinnStutzenstein/fixUpdatingMotions
set allow_null for integerfields, when they are not required
2019-03-05 15:02:26 +01:00
Emanuel Schütze 171433c050
Merge pull request #4457 from GabrielInTheWorld/opening-tab-motion-list
Fixes clicking on the group-cell to change settings
2019-03-05 14:35:26 +01:00
FinnStutzenstein 20e2639323 set allow_null for integerfields, when they are not required 2019-03-05 14:23:01 +01:00
Sean Engelhardt 3e4dffd7a4 Add Service Work(e|a)r(round)
uses the promise in returned by .bootstrapModule
to register the serviceworker if required.
Seems to work reliable, even in unstable environments.
Requires production mode to comprehend.
(at least ng build --prod)
2019-03-05 14:06:36 +01:00
GabrielMeyer 85f9897f42 Fixes clicking on the group-cell to change settings
Now, the user can click on the whole group-cell to change some settings like groups, gender and member-number.
2019-03-05 12:43:53 +01:00
Emanuel Schütze 4349f2eb11
Merge pull request #4449 from MaximilianKrambach/tinyMCE_blur
change config update behavior for editors
2019-03-04 22:16:27 +01:00
Emanuel Schütze d081b90ff1
Merge pull request #4451 from FinnStutzenstein/moreSearch
Search in related objects
2019-03-04 21:56:37 +01:00
Emanuel Schütze b1991fbc65
Merge pull request #4455 from ostcar/disable_restricted_data_future_lock
Disable the future-lock when updating the restircted data cache
2019-03-04 21:51:10 +01:00
Emanuel Schütze d071bb1d47
Merge pull request #4454 from emanuelschuetze/motion-detail-layout-fix
Reduce height of controls to fix linenumbering layout.
2019-03-04 21:38:56 +01:00
Oskar Hahn dd4754d045 Disable the future-lock when updating the restircted data cache
Before this commit, there where two different locks when updating the restricted
data cache. A future lock, what is faster but only works in the same thread. The
other lock is in redis, it is not so fast, but also works in many threads.

The future lock was buggy, because on a second call of update_restricted_data
the same future was reused. So on the second run, the future was already done.

I don't see any way to delete. The last client would have to delete it, but there
is no way to find out which client the last one is.
2019-03-04 21:37:00 +01:00
Emanuel Schütze 176fb9943d Reduce height of controls to fix linenumbering layout.
in motion detail view with outside numbering
2019-03-04 15:27:19 +01:00
Emanuel Schütze 37f9d5c94a
Merge pull request #4453 from emanuelschuetze/fixPdf
Fixed linenumbering error on building motion pdf (checks if element i…
2019-03-04 15:26:49 +01:00
Emanuel Schütze 22783f876b Fixed linenumbering error on building motion pdf (checks if element is null). 2019-03-04 15:02:06 +01:00
FinnStutzenstein 9198058bd7 Search in related objects 2019-03-04 13:36:34 +01:00
Maximilian Krambach cc5e38faad change config update behavior for editors
tinyMCE editors will not update after a timeout, but when focus changes
or the editor is destroyed
2019-03-04 11:50:07 +01:00
Emanuel Schütze 4174f70d2b
Merge pull request #4448 from normanjaeckel/SetStateView
Set state view
2019-03-04 11:17:33 +01:00
Emanuel Schütze 13eb764668
Merge pull request #4447 from normanjaeckel/FixOnDelete
Fixed on_delete field attr. Fixed #4405
2019-03-04 11:12:01 +01:00
Norman Jäckel e22274653d Added identifier to saved fields on multiple state management. 2019-03-01 21:11:27 +01:00
Norman Jäckel c21d8be108 Revert "fix identifier setting on mass setstate"
This reverts commit e870ed495a.
2019-03-01 21:09:01 +01:00
Norman Jäckel 9eec2404dd Fixed on_delete field attr. Fixed #4405 2019-03-01 20:53:01 +01:00
Emanuel Schütze 4366f753f4
Merge pull request #4446 from emanuelschuetze/projector-h1
Minor projector css changes
2019-03-01 15:13:21 +01:00
Emanuel Schütze ff410a4954 Minor projector css/wording changes 2019-03-01 14:52:29 +01:00
Emanuel Schütze 40de87c5b4
Merge pull request #4444 from FinnStutzenstein/stableElementsCleanup
clean up stable projectorelements, if they have an error
2019-03-01 14:03:19 +01:00
Emanuel Schütze c8c55ce597
Merge pull request #4441 from FinnStutzenstein/closReference
One global clos reference. More projector buttons for the clos view
2019-03-01 13:37:28 +01:00
Emanuel Schütze 6e4a110116 List of speakers template 2019-03-01 13:17:30 +01:00
FinnStutzenstein d0e6681aad One global clos reference. More projector buttons for the clos view 2019-03-01 13:17:26 +01:00
FinnStutzenstein 43f084438d clean up stable projectorelements, if they have an error 2019-03-01 13:03:55 +01:00
Emanuel Schütze c140399fa7
Merge pull request #4440 from FinnStutzenstein/clockFontColor
set the clock color to the header color of the projector
2019-03-01 12:35:41 +01:00
Finn Stutzenstein 94cd032f79
Merge pull request #4443 from FinnStutzenstein/countdownMigrationFix
Fixed countdown model
2019-03-01 12:32:43 +01:00
FinnStutzenstein ab0955d890 Fixed countdown model 2019-03-01 12:10:49 +01:00
FinnStutzenstein d3773bc8e8 set the clock color to the header color of the projector 2019-03-01 12:06:46 +01:00
Finn Stutzenstein 69fe4632f4
Merge pull request #4419 from MaximilianKrambach/countdown
countdown: new title field, description made optional
2019-03-01 12:02:50 +01:00
Emanuel Schütze b576d2c396
Merge pull request #4439 from MaximilianKrambach/cssState
consolidate state css colors
2019-03-01 11:24:50 +01:00
Maximilian Krambach 44d16eb244 countdown: new title field, description optional 2019-03-01 11:22:09 +01:00
Maximilian Krambach b704a3b09f consolidate state css colors 2019-03-01 11:11:13 +01:00
Emanuel Schütze 08e076f4a4
Merge pull request #4438 from FinnStutzenstein/addItemNumberToTopicTitle
Add item number to topic title
2019-03-01 10:50:53 +01:00
FinnStutzenstein 3f77cc7b24 Add item number to topic title, hide clos slide for one projector 2019-03-01 10:26:52 +01:00
Emanuel Schütze 573cdd88a2
Merge pull request #4427 from FinnStutzenstein/motionProjectionMode
motion projection mode is optional and sensitive for the config
2019-03-01 10:23:55 +01:00
FinnStutzenstein 384597afb9 motion projection mode is optional and sensitive for the config 2019-03-01 10:08:57 +01:00
Emanuel Schütze a9de755047
Merge pull request #4437 from emanuelschuetze/translations20190228
Updated translations
2019-02-28 23:00:11 +01:00
Emanuel Schütze 4de14f4100 Updated translations 2019-02-28 22:46:38 +01:00
Emanuel Schütze f8e0718a22
Merge pull request #4436 from tsiegleauq/projector-detail-ui
Clean projector detail interface
2019-02-28 22:29:29 +01:00
Emanuel Schütze 2257991aba Projector detail template improvements 2019-02-28 22:15:07 +01:00
Sean Engelhardt 587a0fe443 Clean projector detail interface
Alters the projector detail interface to provide better usability.
Alters the dragging slightly to have a nice preview and smoother
transitions.
2019-02-28 22:14:33 +01:00
Emanuel Schütze d77abf5934
Merge pull request #4435 from MaximilianKrambach/motion_deleteCategory
fix unsetting some values
2019-02-28 19:24:40 +01:00
Maximilian Krambach 4e3948a24d fix unsetting some values
- Category prefix
- category in motion multiSelect
2019-02-28 19:06:32 +01:00
Emanuel Schütze 0c1abe561b
Merge pull request #4433 from tsiegleauq/speaker-repo
Speaker repo
2019-02-28 16:21:14 +01:00
Emanuel Schütze 8c68e93596
Merge pull request #4434 from MaximilianKrambach/stopProopagation
fix click events in user + mediafile views
2019-02-28 16:18:10 +01:00
Maximilian Krambach feca9e4a18 fix click events in user + mediafile views
stopped propagation on soome buttons and menus
2019-02-28 16:05:28 +01:00
Emanuel Schütze 51026286cb
Merge pull request #4429 from FinnStutzenstein/clearRepositories
clear repositories and extra DS clear on logout
2019-02-28 15:59:12 +01:00
Emanuel Schütze 24008da0df
Merge pull request #4430 from FinnStutzenstein/fixSlideMargin
Fix slide container margin
2019-02-28 15:36:11 +01:00
FinnStutzenstein 7dee5acc7e Fix slide container margin 2019-02-28 15:23:43 +01:00
Emanuel Schütze 3f7f12e3ad
Merge pull request #4431 from MaximilianKrambach/resetPassword
permission for admins to reset passwords
2019-02-28 14:33:04 +01:00
Sean Engelhardt 03c590c66d Speaker repo
Add an own repository service to manage speakers
2019-02-28 14:26:31 +01:00
Maximilian Krambach 036ce4f02c permission for admins to reset passwords 2019-02-28 11:29:58 +01:00
FinnStutzenstein 3432c66d4d clear repositories and extra DS clear on logout 2019-02-28 11:04:19 +01:00
Emanuel Schütze 9e2d42f9f4
Merge pull request #4426 from FinnStutzenstein/addElementtoPreview
Add elements to preview button
2019-02-28 10:45:18 +01:00
Finn Stutzenstein 77e192719d
Merge pull request #4424 from FinnStutzenstein/reviveGlobalSearch
Revive the global search.
2019-02-28 09:54:01 +01:00
FinnStutzenstein 80e236e5b0 Add elements to preview button 2019-02-28 09:37:30 +01:00
Emanuel Schütze 770de5b7d1
Merge pull request #4425 from FinnStutzenstein/agendaProjectionHotfix
Hotfix for #4408
2019-02-28 09:34:14 +01:00
FinnStutzenstein 85903dbb44 Hotfix for #4408 2019-02-28 09:09:32 +01:00
FinnStutzenstein 2e0353618d Revive the global search.
Fixed leftovers from the viewModel restructure. Repositories always have a verboseName now. Does not implement new logic to follow related models (e.g. motions->submitters).
2019-02-28 08:56:03 +01:00
Emanuel Schütze f532a60b36
Merge pull request #4423 from emanuelschuetze/translations-20190227
Updated translations
2019-02-27 23:26:42 +01:00
Emanuel Schütze 11b6a2c831 Updated translations 2019-02-27 23:06:29 +01:00
Emanuel Schütze e59327efd5
Merge pull request #4421 from MaximilianKrambach/setMultiStateFix
fix identifier setting on mass setstate
2019-02-27 22:31:18 +01:00
Emanuel Schütze 9bb0efe57f
Merge pull request #4418 from tsiegleauq/projector-font-color
Add custom h1 color to slides
2019-02-27 22:28:00 +01:00
Emanuel Schütze 367df3b095
Merge pull request #4409 from FinnStutzenstein/motionBlockSlide
Add referenced motions by the server (fixes #4383)
2019-02-27 22:22:11 +01:00
Emanuel Schütze 1968a83123
Merge pull request #4417 from MaximilianKrambach/agendaDetail
fix agenda editing button
2019-02-27 22:18:44 +01:00
Emanuel Schütze c7129edb02
Merge pull request #4420 from MaximilianKrambach/fixMoveToItem
fix assign url in motion- moveToItem
2019-02-27 22:17:31 +01:00
Emanuel Schütze 5c840893ac
Merge pull request #4422 from normanjaeckel/FixCascadeAndAutoupdate
Fixed deletion of motions with change recommendations. Fixed #4415.
2019-02-27 21:14:59 +01:00
Norman Jäckel 197ff7264c Fixed deletion of motions with change recommendations. Fixed #4415. 2019-02-27 20:16:51 +01:00
Maximilian Krambach e870ed495a fix identifier setting on mass setstate 2019-02-27 18:14:25 +01:00
Maximilian Krambach aa33bf37a8 fix assign url in motion- moveToItem 2019-02-27 17:10:27 +01:00
Sean Engelhardt 90c131a6aa Add custom h1 color to slides
Uses css-variabled and dom manipulation to change
the projectors h1 color on the fly.
Will have issues with multiple projectors nested in the same view
2019-02-27 15:57:18 +01:00
Maximilian Krambach 4cf754946c fix agenda editing button 2019-02-27 14:56:00 +01:00
Emanuel Schütze 1ce6804a43
Merge pull request #4416 from MaximilianKrambach/categoryHotFix
category sort view hotfix
2019-02-27 14:30:36 +01:00
Maximilian Krambach 8677667a10 hotfix 2019-02-27 13:47:38 +01:00
Emanuel Schütze f9ea181a93
Merge pull request #4414 from MaximilianKrambach/smallFixes
marking and repairing translations
2019-02-27 12:04:01 +01:00
Maximilian Krambach 308b593763 check for invalid motions on import 2019-02-27 11:24:04 +01:00
Maximilian Krambach e4c79fd371 marking and repairing translations 2019-02-27 10:31:45 +01:00
Emanuel Schütze 422789e2b8
Merge pull request #4412 from emanuelschuetze/translations20190226
Updated translations
2019-02-27 08:56:08 +01:00
FinnStutzenstein 4cde0431ab Add referenced motions by the server (fixes #4383) 2019-02-27 07:35:52 +01:00
Emanuel Schütze edf7a06f72 Updated translations 2019-02-26 23:01:17 +01:00
Emanuel Schütze 23c1857fa6
Merge pull request #4389 from FinnStutzenstein/chyron
current speaker chyron
2019-02-26 22:36:10 +01:00
Emanuel Schütze 2a35a6010a
Merge pull request #4399 from MaximilianKrambach/bulkUser
bulk import of users
2019-02-26 22:24:53 +01:00
Emanuel Schütze c3b3b35cf0 Chyron template design 2019-02-26 22:21:20 +01:00
Maximilian Krambach be83d9b0aa bulk import of users 2019-02-26 22:05:38 +01:00
FinnStutzenstein f039293c09 current speaker chyron 2019-02-26 21:56:59 +01:00
Emanuel Schütze fc10ee168c
Merge pull request #4400 from MaximilianKrambach/previews
refactor import  preview strings
2019-02-26 21:47:08 +01:00
Emanuel Schütze 4186d21deb
Merge pull request #4406 from FinnStutzenstein/closSlide
clos slide content
2019-02-26 17:34:18 +01:00
Emanuel Schütze d94ed59670
Merge pull request #4403 from tsiegleauq/change-font
Add custom fonts for projector
2019-02-26 17:20:02 +01:00
Emanuel Schütze 0dd2dcc352
Merge pull request #4410 from tsiegleauq/more-swipe-gestures
Add swipe gestures into motion detail
2019-02-26 17:13:23 +01:00
Emanuel Schütze 17bd6d71bd Template work for slide components. 2019-02-26 17:10:39 +01:00
FinnStutzenstein 7be436594e clos slide content 2019-02-26 17:10:33 +01:00
Sean Engelhardt 0ceddd2662 Add swipe gestures into motion detail
Adds swipe gestures into motion detail, to nacigate them easily on mobile devices
Animations are left out for now, since they are complex to develop.

Alters the navigation gesture slightly to only work from the edge of a given screen
2019-02-26 15:30:16 +01:00
Emanuel Schütze 56779e0d8f
Merge pull request #4404 from MaximilianKrambach/multiSelectLine
normalize multiSelect actions
2019-02-26 14:48:50 +01:00
Emanuel Schütze 393b5f095f
Merge pull request #4407 from FinnStutzenstein/noOfflineMessageOnProjector
Hide the offline message on the projector
2019-02-26 14:45:28 +01:00
FinnStutzenstein 64139992b4 Hide the offline message on the projector 2019-02-26 14:06:10 +01:00
Maximilian Krambach 570bc10766 fix projector on users 2019-02-26 13:20:40 +01:00
Maximilian Krambach 93260aaf29 refactor import preview strings 2019-02-26 13:12:40 +01:00
Sean Engelhardt 0053bb56a2 Add custom fonts (WIP)
Pretty much angular magic
2019-02-26 11:38:30 +01:00
Maximilian Krambach 5cedf6eb58 normalize multiSelect actions 2019-02-26 11:06:42 +01:00
Emanuel Schütze 798af8c5ab
Merge pull request #4402 from emanuelschuetze/fixes-20190225
Fixes
2019-02-25 18:40:44 +01:00
Emanuel Schütze 4d62d99099 Fixes
- use always color black on projector, also in dark mode
- show border for projector preview
- Fix projector logo margin by using img instead of os-logo
- Use also 'username' in invitation email subject
2019-02-25 18:26:27 +01:00
Emanuel Schütze 5ad99e034b
Merge pull request #4401 from MaximilianKrambach/bodyText
show save feedback on more config fields
2019-02-25 17:52:00 +01:00
Maximilian Krambach 22d46f4774 show save feedback on more config fields 2019-02-25 17:32:58 +01:00
Emanuel Schütze eb78c694fc
Merge pull request #4396 from emanuelschuetze/isProjectable
Fixed error message that viewmodel is not projectable.
2019-02-25 15:47:06 +01:00
Emanuel Schütze f863670540
Merge pull request #4397 from tsiegleauq/refinement-fixes
Add small fixes
2019-02-25 15:40:18 +01:00
Emanuel Schütze ff82fceaa9 Fixed error message that viewmodel is not projectable. 2019-02-25 15:34:12 +01:00
Sean Engelhardt b9923201e4 Add small fixes
Fixes an error where the back arrow in the motion block detail was missing
Adds a prompt before deletion of Change Recommendation in motion details
Adds timestamp localisation for history mode
2019-02-25 14:19:57 +01:00
Emanuel Schütze 889aad48ed
Merge pull request #4395 from FinnStutzenstein/fixAgendaItemDeletion
Fixed deletion of agenda items.
2019-02-25 11:54:21 +01:00
FinnStutzenstein 70d7f49afe Fixed deletion of agenda items.
Introduced by #4352
2019-02-25 11:29:01 +01:00
Jochen Saalfeld 0f24ba1951
Merge pull request #4394 from jsaalfeld/fix_serverside_upload_limit
increasing default upload size
2019-02-25 09:43:11 +01:00
Jochen Saalfeld f546cd9e27
increasing default upload size 2019-02-25 09:28:32 +01:00
Emanuel Schütze eb2c866e5c
Merge pull request #4393 from emanuelschuetze/translations-20190224
Updated translations
2019-02-24 22:24:12 +01:00
Emanuel Schütze 9fb25c8d60 Updated translations 2019-02-24 22:08:28 +01:00
Emanuel Schütze 3073844039
Merge pull request #4392 from emanuelschuetze/ui-improvments
UI improvments
2019-02-24 21:40:56 +01:00
Emanuel Schütze a077ca85f5 UI improvments
- Use lanaguage files for tinymce.
- Fixed user import error.
- Improve colors for default/dark theme.
- Fixed missing translation.
2019-02-24 20:07:19 +01:00
Emanuel Schütze 15012f4a8b
Merge pull request #4390 from tsiegleauq/hotfix-sort-performance
Disable various expensive sorting functions
2019-02-23 14:24:44 +01:00
Sean Engelhardt 3785545a35 Disable various expensive sorting functions
Prevents the usage of: "sortViewUsersByConfig" of the userRepository
since it's an incredibe heavy operation for ~500 (real) users.

I would advice to sort the datastore rather than the lists
in the view to prevent unnecessary sorting overhead
2019-02-22 17:17:29 +01:00
Emanuel Schütze 3e2b201ee2
Merge pull request #4387 from GabrielInTheWorld/change-dark-theme
Changes the primary palette for dark theme
2019-02-22 17:02:02 +01:00
GabrielMeyer f989be36ad Changes the primary palette for dark theme
- Added a custom palette (`#c31c23`)
- Set the new primary palette for dark theme

Changes some styles depending on theme

- Removed hard-coded colors
- Set color depending on theme

Prettified
2019-02-22 16:27:42 +01:00
Emanuel Schütze ecf16d1400
Merge pull request #4388 from GabrielInTheWorld/correct-rendering-text
Adds sanitizer to render text correctly
2019-02-22 14:08:22 +01:00
GabrielMeyer efe8f3e862 Adds sanitizer to render text correctly
Sanitized the text, which is displayed, to show formatting like
centering, bold etc.

Sanitized the text for projectors
2019-02-22 12:12:08 +01:00
Emanuel Schütze 6d28374c9f
Merge pull request #4385 from GabrielInTheWorld/opening-tab-motion-list
Added anchor column
2019-02-22 12:10:48 +01:00
Finn Stutzenstein fc2963f00a
Merge pull request #4381 from FinnStutzenstein/closSlide
Current list of speaker slide
2019-02-22 11:33:45 +01:00
FinnStutzenstein 63f1802d7a (Current) list of speaker slide 2019-02-22 10:40:28 +01:00
Sean 497a3ec71d
Merge pull request #4386 from tsiegleauq/preload-modules
Preloads modules on site component
2019-02-22 10:19:56 +01:00
Sean Engelhardt 3329932d27 Preloads modules on site component
Adds module preloading on site modules.
2019-02-22 10:04:50 +01:00
GabrielMeyer 1694daaa9c Added anchor column
Added an anchor column, so the user can open a separate tab.

prettified

Changed name of variable

Resolves answer from pull-request

- Moved the style for the anchor columns to `styles.scss`
- Set the anchor column to the last place in the array
2019-02-22 09:29:10 +01:00
Emanuel Schütze 46e9c83423
Merge pull request #4257 from GabrielInTheWorld/4217
Adds notifications if multiple users want to edit the same motion
2019-02-21 23:09:24 +01:00
GabrielMeyer 80cb8051f6 Adds notifications if multiple users want to edit the same motion.
Fixes #4217 Adds notifications

- Created a class to define notification-objects, which should notify other persons editing the same motion.
- Added functions to send notifications, listen to them and unsubscribing them.
- Added a warning-function to the `base-view.ts`, which raises the snack bar with the given message and has no duration.

Fixes #4217

- Removed unnecessary lines of code.
- Fixed merge.

Prettified

- Added a random number to identify different user.
- Now the user can sign in as the same user, but still receive a message if multiple people edit the same motion.

Fix the detail of motions

- If the user does not click to edit, then the `editNotificationSubscription` was not set.
2019-02-21 22:37:49 +01:00
Emanuel Schütze 4c4a2c600b
Merge pull request #4384 from tsiegleauq/mediafiles-on-fly
Add mediafiles upload from motion form
2019-02-21 22:16:43 +01:00
Emanuel Schütze deb80ddf37
Merge pull request #4382 from FinnStutzenstein/agendaSlide
Agenda item list slide
2019-02-21 22:11:40 +01:00
FinnStutzenstein 3f58538afb Agenda item list slide 2019-02-21 21:56:40 +01:00
Sean Engelhardt 46a229bb67 Add mediafiles upload from motion form
Refactors the media file upload component into
a shared component to be used in both normal pages
and dialogs.
A dialog was addes into the media file "edit" view
to upload and set attachments on the fly.
2019-02-21 16:48:19 +01:00
Emanuel Schütze c0cd3bc252
Merge pull request #4380 from FinnStutzenstein/motionBlockSlide
Motion block slide
2019-02-21 15:23:42 +01:00
Emanuel Schütze 80a061db38 Motion block slide template 2019-02-21 15:06:14 +01:00
FinnStutzenstein 2abe71313c Motion block slide 2019-02-21 14:01:02 +01:00
Emanuel Schütze 650054dfc9
Merge pull request #4373 from normanjaeckel/HistoryPermission
Added new permission to see the history.
2019-02-21 13:07:07 +01:00
Emanuel Schütze e97c308747
Merge pull request #4352 from FinnStutzenstein/losSlide
List of speakers slide
2019-02-21 13:00:02 +01:00
Emanuel Schütze c799c3bb6b List of speakers template 2019-02-21 12:34:45 +01:00
FinnStutzenstein 7ef36e93c6 List of speakers slide 2019-02-21 12:34:41 +01:00
Sean Engelhardt a86af342eb Add history permission into client
Requires the permission "core.can_see_history" to see the history in the navigation.
Disables navigating in the timeline and clearing the history for everyone than than the super admin
2019-02-21 11:48:03 +01:00
Norman Jäckel d06a4a5c6d Added new permission to see the history. 2019-02-21 11:45:40 +01:00
Emanuel Schütze f4f8b8422f
Merge pull request #4376 from tsiegleauq/pdf-list-fixes
Adds extra cases for PDF CR lists
2019-02-21 09:54:29 +01:00
Emanuel Schütze 5a5b82316a
Merge pull request #4378 from tsiegleauq/pdf-footer-fix
Fix PDF-Footer logos
2019-02-21 09:18:59 +01:00
Emanuel Schütze 3bcb3de249
Merge pull request #4375 from tsiegleauq/pdf-motion-tag
Add tags to motion pdf
2019-02-21 09:12:29 +01:00
Emanuel Schütze 68667f904f
Merge pull request #4379 from tsiegleauq/translate-user-number
Add "No." as translateable
2019-02-21 08:56:41 +01:00
Sean Engelhardt 53ea73ccde Add "No." as translateable
To display user numbers, No. is now translateable
2019-02-20 16:17:05 +01:00
Jochen Saalfeld 0975de7432
Merge pull request #4377 from tsiegleauq/angular725
Update to angular 7.2.5
2019-02-20 15:25:46 +01:00
Sean Engelhardt da3e8dc355 Fix PDF-Footer logos
Adds a routine to extract the pdf footer images
before the footer was generated
2019-02-20 15:02:30 +01:00
Sean Engelhardt 8f83fc1bd5 Update to angular 7.2.5
Adds new update to angular 7.2.5 including fresh npm packages.
vulnerabilities currently concern PDF and dev-packages only
2019-02-20 13:13:34 +01:00
Sean Engelhardt 7f86f3af64 Adds extra cases for PDF CR lists
Adds a new function to detect "Fake lists", in PDF documents
and treats them accordingly.
Enhances the Layout of PDFs with CR-Mode UL/OL lists.
2019-02-20 11:43:22 +01:00
Sean Engelhardt f2a4be702a Add tags to motion pdf
Adds tags to motion pdf. Adjusts the export dialog to also support selecting and deselecting
tags. Increases the target with of the export dialog to 1100px so the tags also fit there.
Not too pretty, yet effective
2019-02-20 10:11:26 +01:00
Emanuel Schütze 6eea064862
Merge pull request #4374 from normanjaeckel/DeleteLogoFile
Reset logo configs when logo is deleted.
2019-02-19 22:01:45 +01:00
Emanuel Schütze 659b91326c
Merge pull request #4372 from emanuelschuetze/translations-20190219
Updated translations
2019-02-19 21:46:30 +01:00
Norman Jäckel 4b6ce77d36 Reset logo configs if logo is deleted. 2019-02-19 21:45:41 +01:00
Emanuel Schütze 29ba4a61e6 Updated translations 2019-02-19 21:32:24 +01:00
Emanuel Schütze c1a818a368
Merge pull request #4370 from normanjaeckel/FixAgendaHidden
Fixed permission check for hidden and internal items.
2019-02-19 19:55:33 +01:00
Emanuel Schütze 26b1c6b74d
Merge pull request #4371 from tsiegleauq/os3-pdf-h-padding
Add margin to H-tags in PDF
2019-02-19 17:40:04 +01:00
Emanuel Schütze 8ab66418ac
Merge pull request #4369 from normanjaeckel/HistoryForMotionChangeRecommendations
Added history information for motion change recommendations.
2019-02-19 17:26:31 +01:00
Sean Engelhardt ee3fb7d7ef Add margin to H-tags in PDF
Margins to H tags and some motion HTML-PDF refinement
2019-02-19 17:02:40 +01:00
Norman Jäckel 6585c072ae Fixed permission check for hidden and internal items. 2019-02-19 14:04:49 +01:00
Norman Jäckel 085d2f58cb Added history information for motion change recommendations. 2019-02-19 13:41:31 +01:00
Emanuel Schütze 667fe61e94
Merge pull request #4368 from MaximilianKrambach/minorStuff
minor improvements
2019-02-19 13:22:48 +01:00
Maximilian Krambach 4c8da7b04d minor improvements
- add a 'lock' symbol to hidden files
- default disable (and rename) hidden filter status
- limit display of workflow states for restricted users
- remove supporter sorting
- mark other strings for translation
- fix new workflow id for statute amendments
- remove csv file type check (on Windows file type is always empty)
2019-02-19 13:05:51 +01:00
Emanuel Schütze f09a39a3c3
Merge pull request #4366 from emanuelschuetze/fixes
several fixes and improvements
2019-02-18 17:25:54 +01:00
Emanuel Schütze c9c4566c08 several fixes and improvements
- Add projector logo/headerimage
- Fixed opening multiselect action menu for users.
- Used defined toolbar color for multiselect mode.
- (server) Added check for 'request.data._mutable = True' to edit user
  profile as normal user.
2019-02-18 16:40:46 +01:00
Emanuel Schütze 6c8fbcfc07
Merge pull request #4365 from MaximilianKrambach/hideUserList
user detail page display permission update
2019-02-18 15:58:40 +01:00
Emanuel Schütze 399a941ebf
Merge pull request #4364 from tsiegleauq/listview-ontrack
Force DataSource to refresh
2019-02-18 15:47:06 +01:00
Maximilian Krambach 567a53db03 user detail page display permission update 2019-02-18 15:38:29 +01:00
Sean Engelhardt 57be0a5bea Force DataSource to refresh
Fixed a bug where data in MatTableDataStore was not updating.
Also:
Cleaned redundant list view sorting and filtering functions
2019-02-18 14:23:33 +01:00
Jochen Saalfeld 6c65fa0665
Merge pull request #4362 from jsaalfeld/fix_dockerfile
switch to proper npm run build for client
2019-02-18 11:10:06 +01:00
Jochen Saalfeld 374704e9d6
switch to proper npm run build for client 2019-02-18 10:37:12 +01:00
Emanuel Schütze cc45525678
Merge pull request #4355 from MaximilianKrambach/amendmentbuttons
placement of paragraph amendment buttons (fixes #4345)
2019-02-18 09:45:48 +01:00
Emanuel Schütze 1920eb18c7
Merge pull request #4361 from CatoTH/OS3-Diff-Bugfix-With-Newlines
Diff-Bugfix: Newlines and split paragraphs
2019-02-18 09:40:04 +01:00
Emanuel Schütze 69539cacbc
Merge pull request #4246 from CatoTH/OS3-Slides-LineNumbering-Diff
Initial support for line numbering and CR in Projector
2019-02-18 09:19:16 +01:00
Maximilian Krambach 24139048c6 placement of paragraph amendment buttons (fixes #4345) 2019-02-18 09:07:40 +01:00
Tobias Hößl 0e6bdf9fbc
Diff-Bugfix: Newlines and split paragraphs 2019-02-17 20:28:19 +01:00
Emanuel Schütze 29b8a8b2ac
Merge pull request #4273 from MaximilianKrambach/ie11
IE 11 / Edge compatibility
2019-02-15 23:14:32 +01:00
Maximilian Krambach 2ba9aca7ac Activate polyfills for supporting IE11 and Edge 2019-02-15 22:26:54 +01:00
Tobias Hößl 7b2e116f51 Change reco default value, Slide test cases 2019-02-15 15:15:58 +01:00
FinnStutzenstein 35cd49e4fe read crmode from the projector element 2019-02-15 14:56:41 +01:00
Tobias Hößl 453fedbc3e Initial support for line numbering and change recommendations in Projector
Read projector settings from the config
Preamble, styling fixes
Styling fixes
Show amendments inside of the motion view
Amendment view
Projector and statute paragraphs
Bugfix: Imports
2019-02-15 14:56:40 +01:00
Emanuel Schütze a3f9d46a6d
Merge pull request #4349 from FinnStutzenstein/mediafileSlide
Basic mediafile slide
2019-02-15 14:55:55 +01:00
Emanuel Schütze 43c11168ac
Merge pull request #4354 from CatoTH/OS3-LineNumbering-Range-Bugfix
Bugfix: wrong line numbers in change recommendation dialog
2019-02-15 14:46:30 +01:00
FinnStutzenstein d1508161d2 Basic mediafile slide 2019-02-15 14:41:56 +01:00
Emanuel Schütze 2b471bac2b
Merge pull request #4350 from MaximilianKrambach/minorTodos
fix baseFilter for comments
2019-02-15 14:15:18 +01:00
Emanuel Schütze bdcaff2cce
Merge pull request #4353 from tsiegleauq/pdf-amendments
Add PDF for paragraph based amendments
2019-02-15 14:12:50 +01:00
Tobias Hößl e9e8abeb0e
Bugfix: wrong line numbers in change recommendation dialog 2019-02-15 14:02:48 +01:00
Sean Engelhardt d22ec6f34d Add PDF for paragraph based amendments
Also add some more pdf fixes
2019-02-15 13:42:01 +01:00
Maximilian Krambach af0e85a956 fix baseFilter for comments 2019-02-15 13:06:09 +01:00
Maximilian Krambach edd22eeef6
Merge pull request #4348 from MaximilianKrambach/fixStatute
fix statute paragraph creation for delegates
2019-02-15 12:38:47 +01:00
Finn Stutzenstein 9e794c4669
Merge pull request #4344 from FinnStutzenstein/countdowns
Countdown slide and controls
2019-02-15 12:37:23 +01:00
FinnStutzenstein 2801e28704 Countdown slide and controls 2019-02-15 12:21:23 +01:00
Maximilian Krambach 3262dd0da8 fix statute paragraph creation for delegates 2019-02-15 12:11:54 +01:00
Emanuel Schütze a5eee7c99c
Merge pull request #4347 from emanuelschuetze/translations-20190214
Update translations
2019-02-14 22:35:31 +01:00
Emanuel Schütze ff407468f0 Update translations 2019-02-14 22:17:52 +01:00
Emanuel Schütze 4025e27e4a
Merge pull request #4346 from emanuelschuetze/ui-improvements
UI improvements for motion detail/list view
2019-02-14 21:57:06 +01:00
Emanuel Schütze 2499ee9058 UI improvements for motion detail/list view 2019-02-14 21:41:15 +01:00
Emanuel Schütze 4c6f907b8c
Merge pull request #4304 from MaximilianKrambach/pdfExportComments
export motion comments (pdf) and sequential numbers (pdf, csv)
2019-02-14 20:13:55 +01:00
Emanuel Schütze 2e385228b6
Merge pull request #4333 from MaximilianKrambach/amendmentFix2
Create amendment fix
2019-02-14 20:03:12 +01:00
Maximilian Krambach 6b58541079 pdf export options
- export comments as own pdf
- export comments as  part of an advanced motion pdf export,
- change sequential number export options for pdf and csv
2019-02-14 18:22:25 +01:00
Maximilian Krambach 3e598aec7e create motion amendment with fulltext or metainfo only 2019-02-14 17:10:50 +01:00
Emanuel Schütze 500b080b1c
Merge pull request #4331 from tsiegleauq/pdf-ul-ol
PDF UL OL with line numbers
2019-02-14 16:14:39 +01:00
Emanuel Schütze 9459e9d6e9
Merge pull request #4342 from MaximilianKrambach/quickfilters
agenda and motion list filters
2019-02-14 15:53:39 +01:00
Sean Engelhardt 5069371f5e PDF UL OL with line numbers
Add UL LI PDF line numbers
2019-02-14 15:29:00 +01:00
Emanuel Schütze 2df284c82e
Merge pull request #4343 from FinnStutzenstein/fixSubmitterIds
Fixed submitter ids name clash
2019-02-14 15:27:23 +01:00
Maximilian Krambach ca2a6b33b2 angenda and motion list filters 2019-02-14 15:15:52 +01:00
Emanuel Schütze aaa9157873
Merge pull request #4316 from tsiegleauq/remove-ngsubmit
Remove redundant submits
2019-02-14 15:06:28 +01:00
Sean Engelhardt 6a78d65dc3 Remove redundant Submits
Remove concurrent ngSubmit
Some cleanup and code alignment
2019-02-14 14:17:17 +01:00
Emanuel Schütze f09b6f73d6
Merge pull request #4341 from FinnStutzenstein/cleanup2
Fixed error when leaving the settings too early
2019-02-14 14:13:08 +01:00
FinnStutzenstein f0e6afb533 Fixed submitter ids name clash 2019-02-14 13:45:52 +01:00
Emanuel Schütze 34feac553b
Merge pull request #4338 from FinnStutzenstein/projector-message-slide
ProjectorMessageSlide and some renaming
2019-02-14 13:41:02 +01:00
Sean 530d522cec
Merge pull request #4325 from GabrielInTheWorld/feature-user-info-dialog
Feature for quick editing a user
2019-02-14 13:36:58 +01:00
FinnStutzenstein 8904472d23 Fixed error when leaving the settings too early 2019-02-14 13:30:21 +01:00
Emanuel Schütze 67fd5ee2c2
Merge pull request #4340 from FinnStutzenstein/fixMotionCommentSectionList
Fix comment section list
2019-02-14 13:29:05 +01:00
Emanuel Schütze 24d239acd9
Merge pull request #4337 from MaximilianKrambach/autofocusproject
autofocus 'OK' on 'project' dialogs
2019-02-14 13:19:26 +01:00
FinnStutzenstein 4c2adb6da3 ProjectorMessageSlide and some renaming 2019-02-14 13:19:05 +01:00
GabrielMeyer dfc41fc3a2 Feature for quick editing a user
Like in the `agenda-list.component`, if the user clicks on the middle cell, where the groups are written, a dialog opens.
In this dialog the user can update the following values for another user: groups, gender and participant-number.
2019-02-14 13:13:57 +01:00
FinnStutzenstein 05d9f6a3bb Fix comment section list 2019-02-14 13:07:04 +01:00
Maximilian Krambach 69d5d244cb autofocus 'OK' on project dialogs 2019-02-14 11:55:40 +01:00
Emanuel Schütze 98dc105f46
Merge pull request #4335 from MaximilianKrambach/speakerDropDownSort
user sorting by config
2019-02-14 11:12:48 +01:00
Maximilian Krambach 59ed906a36 user sorting by config 2019-02-14 10:53:13 +01:00
Emanuel Schütze 3172f0a532
Merge pull request #4336 from FinnStutzenstein/cleanup
Fixes submitters
2019-02-14 10:49:42 +01:00
FinnStutzenstein d932d6e907 Fixes submitters 2019-02-14 10:24:39 +01:00
Finn Stutzenstein 9785f67562
Merge pull request #4334 from emanuelschuetze/slides
Topic slide
2019-02-14 10:10:53 +01:00
Emanuel Schütze c77075f807 Topic slide 2019-02-14 08:14:50 +01:00
Emanuel Schütze c5912f8515
Merge pull request #4322 from MaximilianKrambach/motionDelegates
direct pdf export and hidden menus for unprivileged users
2019-02-13 15:37:07 +01:00
Maximilian Krambach c3c915e118 direct pdf export and hidden unusable options for delegates
also, several permission check fixes and minor layout improvements
2019-02-13 13:43:45 +01:00
Emanuel Schütze 34585fc4cb
Merge pull request #4324 from MaximilianKrambach/callListLandscape
call list subheaders
2019-02-13 13:39:19 +01:00
Emanuel Schütze adc4cc0ee9
Merge pull request #4330 from emanuelschuetze/fixUpdateUser
fix submitter updating (2)
2019-02-13 13:23:07 +01:00
Maximilian Krambach 55f967a14b call list subheaders 2019-02-13 13:18:57 +01:00
Emanuel Schütze fda5e08f9a fix submitter updating (2) 2019-02-13 12:59:25 +01:00
Emanuel Schütze 7952a9165d
Merge pull request #4329 from MaximilianKrambach/fixSubmitters
fix submitter updating
2019-02-13 12:37:06 +01:00
Maximilian Krambach 3a7e6da442 fix submitter updating 2019-02-13 11:49:37 +01:00
Emanuel Schütze 4f75639780
Merge pull request #4263 from MaximilianKrambach/categoryView
rework category list and sorting
2019-02-12 21:57:09 +01:00
Emanuel Schütze a410930245
Merge pull request #4301 from MaximilianKrambach/moveStar
move favorite star to identifier
2019-02-12 21:27:26 +01:00
Emanuel Schütze 397ec0d579
Merge pull request #4323 from MaximilianKrambach/fixUpdates
fix wrong array handling
2019-02-12 21:26:17 +01:00
Maximilian Krambach 7725005770 move favorite star in front of title 2019-02-12 21:06:10 +01:00
Emanuel Schütze 2364e5a17a
Merge pull request #4318 from GabrielInTheWorld/3921
Adds a new IconFont-set
2019-02-12 19:40:30 +01:00
Maximilian Krambach 924ec7580e fix wrong array handling in viewMotion updates 2019-02-12 18:17:08 +01:00
GabrielMeyer 63989b2b29 Adds a new IconFont-set
Fixes #3921
Added a new set of icons and removed the old one. The new one can used just like the old one.

Changed old improper icons to new ones

- The 'save_alt'-icons are replaced by 'cloud_upload'
- The icon in the navigation for assignments is replaced by 'how_to_vote'
- The drag&drop icon 'unfold_more' is replaced by 'drag_indicator'
2019-02-12 17:39:06 +01:00
Emanuel Schütze 39c7a51218
Merge pull request #4321 from tsiegleauq/font-mimetype-hotfix
Adds "application" to font mime types
2019-02-12 17:33:15 +01:00
Emanuel Schütze 89a1b722e0
Merge pull request #4320 from MaximilianKrambach/mediafileFilter
full text search for media file, some permission checks
2019-02-12 17:32:39 +01:00
Emanuel Schütze 724ba74fee
Merge pull request #4319 from MaximilianKrambach/callListLandscape
print callLists on landscape paper
2019-02-12 17:27:05 +01:00
Sean Engelhardt 3909054f14 Adds "application" to font mime types
Adds 'application/font-woff', 'application/font-sfnt' to font detection.
Hotfix to support different server behavior.
2019-02-12 16:04:03 +01:00
Maximilian Krambach 9160346ccc full text search for media file, some permission checks 2019-02-12 15:32:59 +01:00
Maximilian Krambach 8c0b055d98 print callLists on landscape paper 2019-02-12 13:52:44 +01:00
Sean f3452d8904
Merge pull request #4317 from MaximilianKrambach/fixcat
fix category filter
2019-02-12 13:28:11 +01:00
Maximilian Krambach e61c200b74 fix category filter 2019-02-12 13:05:06 +01:00
Emanuel Schütze 96a63ecd77
Merge pull request #4314 from FinnStutzenstein/implementMissingUpdateInViewUser
Implement missing update behaviour for users
2019-02-12 11:58:07 +01:00
FinnStutzenstein 99d751dbaf Implement missing update behaviour for users 2019-02-12 11:46:52 +01:00
Emanuel Schütze 2e80cc34a0
Merge pull request #4306 from tsiegleauq/show-state-extension-of-null
Fix some production mode issues
2019-02-12 11:16:38 +01:00
Emanuel Schütze f7966df3ea
Merge pull request #4313 from FinnStutzenstein/fixCalllist
Fixed calllist by removing the attached data from the tree (fixes #4296)
2019-02-12 11:15:35 +01:00
Sean Engelhardt 7897d823db Fix some production mode issues
Fixes some issues that occure in production mode only.
Also fixes a typo that prevented permission checks from
working
2019-02-12 11:04:32 +01:00
Jochen Saalfeld a80aa82326
Merge pull request #4310 from FinnStutzenstein/splitMotionStateMigration
Separate motion state access level migration
2019-02-12 10:40:14 +01:00
FinnStutzenstein 17ce91f309 Fixed calllist by removing the attached data from the tree (fixes #4296) 2019-02-12 10:39:29 +01:00
Emanuel Schütze de19ae9a9d
Merge pull request #4308 from FinnStutzenstein/fixProductionBuild
Fix issues with minification
2019-02-12 10:35:12 +01:00
Maximilian Krambach 66f9c81564 rework category list and sorting 2019-02-12 10:15:22 +01:00
FinnStutzenstein 06147affe5 Separate motion state access level migration 2019-02-12 10:10:40 +01:00
FinnStutzenstein cc4d5a5739 Fix issues with minification 2019-02-12 09:28:54 +01:00
Emanuel Schütze 841d80a35b
Merge pull request #4297 from emanuelschuetze/translations
Updated translations
2019-02-11 21:59:41 +01:00
Emanuel Schütze 279d1323fa Updated translations 2019-02-11 21:39:14 +01:00
Emanuel Schütze 9c68155d9c
Merge pull request #4302 from tsiegleauq/delete-items-from-agenda
Delete agenda items over list
2019-02-11 18:24:10 +01:00
Emanuel Schütze 610ece2bb5
Merge pull request #4305 from FinnStutzenstein/fixUserDetailView
fix user detail view (fixes #4303)
2019-02-11 18:10:51 +01:00
FinnStutzenstein d866b86df1 fix user detail view (fixes #4303) 2019-02-11 17:44:28 +01:00
Emanuel Schütze 12ca09e97e
Merge pull request #4300 from tsiegleauq/pdf-line-number-fixes
Add line-numbering fix
2019-02-11 17:42:44 +01:00
Sean Engelhardt 5e5fc4a499 Delete agenda items over list
Implements the deletion logic for agenda items from the agenda list view
2019-02-11 16:52:41 +01:00
Sean 4d9adc291c
Merge pull request #4295 from MaximilianKrambach/userSearchFix
search users in list search by full name
2019-02-11 16:18:15 +01:00
Sean Engelhardt 4ce8f2b38f Add line-numbering fix
Also enabled li-elements to be rendered in LineNumbering Mode
2019-02-11 15:45:23 +01:00
Maximilian Krambach 7dd086eacf
Merge pull request #4253 from MaximilianKrambach/sortMotionCallList
bulk move motions in call list
2019-02-11 13:51:44 +01:00
Maximilian Krambach e1916534e0 bulk move motions in call list 2019-02-11 13:42:08 +01:00
Sean cda5e066de
Merge pull request #4291 from CatoTH/pdf-split-inline-elements-at-line-break
Provide a method to split inline elements at line breaks
2019-02-11 13:05:09 +01:00
Sean fbcc80a3a0
Merge pull request #4286 from FinnStutzenstein/cleanup
Removed OpenSlidesComponent
2019-02-11 12:10:21 +01:00
Sean 8a6407068c
Merge pull request #4285 from FinnStutzenstein/translateModelsA
translate models
2019-02-11 12:08:21 +01:00
Maximilian Krambach 49aea04b9b search users in list search by full name 2019-02-11 11:13:50 +01:00
Emanuel Schütze 79aaa949ae
Merge pull request #4290 from CatoTH/diff-bugfix-rsquo
Bugfix: Don't detect &rsquo;-characters as changes
2019-02-11 07:46:45 +01:00
Emanuel Schütze 050573b53c
Merge pull request #4294 from FinnStutzenstein/fixOperatorService
fixed the operatorservice
2019-02-10 21:10:30 +01:00
FinnStutzenstein 89995e01db fixed the operatorservice
Do not use the injector, because only in the operator needed members from the user repository were tree-shaked away by the --aot production build. Import it right away (not nice, but prevents tree shaking)
2019-02-10 20:18:36 +01:00
Emanuel Schütze b5294cc5fd
Merge pull request #4289 from FinnStutzenstein/resetPassword
Rework the reset password component (fixes #4079)
2019-02-10 11:54:52 +01:00
Emanuel Schütze 3e7d23a283
Merge pull request #4287 from CatoTH/Openslides3-Bugfix-LineNumbering-Switching
Bugfix: pass line numbering mode to motion-detail-diff
2019-02-10 11:49:21 +01:00
Emanuel Schütze 3d2993e864
Merge pull request #4292 from ostcar/fix_projector_error_representation
Fix projector error message
2019-02-10 11:40:40 +01:00
FinnStutzenstein 6a33b68a41 Rework the reset password component (fixes #4079) 2019-02-10 11:36:01 +01:00
Oskar Hahn 7e25a858d4 Fix projector error message 2019-02-10 10:50:18 +01:00
Tobias Hößl ed62c172fb
Provide a method to split inline elements at line breaks 2019-02-09 19:33:12 +01:00
Tobias Hößl 4cbb6e44f7
Bugfix: Don't detect &rsquo;-characters as changes 2019-02-09 18:24:52 +01:00
FinnStutzenstein 090bf49d97 Removed OpenSlidesComponent 2019-02-08 18:31:46 +01:00
Tobias Hößl 3a0f02c929
Bugfix: pass line numbering mode to motion-detail-diff 2019-02-08 17:46:36 +01:00
FinnStutzenstein 424e7945be translate models 2019-02-08 17:28:23 +01:00
Sean 76210e807f
Merge pull request #4275 from MaximilianKrambach/sortLists
sort categories (+ motions) in dropdowns etc.
2019-02-08 15:24:02 +01:00
Emanuel Schütze 61d603f66a
Merge pull request #4283 from tsiegleauq/select-motions-from-extension
Add search selector for state extensions
2019-02-08 14:53:11 +01:00
Sean 86ee11f9c7
Merge pull request #4284 from MaximilianKrambach/noEnd
fix display of end time
2019-02-08 14:51:44 +01:00
Maximilian Krambach c487d688f6 sort categories in dropdowns 2019-02-08 14:37:58 +01:00
Sean 524d6d82a6
Merge pull request #4276 from MaximilianKrambach/csvExportImport
fixing csv export/import, add option for iso 8895-15
2019-02-08 14:37:23 +01:00
Sean Engelhardt ce96c6d359 Add search selector for state extensions 2019-02-08 14:36:24 +01:00
Maximilian Krambach 382cf4ef96 fix display of end time 2019-02-08 14:33:55 +01:00
Maximilian Krambach ab557486cb
Merge pull request #4274 from MaximilianKrambach/smallchanges
various small fixes
2019-02-08 13:17:53 +01:00
Maximilian Krambach 799d11cd17 small fixes
- motion detail comments not always visible
- fix tag/recommendation multiselect
- fix display of prefixed categories in filter/dialogs
- confirm dialog on email invitation
- attempt at fixing history filter
2019-02-08 12:54:11 +01:00
Maximilian Krambach ee88dff41f Fixing csv export/import, add new config option for csv export encoding (utf-8 || iso-8895-15) 2019-02-08 12:37:02 +01:00
Sean 268403cc92
Merge pull request #4279 from FinnStutzenstein/previousState
Allow motions to go a state back
2019-02-08 12:23:08 +01:00
FinnStutzenstein 3ba8636acf Allow motions to go a state back 2019-02-08 11:58:11 +01:00
Sean c2bde1197e
Merge pull request #4281 from tsiegleauq/motion-csv-with-state-info
Enable CSV export for state and reason
2019-02-08 11:57:53 +01:00
Sean 392cb7fdaf
Merge pull request #4240 from FinnStutzenstein/viewModelStore
first work on moving some logic to view models
2019-02-08 11:52:39 +01:00
Sean Engelhardt 70af5e2054 Enable CSV export for state and reason
Adds and reorders what CSV is exporting using the
Export dialog
2019-02-08 11:31:11 +01:00
FinnStutzenstein d0991936d6 ViewModelStore, register repositories, improve view model relations 2019-02-08 11:02:56 +01:00
Emanuel Schütze 1188a94e85
Merge pull request #4277 from tsiegleauq/pdf-for-motion-statutes
Export statute amendments with diff
2019-02-08 11:01:19 +01:00
Emanuel Schütze fa8cc366e8
Merge pull request #4280 from tsiegleauq/prompt-in-workflow-detail
Add prompt before deleting workflow states
2019-02-08 10:39:25 +01:00
Sean Engelhardt 4023ac82df Export statute amendments with diff
Exports motion statutes amendments with changes to PDF documents.
Fixes a small issue where navigating to statues amendments was throwing
errors
2019-02-08 10:39:06 +01:00
Sean Engelhardt 2220c22b24 Add prompt before deleting workflow states
Worked with promise.then, cause callbacks of
subscribe are sync
Also removes a console.log
2019-02-08 10:26:05 +01:00
Finn Stutzenstein c14b56b73e
Merge pull request #4278 from FinnStutzenstein/fixMobileEditing
removed old and not working code
2019-02-08 08:09:40 +01:00
FinnStutzenstein 2c7338a2bf removed old and not working code 2019-02-08 07:57:00 +01:00
Finn Stutzenstein 812168b00c
Merge pull request #4270 from GabrielInTheWorld/4116
Prevent dialogs to close easily
2019-02-08 07:19:28 +01:00
GabrielMeyer 2ef35d0b50 Prevent dialogs to close easily (Fixes #4116)
dialogs (created by MatDialog) should only close if the user explicit clicks 'x' or 'cancel' now
2019-02-07 16:58:43 +01:00
Sean 9664e52237
Merge pull request #4260 from tsiegleauq/workflow-creator
Add motion workflow creator
2019-02-07 16:52:48 +01:00
Sean Engelhardt b82c2e78b0 Add motion workflow creator (WIP) 2019-02-07 16:36:33 +01:00
Maximilian Krambach 186a0b5da3
Merge pull request #4267 from MaximilianKrambach/motionPollResultsPDF
export poll results in motion pdfs
2019-02-07 15:52:12 +01:00
Maximilian Krambach 498de862c1 export poll results in motion pdfs 2019-02-07 15:27:12 +01:00
Maximilian Krambach 5932a8982e
Merge pull request #4269 from MaximilianKrambach/notesExport
export personal note pdf
2019-02-07 15:10:09 +01:00
Maximilian Krambach dc27a20842 export personal note pdf 2019-02-07 14:49:19 +01:00
Sean 5ace768427
Merge pull request #4268 from GabrielInTheWorld/4262
Fixes the initial loading of motions and their states
2019-02-07 13:57:02 +01:00
Emanuel Schütze 7956d9f7a2
Merge pull request #4271 from MaximilianKrambach/4065
fix #4065
2019-02-07 13:08:33 +01:00
Jochen Saalfeld 70af698528
Merge pull request #4272 from FinnStutzenstein/motionVersionMigration
seperate motion version migration operations
2019-02-07 11:19:34 +01:00
FinnStutzenstein 35056f5ccc seperate motion version migration operations 2019-02-07 09:28:12 +01:00
Emanuel Schütze c84f8196fc
Merge pull request #4252 from MaximilianKrambach/speakertime
improve start time and duration display for finished speakers
2019-02-06 17:52:19 +01:00
Maximilian Krambach 056a20964c improve start time and duration display for finished speakers 2019-02-06 17:01:15 +01:00
Maximilian Krambach 2fbd11dc00 fix #4065 2019-02-06 16:53:26 +01:00
GabrielMeyer da94a4f947 Fixes the initial loading of motions and their states
Fixes #4262
- If the workflow is changed, then the state of the motion will be updated, too
2019-02-06 12:12:32 +01:00
Sean eab6e9bfd0
Merge pull request #4259 from GabrielInTheWorld/4258
Prevent mistakenly closing the window
2019-02-06 10:39:42 +01:00
Emanuel Schütze 83d9dbed9e
Merge pull request #4265 from emanuelschuetze/login
Fixed login problem for non admin users.
2019-02-05 21:26:21 +01:00
Emanuel Schütze 722a40779d Fixed login problem for non admin users. 2019-02-05 21:03:13 +01:00
Emanuel Schütze 7e95899353
Merge pull request #4261 from tsiegleauq/fix-empty-pdf-style
Fix PDF style interpretation
2019-02-05 16:11:03 +01:00
Sean Engelhardt b200169de9 Fix pdf style interpretation
fix false style information during recursife pdf generateion
fix an error where styling items in a list resultid in unexpected
list definitions
2019-02-05 15:15:12 +01:00
Emanuel Schütze 4395b86b9c
Merge pull request #4216 from MaximilianKrambach/duration
Estimated duration, and datetimepicker in config
2019-02-05 14:49:58 +01:00
Emanuel Schütze 2ef3b6929f
Merge pull request #4255 from MaximilianKrambach/motionNavigation
sort 'previous/next motion' by identifier in detail view
2019-02-05 14:48:17 +01:00
GabrielMeyer 21f9715623 Fixes #4258
- Added a listener to the `onBeforeUnload`-event.
- This prevent reloading or closing the window including `F5, Shift+F5, Ctrl+R, Ctrl+Shift+R, Crtl+W, closing the tab by 'x'`

Added comment to the event-function.
2019-02-05 14:41:48 +01:00
Maximilian Krambach 66a1ac1532 estimated duration, and datetimepicker in config 2019-02-05 13:49:48 +01:00
Maximilian Krambach 0a06d05bdd sort 'previous/next motion' by identifier in detail view 2019-02-05 13:48:27 +01:00
Sean a52db89288
Merge pull request #4256 from emanuelschuetze/workflowid
Fixed bug in getting workflow_id from config service.
2019-02-05 13:17:36 +01:00
Emanuel Schütze 3884accffe Fixed bug in getting workflow_id from config service. 2019-02-05 12:07:34 +01:00
Jochen Saalfeld 90e6af9ef0
Merge pull request #4250 from jsaalfeld/pin_typescript_version
pinning typescript to <3.3 - fixes #4249
2019-02-05 08:37:35 +01:00
Jochen Saalfeld 114c8bfa3c
Merge pull request #4184 from ostcar/fix_gunicorn
Opens the websocket connection before closing it
2019-02-05 08:34:52 +01:00
Jochen Saalfeld a64d436884
Merge pull request #4254 from ostcar/fix_partial_cache
Make sure the cache is ensured before manipulating it
2019-02-05 08:08:19 +01:00
Oskar Hahn fae270a1d6 Make sure the cache is ensured before manipulating it 2019-02-04 17:41:18 +01:00
Emanuel Schütze a6043ba8d5
Merge pull request #4251 from tsiegleauq/login-redirect-issues
Allow reload on login children
2019-02-04 15:30:52 +01:00
Sean Engelhardt 06bfa314cb Allow reload on login children
Fixes a bug where the user was always redirected to
/login/ as unknown user, when they tried to
load children from login page from an external references.
2019-02-04 15:17:03 +01:00
Sean 48b79ae24d
Merge pull request #4159 from CatoTH/Openslides3-Line-Highlighting
Line highlighting
2019-02-04 14:37:41 +01:00
Tobias Hößl 1bc17f2c6c Line highlighting 2019-02-04 13:17:24 +01:00
Jochen Saalfeld f5ac1822bf
pinning typescript to <3.3 - fixes #4249 2019-02-04 11:55:58 +01:00
Emanuel Schütze 27ecb6f411
Merge pull request #4247 from emanuelschuetze/translation
Updated translations
2019-02-03 22:42:09 +01:00
Emanuel Schütze a4fcc43121 Hotfix: Downgrade terser to 3.14.1
see https://github.com/webpack-contrib/terser-webpack-plugin/issues/66
2019-02-03 22:26:47 +01:00
Emanuel Schütze ac96ba8d3a Updated translations 2019-02-03 22:12:26 +01:00
Finn Stutzenstein fa63110889
Merge pull request #4150 from FinnStutzenstein/count-users
count users via notify
2019-02-02 10:45:52 +01:00
FinnStutzenstein 7ce1eb592f Count active users via notify (for admins only), absolute imports 2019-02-02 08:17:36 +01:00
Emanuel Schütze 768b97816f
Merge pull request #4211 from tsiegleauq/current-list-of-speakers
Add current list of speakers to agenda-list
2019-02-01 18:30:45 +01:00
Sean Engelhardt 0a7f905c21 Add current list of speakers to agenda-list
Adds a current-list-of-speakers button to the agenda list view
The user may select a projector which will return an agenda item
which will be used to determine the CLOS
2019-02-01 18:11:10 +01:00
Emanuel Schütze f26f7f9c08
Merge pull request #4244 from MaximilianKrambach/callListPdf
call list pdf export
2019-02-01 18:04:48 +01:00
Emanuel Schütze 07a37cc243
Merge pull request #4236 from normanjaeckel/SetStateAllowSubmitterEdit
Allow set state for submitters in some states.
2019-02-01 17:56:31 +01:00
Maximilian Krambach 181d00ea94 call list pdf export 2019-02-01 17:48:29 +01:00
Emanuel Schütze d4cc3c3720 Allow to set state as submitter in client. 2019-02-01 16:30:50 +01:00
Norman Jäckel 286c81e007 Allow set state for submitters in some states. 2019-02-01 16:10:51 +01:00
Emanuel Schütze 448ea6df28
Merge pull request #4235 from normanjaeckel/SubmitterPermissions
Added new flag for states to hide motions from submitters.
2019-02-01 16:08:51 +01:00
Norman Jäckel c355326466 Added new flag to motion state to control access for different users. 2019-02-01 15:42:02 +01:00
Sean e281b310a7
Merge pull request #4238 from MaximilianKrambach/historyNavigate
navigate to detail view after setting the history mode
2019-02-01 15:17:16 +01:00
Emanuel Schütze 7b840ca796
Merge pull request #4242 from tsiegleauq/motion-detail-ammendments
Add amendment info in motion details
2019-02-01 15:09:01 +01:00
Sean Engelhardt 01786f685c Add amendment info in motion details
Alters motion detail to show amendments and to a given motion
and original motions to a given amendment.
Changes the motion PDF to show amendments.

Fixes a bug with the projection indicator
2019-02-01 14:52:31 +01:00
Maximilian Krambach ba6d3da8f0 navigate to detail view after setting the history mode
(if a detailView is existant)
2019-02-01 14:42:19 +01:00
Emanuel Schütze dc1e48329f
Merge pull request #4241 from MaximilianKrambach/csvExport
explicitly set mimetype for csv export
2019-02-01 14:41:09 +01:00
Emanuel Schütze 3d7b833eeb Fix travis by downgrading pytest to <4.2.0 2019-02-01 14:28:34 +01:00
Maximilian Krambach da722dd518 explicitly set mimetype for csv export 2019-02-01 14:20:00 +01:00
Sean 1b2258a4e5
Merge pull request #4239 from tsiegleauq/motion-detail-tags
Add Tags into motion details
2019-02-01 13:18:42 +01:00
Sean Engelhardt f992b77d99 Add Tags into motion details
Adds tags to motion repository,
view-motion and selectable for the motion detail view
2019-02-01 12:34:42 +01:00
Finn Stutzenstein f3c3d8ab8c
Merge pull request #4219 from FinnStutzenstein/cleanup
A little bit of cleanup
2019-02-01 11:16:35 +01:00
FinnStutzenstein 84974d7687 A little bit of cleanup 2019-02-01 11:02:24 +01:00
Finn Stutzenstein 6a60280172
Merge pull request #4229 from FinnStutzenstein/repositories
Restructure the client, register Repositories and map to collection
2019-02-01 10:42:51 +01:00
FinnStutzenstein 97f60c1e6c Restructure the client, register Repositories and map to collection
strings.
2019-02-01 10:19:17 +01:00
Emanuel Schütze dbe452f976
Merge pull request #4232 from emanuelschuetze/reason
New config to set reason field required.
2019-02-01 10:15:02 +01:00
Emanuel Schütze fa8e0687bf
Merge pull request #4237 from ostcar/fix_restricted_data_cache
fix restricted_data_cache for elements that exists, but a user is not allowed to see them
2019-02-01 10:13:53 +01:00
Finn Stutzenstein 44bc03b300
Merge pull request #4231 from tsiegleauq/enter-custom-translations
Add custom translation settings
2019-02-01 10:11:00 +01:00
Finn Stutzenstein 44851af172
Merge pull request #4227 from FinnStutzenstein/clos
Projector reference for CLOS
2019-02-01 10:10:47 +01:00
Emanuel Schütze 617eccb85f New config to set reason field required. 2019-02-01 09:53:38 +01:00
Sean Engelhardt 8016827242 Add custom translation settings 2019-02-01 09:51:18 +01:00
FinnStutzenstein 582d4d7c4a Projector reference for CLOS 2019-02-01 09:47:59 +01:00
Oskar Hahn 1111a8074e fix restricted_data_cache for elements that exists, but a user is not allowed to see them 2019-02-01 08:26:34 +01:00
Norman Jäckel 7b4ea753c1
Merge pull request #4234 from emanuelschuetze/https
Set use_https to true
2019-01-31 23:43:20 +01:00
Emanuel Schütze b480266dad Set use_https to true
used for password reset urls in emails by django
2019-01-31 22:41:08 +01:00
Sean c00b1a8325
Merge pull request #4221 from FinnStutzenstein/client-projector
projector cleanup
2019-01-31 19:03:13 +01:00
Emanuel Schütze 13b6acf72e
Merge pull request #4230 from MaximilianKrambach/translateSort
wrong translation string
2019-01-31 18:32:08 +01:00
Maximilian Krambach 15ce789617 wrong translation string 2019-01-31 17:16:30 +01:00
Emanuel Schütze 6e09a8819d
Merge pull request #4224 from MaximilianKrambach/statuteImportExport
import/export for statutes
2019-01-31 14:18:36 +01:00
Emanuel Schütze a3d8a8aee6
Merge pull request #4228 from emanuelschuetze/ui
UI improvements for motions
2019-01-31 14:18:20 +01:00
Maximilian Krambach 04cbfe383d import/export for statutes 2019-01-31 14:10:39 +01:00
Emanuel Schütze effd82eb75 UI improvements for motions 2019-01-31 12:49:00 +01:00
FinnStutzenstein b921b771d6 projector cleanup 2019-01-31 12:41:04 +01:00
Emanuel Schütze 9c6a21469b
Merge pull request #4215 from GabrielInTheWorld/theming
OpenSlides Theming
2019-01-31 12:30:11 +01:00
Emanuel Schütze df7fbfee67
Merge pull request #4225 from tsiegleauq/sort-group-matrix
Sort groups by power
2019-01-31 12:27:49 +01:00
Sean 9136b53d48
Merge pull request #4226 from MaximilianKrambach/workflowfilter
only show motion workflow filter for config-enabled workflows
2019-01-31 12:19:31 +01:00
Sean 8f4dddf495
Merge pull request #4223 from FinnStutzenstein/default-group-nav
Fixed operator respecting the default group
2019-01-31 12:07:56 +01:00
Maximilian Krambach 271d8cbfa4 only show motion workflow filter for config-enabled workflows 2019-01-31 12:05:50 +01:00
GabrielMeyer 30535dd21f OpenSlides theming (Fixes #4205)
using 3 built-in themes (default, dark, green)
2019-01-31 12:04:35 +01:00
Sean Engelhardt 9e477250b0 Sort groups by power 2019-01-31 12:03:59 +01:00
Emanuel Schütze 8cbcd6a5b5
Merge pull request #4220 from tsiegleauq/rec-giver-in-pdf
Add motion reco giver to motion PDF
2019-01-31 11:53:26 +01:00
Emanuel Schütze b8fb95e878
Merge pull request #4000 from FinnStutzenstein/translations
use own translation service wrapper
2019-01-31 11:30:18 +01:00
Emanuel Schütze c2107b77ab
Merge pull request #4222 from tsiegleauq/remove-login-snackbar
Add login notice as div
2019-01-31 11:26:42 +01:00
FinnStutzenstein a53e0f27e6 Fixed operator respecting the default group 2019-01-31 11:15:21 +01:00
FinnStutzenstein d20f8d6f44 Use own translation service wrapper for using custom translations 2019-01-31 10:42:44 +01:00
Sean Engelhardt 92fab5102a Add loginNotice as div
Remove the snackbar, restructure the template code for login mask
and adds a div with the login notice
2019-01-31 10:33:37 +01:00
Sean Engelhardt f22b81d7ad Add motion reco giver to motion PDF
Adds the text from "motion recommendet by"
into the motion PDF for both normal
motions and "StatuteAmendments"
2019-01-31 10:15:45 +01:00
Sean eb21ae0136
Merge pull request #4214 from tsiegleauq/angular722
Update to angular 7.2.2
2019-01-31 09:54:24 +01:00
Emanuel Schütze d6ce448672
Merge pull request #4218 from emanuelschuetze/translations
Updated translations
2019-01-31 09:35:11 +01:00
Emanuel Schütze 9629c6d1fd Updated translations 2019-01-31 09:20:20 +01:00
Sean d705b2a137
Merge pull request #4210 from MaximilianKrambach/agendalistpdf
agenda pdf export
2019-01-30 16:25:54 +01:00
Maximilian Krambach 167ef72bb6 agenda pdf export 2019-01-30 16:13:56 +01:00
Sean Engelhardt b5ea837e0a Update to angular 7.2.2
- updates the dependancien in package.json
- Angular is now compatible with current typescript
- Jasmine/Karma supports LazyLoading again
2019-01-30 12:54:25 +01:00
Sean ec8fa3eb91
Merge pull request #4212 from MaximilianKrambach/travisfixes
Fix travis errors
2019-01-30 12:29:22 +01:00
Maximilian Krambach 10d1209da8 Fix 'errors'
- two python comparisons error not passing flake8 anymore
- typescript not being able to recognize an object, sending it prechewed
2019-01-30 12:18:59 +01:00
Emanuel Schütze 625de1aeb4
Merge pull request #4207 from MaximilianKrambach/stringFilter
acknowledge string filter
2019-01-29 19:49:59 +01:00
Emanuel Schütze e0177893aa
Merge pull request #4195 from MaximilianKrambach/userPdf
user pdf exports: participant lists, access data
2019-01-29 19:49:07 +01:00
Maximilian Krambach 6b0f129067 user pdf exports: participant lists, access data 2019-01-29 18:52:40 +01:00
Maximilian Krambach 6a969883ad acknowledge string filter
- display correct number of show entries
- all bulk actions should only apply to filtered data
- fix user group filter
2019-01-29 18:49:13 +01:00
Sean 00b15228f7
Merge pull request #4062 from FinnStutzenstein/modified-final-version
Modified final version
2019-01-29 18:31:38 +01:00
FinnStutzenstein d6fcef79c0 modified final version 2019-01-29 18:15:48 +01:00
Emanuel Schütze a1dc92bf0a
Merge pull request #4187 from FinnStutzenstein/client-projector
more work on projector, countdowns, clos
2019-01-29 16:43:24 +01:00
Sean aa58572709
Merge pull request #4209 from GabrielInTheWorld/fix-4116
Fixes #4116
2019-01-29 16:26:15 +01:00
Emanuel Schütze 42f8b74d8e Projector templates
- Projector base template
- Projection button
- projection dialog
- motion slide (template and motions/projector.py)
- user slide (template and users/projector.py)
- motion and user list view with projector column permission check.
2019-01-29 16:12:19 +01:00
FinnStutzenstein 965d23be50 more work on projector, countdowns, clos
- splitted clos-slide and clos-overlay.
- Synchronize to server, more little changes
2019-01-29 16:10:21 +01:00
Emanuel Schütze c52b82e77d
Merge pull request #4188 from MaximilianKrambach/hierarchicAgenda
agenda hierarchies
2019-01-29 16:08:03 +01:00
GabrielMeyer a1bc0290ed Fixes #4116
- Added config to prevent closing the dialog (except by clicking the
'cancel'-button of course)
- Changed property 'width' of the motion-detail-card, so the size will be
adjusted automatically.
2019-01-29 15:25:01 +01:00
Sean 1bee3aa509
Merge pull request #4197 from MaximilianKrambach/optionalCategoryPrefix
category prefix is currently optional
2019-01-29 15:01:40 +01:00
Maximilian Krambach 064a3f7d3c agenda hierarchy tree 2019-01-29 15:00:18 +01:00
Maximilian Krambach 8796d728d9 category prefix is currently optional 2019-01-29 13:50:27 +01:00
Sean c6bddd06f7
Merge pull request #4202 from emanuelschuetze/ui
UI improvements
2019-01-29 12:15:48 +01:00
Sean c423f3a0a4
Merge pull request #4178 from GabrielInTheWorld/fix-autofocus-search
Fixes #4174
2019-01-29 12:14:28 +01:00
GabrielMeyer b6295952ba Fixes #4174
Fixed the non-autofocus search-input-element on the search-page.
Added directive 'osAutofocus' to the input-element, so it will be autofocussed when the user enters the search-component.

Resolved answers of pull-request

- Added `osAutofocus` to the `os-sort-filter-bar`
2019-01-29 11:12:58 +01:00
Sean 2d0eab9b20
Merge pull request #4176 from GabrielInTheWorld/fix-close-sidenav
Fixes #4173
2019-01-29 11:04:01 +01:00
Sean 214b74e091
Merge pull request #4200 from emanuelschuetze/config-textarea-field
Use missing textarea field for config inputtype 'text'.
2019-01-29 10:57:40 +01:00
Sean a64e0c91ed
Merge pull request #4196 from MaximilianKrambach/tempfixTranslation
po2json-tempfix
2019-01-29 10:45:57 +01:00
GabrielMeyer d043133de1 Fixes #4173
Added the function to autoclose the sidenavigation when working on a mobile-device.
Removed unnecessary functions.

Resolved answers of pull-request

- Added myself to the AUTHORS-file
- Used square brackets for 'routerLink'
2019-01-29 10:37:21 +01:00
Emanuel Schütze cf5a5b4c0e
Merge pull request #4194 from ostcar/projector_v
Projector V
2019-01-29 08:35:06 +01:00
Oskar Hahn 1a709a59a9 Projector V
* Changed wording: element is one element on the projector. A slide is a functoin to render one element
* Use AllData as first argument all the time
* Render username on server
* Add exceptions for erros on projector
* Fix motion recommendation
* Only show state extension, if it is allowed by the state
* Add motion_change_recommendations to motion full_data
2019-01-28 23:18:27 +01:00
Emanuel Schütze f3b96d4386 Use missing textarea field for config inputtype 'text'. 2019-01-28 21:55:42 +01:00
Emanuel Schütze 311b8abbea UI improvements
Max width for config view and content card in motion detail view.
Improved motion edit view in mobile mode.
2019-01-28 21:52:37 +01:00
Emanuel Schütze 0d8cbbaab9
Merge pull request #4199 from normanjaeckel/FixResetPassword
Fix reset password
2019-01-28 21:26:46 +01:00
Norman Jäckel 39244a0ec9 Reenable black. 2019-01-28 20:54:42 +01:00
Norman Jäckel 746dbf744b Fixed reset password views. 2019-01-28 20:51:06 +01:00
Maximilian Krambach 52d622b624 po2json-tempfix
run through sed after autotranslating po2json
2019-01-28 16:14:51 +01:00
Sean 793066935e
Merge pull request #4186 from MaximilianKrambach/pdflogos
add pdf header and footer images
2019-01-28 13:24:44 +01:00
Maximilian Krambach 93a9a8aef3 adding configured header and footer images to pdf exports 2019-01-28 12:49:42 +01:00
Sean c406362da5
Merge pull request #4183 from MaximilianKrambach/presenceCheck
Set/unset presence
2019-01-28 10:57:41 +01:00
Maximilian Krambach 8e086df440 view for changing the user presence by oarticipant number 2019-01-28 10:40:41 +01:00
Emanuel Schütze 56ff765708
Merge pull request #4189 from tsiegleauq/os3-motion-export-dialog
Add Motion Export dialog
2019-01-28 10:34:43 +01:00
Finn Stutzenstein 2c7e181f38
Merge pull request #4177 from MaximilianKrambach/email
add a validation error for false template invitation email properties (server)
2019-01-25 20:08:36 +01:00
Sean Engelhardt 23fea51333 Add Motion Export dialog
Removes the "Export As CSV" and "Export As PDF" options from MotionList
view and adds an export dialog instead (just like OS 2.3)
The exprt Dialog dynamically changes it's content according to the possible
selections.

The current implementation of the CSV exporter is not able to export anything
but the original motion text. The exporter does consider this and disables
this option for now.

While the old exporter showed "state" and "recommendation" during CSV export,
but was in fact not exporting state nor recommendation, the new exporter
will disable these fields during CSV export.

PDF should work as expected
2019-01-25 17:03:06 +01:00
Maximilian Krambach 4a2cad5801 add a validation error for false template invitation email properties 2019-01-25 17:01:33 +01:00
Oskar Hahn 014b145b0f Opens the websocket connection before closing it
Fixes #4009
2019-01-25 16:33:45 +01:00
Sean 43e0f7943b
Merge pull request #4179 from MaximilianKrambach/mediafiles-filter
filter mediafiles by hidden status, and by 'pdf/not pdf'
2019-01-25 10:20:12 +01:00
Sean 2070cdc525
Merge pull request #4175 from MaximilianKrambach/ballotPdf
motion ballot pdf creation
2019-01-25 10:19:21 +01:00
Maximilian Krambach 461b29688e motion ballot pdf creation 2019-01-25 10:02:58 +01:00
Finn Stutzenstein b9f5e6768b
Merge pull request #4181 from FinnStutzenstein/cleanup
cleanup, removed motion log from client
2019-01-25 08:56:12 +01:00
FinnStutzenstein 22182463a9 cleanup, removed motion log from client 2019-01-25 08:39:50 +01:00
Jochen Saalfeld 390b46a863
Merge pull request #4071 from jsaalfeld/travis_server_tests
travis check for createsettings and migration
2019-01-24 15:53:15 +01:00
Sean c9a9f8d809
Merge pull request #4182 from tsiegleauq/os3-pdf-motion-catalog
Export a list of motions
2019-01-24 14:55:05 +01:00
Maximilian Krambach c1c0611d86 filter mediafiles by hidden status, and by 'pdf/not pdf' 2019-01-24 14:47:15 +01:00
Sean Engelhardt 0e77ec79c2 Export a list of motions
Ports the "Motion Catalog Content Provider" to OpenSlides 3.
Categories and Prefixes are considered as before.
Updated to Code to ES6/Typescript.
Allows to export all motions from the motion list view.
2019-01-24 14:40:06 +01:00
Emanuel Schütze 56a804eb47
Merge pull request #4170 from MaximilianKrambach/importInitialFocus
change initial focus of imports
2019-01-24 14:38:45 +01:00
Maximilian Krambach b620e5edfa change tab order in import tabs 2019-01-24 14:30:46 +01:00
Jochen Saalfeld c7f87dfe1b
travis check for createsettings and migration, documented server
debugging
2019-01-24 11:41:15 +01:00
Finn Stutzenstein 1b3c0b4cee
Merge pull request #4152 from ostcar/new_projector_iv_motion_slide
New projector IV
2019-01-24 11:28:53 +01:00
Emanuel Schütze ea7bff89ea
Merge pull request #4171 from emanuelschuetze/pwa-icons
Updated PWA icons.
2019-01-23 09:48:46 +01:00
Emanuel Schütze 80f795c9d0 Updated PWA icons. 2019-01-23 08:33:07 +01:00
Emanuel Schütze c48148fc01
Merge pull request #4169 from tsiegleauq/gender-client
Add gender field to users
2019-01-22 13:35:25 +01:00
Emanuel Schütze 7b8839f4fa
Merge pull request #4164 from MaximilianKrambach/stateRecExtensions
set/read state+recommendation extensions
2019-01-22 13:14:22 +01:00
Emanuel Schütze 5e11d04791
Merge pull request #4168 from emanuelschuetze/new-migrations
Added missing projector migration.
2019-01-22 13:09:48 +01:00
Maximilian Krambach caed18ef03 set/read state+recommendation extensions 2019-01-22 13:01:00 +01:00
Emanuel Schütze cf29f39b9f Added missing projector migration. 2019-01-22 12:59:33 +01:00
Sean Engelhardt 07ca50441a Add gender field to users
Alters the user detail view and the list of speakers to
support the gender field.
Default selection of genders was set to "Female", "Male"
and "Diverse".
Adding genders to users is completely optional
2019-01-22 12:57:47 +01:00
Emanuel Schütze bde292b13e
Merge pull request #4162 from tsiegleauq/pdfmake-vfs
Add PDF custom fonts
2019-01-22 12:13:17 +01:00
Emanuel Schütze e6e0ef7e61
Merge pull request #4160 from MaximilianKrambach/searchHistory
search History
2019-01-22 12:03:16 +01:00
Sean Engelhardt e680ca38da Add PDF custom fonts 2019-01-22 11:59:16 +01:00
Sean aa668b72d9
Merge pull request #4167 from MaximilianKrambach/shortenTitle
shortening motion titles
2019-01-22 11:37:37 +01:00
Maximilian Krambach 7f68fef7ad search History 2019-01-22 11:33:35 +01:00
Sean 20bb92466b
Merge pull request #4161 from MaximilianKrambach/passwordRestrictions
reset password permission check in menu
2019-01-22 11:26:59 +01:00
Maximilian Krambach 30f97935e0 reset password permission check in menu 2019-01-22 10:19:50 +01:00
Maximilian Krambach 23298a03b3 Shortening motion titles 2019-01-22 10:10:42 +01:00
Emanuel Schütze c67aef68d9
Merge pull request #4163 from emanuelschuetze/translations
Updated translation strings and German translation.
2019-01-22 09:19:26 +01:00
Emanuel Schütze 6b66a208c5 Updated translation strings and German translation. 2019-01-21 22:50:10 +01:00
Emanuel Schütze 07f65601e1
Merge pull request #4158 from emanuelschuetze/username
Show username if full_name or last_name is empty.
2019-01-21 22:48:22 +01:00
Emanuel Schütze 2c5ea299e3 Show username if full_name or last_name is empty.
important for create-example_data
2019-01-21 16:01:16 +01:00
Oskar Hahn cca28a990a New projector IV
* Motion Slide
2019-01-20 13:35:50 +01:00
Oskar Hahn 209105efc3
Merge pull request #4103 from FinnStutzenstein/client-projector-ui
Client projector ui (WIP)
2019-01-20 11:39:49 +01:00
Emanuel Schütze 402fc37b99
Merge pull request #4155 from ostcar/activate_start_command
activate start command
2019-01-20 11:36:06 +01:00
Emanuel Schütze f2ffe64f98
Merge pull request #4157 from emanuelschuetze/fix-history-migration
Fix history migration.
2019-01-20 11:28:32 +01:00
Oskar Hahn 6b73c5bf1a activate start command 2019-01-20 11:24:42 +01:00
Emanuel Schütze c704b90ecb Fix history migration. 2019-01-20 11:05:49 +01:00
Emanuel Schütze 251cc4acc1
Merge pull request #4147 from emanuelschuetze/history-table
Improved history table.
2019-01-20 10:35:23 +01:00
Emanuel Schütze 33d9468e6b
Merge pull request #4153 from normanjaeckel/RecExtension
Fixed following recommendations with extensions.
2019-01-20 10:21:56 +01:00
Emanuel Schütze 344debf03a
Merge pull request #4154 from emanuelschuetze/static
Fixes for using pypi package
2019-01-20 09:57:35 +01:00
Emanuel Schütze 2c5d8ea29e Improved history table. 2019-01-20 09:46:41 +01:00
Emanuel Schütze 23f7dce6a2 Fixes for using pypi package
- Fix static path for manifest and login logo.
- Use insecure=True (required to serve static files via development
  server with DEBUG=False).
2019-01-20 09:37:42 +01:00
Emanuel Schütze 034a4d2a67
Merge pull request #4144 from MaximilianKrambach/dateSort
sort by date in motion
2019-01-19 22:43:29 +01:00
Emanuel Schütze ec769a82a4
Merge pull request #4151 from emanuelschuetze/rest
Revert rest fix for proxy.conf.json
2019-01-19 22:41:19 +01:00
Norman Jäckel 7c6e98fae6 Fixed following recommendations with extensions. 2019-01-19 22:36:41 +01:00
Norman Jäckel 030f610f2f Fixed last_modified saving. 2019-01-19 22:11:40 +01:00
Emanuel Schütze a7eaecfa14
Merge pull request #4143 from MaximilianKrambach/callList
Speaker list opening/closing/clearing
2019-01-19 22:05:45 +01:00
Emanuel Schütze 16ee9414dc Revert rest fix for proxy.conf.json
see commit c703ba9e5f
2019-01-19 21:59:32 +01:00
Maximilian Krambach f47ec28977 speaker remove/ open+close list functionality 2019-01-19 21:50:22 +01:00
Maximilian Krambach 10550fe228 fix server set marked for users that already have spoken 2019-01-19 21:28:18 +01:00
FinnStutzenstein 74e0bea108 Wirst work for the projector system on the client 2019-01-19 21:26:05 +01:00
Maximilian Krambach 6d18d70845 sort by date in motion 2019-01-19 21:21:20 +01:00
Emanuel Schütze 12c6554064
Merge pull request #4146 from MaximilianKrambach/configReset
config reset
2019-01-19 21:12:52 +01:00
Emanuel Schütze c26daad07d
Merge pull request #4149 from MaximilianKrambach/fixMotionPermission
fix motion change permission
2019-01-19 21:09:00 +01:00
Emanuel Schütze e6db2c97fc
Merge pull request #4142 from boehlke/fix_mediafiles_add
Extra check for type in updateValues
2019-01-19 21:05:12 +01:00
Maximilian Krambach 30d8812719 fix motion change permission 2019-01-19 19:01:44 +01:00
Maximilian Krambach e8de30b23e config reset 2019-01-19 18:19:57 +01:00
Oskar Hahn df85e01b16
Merge pull request #4145 from ostcar/logged_in_users
logged in users
2019-01-19 18:00:47 +01:00
Oskar Hahn 5ca2012c44 logged in users 2019-01-19 17:50:18 +01:00
Oskar Hahn a83de77180
Merge pull request #4141 from normanjaeckel/HistoryInformation
Added history information for some motion views.
2019-01-19 16:56:10 +01:00
Norman Jäckel 9db12293a3 Added history information for some motion views. 2019-01-19 16:41:58 +01:00
André Böhlke 5d458e01d4 Extra check for type in updateValues 2019-01-19 16:26:18 +01:00
Emanuel Schütze 3582e71bba
Merge pull request #4132 from MaximilianKrambach/motionViewPermissions
adding viewPermissions
2019-01-19 16:05:47 +01:00
Norman Jäckel 6aeedf39fd
Merge pull request #4140 from ostcar/autoupdate_and_delete
Autoupdate on element deletion
2019-01-19 15:50:47 +01:00
Oskar Hahn 7df842f2e2 delete wrong file 2019-01-19 14:48:01 +01:00
Oskar Hahn 11ba7b9841 Autoupdate on element deletion
Make sure, that a related element gets an autoupdate, when the main object is deleted
2019-01-19 14:46:59 +01:00
Maximilian Krambach fb51b54d5c check permissions for motions 2019-01-19 14:42:54 +01:00
Oskar Hahn a895481cef
Merge pull request #4131 from normanjaeckel/PasswordPerm
Added new permission to set password.
2019-01-19 14:33:10 +01:00
Oskar Hahn 27cb63174e
Merge pull request #4134 from normanjaeckel/MotionCreatedTimestamp
Added timestamp fields for motions.
2019-01-19 14:23:21 +01:00
Oskar Hahn 7a64fb83eb
Merge pull request #4135 from ostcar/projector_http_view
New projector III
2019-01-19 14:04:28 +01:00
Norman Jäckel 5aedf62018
Merge pull request #4104 from normanjaeckel/HistoryTimestamp
Used the same timestamp for multiple history objects.
2019-01-19 14:03:47 +01:00
Emanuel Schütze 2d40072f44
Merge pull request #4133 from MaximilianKrambach/sortEmpties
move empty/undefined sortings always to the alphabet's end
2019-01-19 11:55:10 +01:00
Maximilian Krambach 91dec2370b move empty/undefined sortings always to the alphabet's end 2019-01-19 11:41:17 +01:00
Emanuel Schütze 62c88280b6
Merge pull request #4137 from tsiegleauq/viewport-tablet-fixes
Fix naviagion hiding
2019-01-19 11:37:51 +01:00
Emanuel Schütze 36b72d573c
Merge pull request #4138 from tsiegleauq/enable-rest-for-ngsw
Allow navigating to /rest/ for the new ngsw setup
2019-01-19 11:37:33 +01:00
Emanuel Schütze b03538e564
Merge pull request #4136 from MaximilianKrambach/bulkState
client part of setMultiState
2019-01-19 11:21:51 +01:00
Norman Jäckel b15a57bbdd Added timestamp fields for motions. 2019-01-19 11:09:55 +01:00
Sean Engelhardt 9d3410af1c Fix naviagion hiding
Fixes an issue where the navigation panel was always hiding during
every navigation.

Also changes the backdrop of the navigation
2019-01-19 11:07:37 +01:00
Maximilian Krambach 6cd250a36d client part of setMultiState 2019-01-19 10:56:19 +01:00
Sean Engelhardt c703ba9e5f Allow navigating to /rest/ for the new ngsw setup 2019-01-19 10:49:40 +01:00
Oskar Hahn b4c3ffe01f New projector III
* Add a new view `project` to set the projector elements-fields
2019-01-19 10:47:11 +01:00
Norman Jäckel cb3e6c4e47
Merge pull request #4123 from normanjaeckel/BulkState
Set state for multiple motions.
2019-01-19 10:37:39 +01:00
Norman Jäckel 4da87d520d Added new permission to set password. 2019-01-19 10:35:13 +01:00
Norman Jäckel de7b531933 Used the same timestamp for multiple history objects. 2019-01-19 09:58:58 +01:00
Norman Jäckel 4261c3deed Set state for multiple motions. 2019-01-19 09:22:02 +01:00
Emanuel Schütze 1cdeb3bcb8
Merge pull request #4124 from normanjaeckel/Gender
Added gender field for users.
2019-01-19 09:17:08 +01:00
Oskar Hahn 24bb4ad0ad
Merge pull request #4130 from ostcar/new_projector_ii
New projector II
2019-01-19 09:01:43 +01:00
Oskar Hahn c37bf0fb4f New Projector
* Change Projector model
* Remove old http requests
* Remove old config values
* Remove uuid from config field
* Remove projector broadcast
* Remove projector blank
* Fix serializer
2019-01-19 08:19:40 +01:00
Emanuel Schütze 2d2a62402c
Merge pull request #4128 from normanjaeckel/AmendmentPerm
Added new permissions to create new amendments.
2019-01-18 22:23:06 +01:00
Emanuel Schütze 4985dea59d
Merge pull request #4127 from emanuelschuetze/ui
UI improvements
2019-01-18 22:07:50 +01:00
Norman Jäckel 85d9629776 Added new permissions to create new amendments. 2019-01-18 22:06:15 +01:00
Norman Jäckel 9bef7a8bc7
Merge pull request #4129 from normanjaeckel/KillBlack
Disable black during code sprint.
2019-01-18 21:31:31 +01:00
Emanuel Schütze 8536f46d01 UI improvements
- better select field for category and block in motion detail
- improved motion block views
- chips for submitters
- motion detail template
2019-01-18 21:31:21 +01:00
Emanuel Schütze f2b9ba0e52
Merge pull request #4120 from MaximilianKrambach/motiondetails
Motion: Favorites and some details
2019-01-18 21:22:34 +01:00
Norman Jäckel 34d2906aa2 Disable black during code sprint. 2019-01-18 21:20:43 +01:00
Maximilian Krambach 53a8392e33 motion detail imrovements 2019-01-18 20:58:35 +01:00
Sean 24cf01b03f
Merge pull request #4122 from tsiegleauq/os3-pdfmake
Add motion to pdf converter
2019-01-18 20:45:16 +01:00
Sean f7bc087c32
Merge pull request #4126 from MaximilianKrambach/follow_motionblock
simplify followRecommendation for motionBlock
2019-01-18 20:39:42 +01:00
Sean 5a74c7d662
Merge pull request #4121 from MaximilianKrambach/speechcount
warn/show speaker-call amount
2019-01-18 20:31:14 +01:00
Sean Engelhardt 9b61603dae Add motion to pdf converter
Adds the converstion from motion to PDF.
Uses pdfmake as the old openslides does
2019-01-18 20:25:06 +01:00
Norman Jäckel 168561bc55 Added gender field for users. 2019-01-18 19:47:00 +01:00
Maximilian Krambach 758abde410 simplify followRecommendation for motionBlock 2019-01-18 19:17:48 +01:00
Finn Stutzenstein 8bd24d690d
Merge pull request #4118 from FinnStutzenstein/notify
Make OS3 notify ready
2019-01-18 17:55:24 +01:00
Oskar Hahn d5b09b4513
Merge pull request #4106 from ostcar/python-3.6-f-strings
use f-string syntax for strings
2019-01-18 17:47:12 +01:00
FinnStutzenstein 728f3f84c4 Some teamwork improvements 2019-01-18 17:44:26 +01:00
Oskar Hahn b329115007 use f-string syntax for strings 2019-01-18 17:37:36 +01:00
Maximilian Krambach 3b5876009c warn/show speaker-call amount 2019-01-18 17:19:56 +01:00
FinnStutzenstein 47a09e4bce Make OS3 notify ready 2019-01-18 17:03:09 +01:00
Oskar Hahn 9563858c7a
Merge pull request #4119 from ostcar/projector_config_in_websocket
Add the projector config into the data send via websocket
2019-01-18 16:25:43 +01:00
Oskar Hahn 5127d659db Add the projector config into the data send via websocket 2019-01-18 15:38:20 +01:00
Sean eec3fba34a
Merge pull request #4114 from MaximilianKrambach/csvimport/all
csv-import for user and agenda(topics)
2019-01-18 14:20:39 +01:00
Maximilian Krambach c52fdaae6c csv-import for user and agenda(topics) 2019-01-18 13:15:54 +01:00
Sean c3ed0d0dad
Merge pull request #4112 from MaximilianKrambach/sortSearchFixes
sortSearch improvements (fixes #4098)
2019-01-18 13:05:47 +01:00
Maximilian Krambach 82a1ad8709 sortSearch improvements (#4098)
- "no workflows set" removed
-  motion block filter hides if there is no motion block
- inserted the group filter
- fixed display of agenda filter menu
- show plural if multiple filters are selected, show filtered amount
- recommendation, done/not done status filter
- active filter count and clearing option
- number of current items to the left
2019-01-18 12:51:04 +01:00
Emanuel Schütze 57202e74ca
Merge pull request #4117 from CatoTH/Issue4108-Unknown-ChangeRecoMode
Move lnMode/crMode/lineLength into components, Bugfix for lineLength …
2019-01-17 18:04:38 +01:00
Tobias Hößl 1966a4b4f8
Move lnMode/crMode/lineLength into components, Bugfix for lineLength - fixes #4108 2019-01-17 17:50:10 +01:00
Sean 566bb93ba5
Merge pull request #4115 from emanuelschuetze/pwa
Use OpenSlides as Progressive Web App (PWA).
2019-01-17 16:20:37 +01:00
Emanuel Schütze f83f3fed46 Use OpenSlides as Progressive Web App (PWA). 2019-01-17 15:58:05 +01:00
Sean 19a3fcebf3
Merge pull request #4088 from MaximilianKrambach/motionpoll
motion polls
2019-01-17 15:40:34 +01:00
Maximilian Krambach d5101714d1 motion polls 2019-01-17 14:03:34 +01:00
Sean 85a2597b27
Merge pull request #4110 from jsaalfeld/logo_component
adding and implementing logo component
2019-01-16 16:08:15 +01:00
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
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
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
FinnStutzenstein 3d4bd67980 new configs for statute amendments; improved the majorityMethod config variable
Removed none from os-search-value-selector; improved list of speakers
2018-11-22 17:34:00 +01:00
Finn Stutzenstein 8a7d0e8be9
Merge pull request #4018 from FinnStutzenstein/nested_dnd
angular2 tree
2018-11-22 17:21:45 +01:00
FinnStutzenstein 8e59170b76 Do not try to access the database during migrations 2018-11-22 17:20:17 +01:00
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
Sean Engelhardt 41f2adbc33 Enhanced head bar no 3 2018-11-07 16:21:29 +01:00
Jochen Saalfeld 22d436b6b6
Merge pull request #3988 from jsaalfeld/fix_postgres_migration
fixing #3987 - postgreSQL migration possible again
2018-11-07 08:34:11 +01:00
Jochen Saalfeld 87dbf90922
fixing #3987 - postgreSQL migration possible again 2018-11-06 12:47:47 +01:00
Emanuel Schütze 3fde4dc81f
Merge pull request #3986 from tsiegleauq/set_motion_states
Add motion states
2018-11-05 20:48:45 +01:00
Sean Engelhardt 5d06b8c417 Add motion states 2018-11-05 17:58:30 +01:00
Sean 7bfb097f12
Merge pull request #3967 from FinnStutzenstein/collectionStringModelMapperServiceCleanup
Remove the deprecation warning in the CollectionStringModelMapperService
2018-11-05 11:40:27 +01:00
Norman Jäckel e8a141387b
Merge pull request #3976 from ostcar/update_requirements.txt
Update requirements
2018-11-04 20:10:46 +01:00
Oskar Hahn f56da44606
Merge pull request #3974 from ostcar/remove_collection_element
Remove CollectionElement
2018-11-04 13:55:11 +01:00
Oskar Hahn 57758bed15 Update requirements
* Use a flake8 release again
2018-11-04 13:35:54 +01:00
Oskar Hahn eead4efe6a Remove CollectionElement
* Use user_id: int instead of Optional[CollectionElment] in utils
* Rewrote autoupdate system without CollectionElement
2018-11-04 01:06:01 +01:00
Oskar Hahn 93dfd9ef67
Merge pull request #3973 from ostcar/test_with_redis
add possebility to run tests with redis
2018-11-03 20:54:55 +01:00
Oskar Hahn f4f3ab9c49
Merge pull request #3972 from ostcar/websocket_use_restricted_data
Fix error, that user get full_data when restricted_data_cache was enabled
2018-11-03 20:53:52 +01:00
Oskar Hahn edbde302df
Merge pull request #3966 from ostcar/remove_collection_class
Remove utils.collections.Collection class and other cleanups
2018-11-03 20:53:34 +01:00
Oskar Hahn cd34d30866 Remove utils.collections.Collection class and other cleanups
* Activate restricted_data_cache on inmemory cache
* Use ElementCache in rest-api get requests
* Get requests on the restapi return 404 when the user has no permission
* Added async function for has_perm and in_some_groups
* changed Cachable.get_restricted_data to be an ansync function
* rewrote required_user_system
* changed default implementation of access_permission.check_permission to
  check a given permission or check if anonymous is enabled
2018-11-03 20:48:19 +01:00
FinnStutzenstein 621b0471f2 Client: password reset view and reset password confirm view 2018-11-03 20:43:49 +01:00
Norman Jäckel e03d715602 Added PasswordResetView. 2018-11-03 20:43:49 +01:00
Emanuel Schütze 2abf8e27ca Added missing migration file. Added permission to admin and staff group. 2018-11-03 20:17:41 +01:00
Norman Jäckel af26dedfaf Added new permission to manage metadata. 2018-11-03 20:17:41 +01:00
Oskar Hahn d11c7bbad7 add possebility to run tests with redis 2018-11-03 16:59:21 +01:00
Oskar Hahn 6480f1cee9 Fix error, that user got full_data when restricted_data_cache was enabled 2018-11-03 14:37:47 +01:00
Emanuel Schütze f48410024e
Merge pull request #3931 from MaximilianKrambach/os3/export
CSV export (example implementation in user list)
2018-11-02 20:09:34 +01:00
Sean a098e5c5c9
Merge pull request #3929 from FinnStutzenstein/motionComment
motion comments in the motion detail view
2018-11-02 18:46:16 +01:00
Maximilian Krambach 86b6296205 saving as CSV implemented (user list) 2018-11-02 17:57:44 +01:00
Sean 8aca83a6bf
Merge pull request #3964 from jsaalfeld/fix_urlPrefix
fixing urlPrefix in prod environment
2018-11-02 10:14:21 +01:00
Jochen Saalfeld 8b191e9e0a
fixing urlPrefix in prod environment 2018-11-02 08:49:02 +01:00
FinnStutzenstein b749231213 Remove the deprecation warning in the CollectionStringModelMapperService 2018-11-02 08:36:03 +01:00
Finn Stutzenstein 5b3e63ac82
Merge pull request #3960 from jsaalfeld/update_dockerfile
updating Dockerfile for Version 3
2018-11-02 08:16:30 +01:00
Finn Stutzenstein 0b1d11f03f
Merge pull request #3965 from ostcar/fix_change_id_on_connection
Fix error on to big change id on websocket connection
2018-11-02 07:48:24 +01:00
Oskar Hahn b97e643b33 Fix error on to big change id on websocket connection 2018-11-02 05:12:20 +01:00
FinnStutzenstein 430dbc1dff motion comments and personal note in the motion detail view 2018-11-01 13:09:09 +01:00
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
Sean Engelhardt faef3ac97e Hotfix for MotionStatute 2018-10-12 13:11:05 +02:00
Finn Stutzenstein 64e9cb9e29
Merge pull request #3910 from FinnStutzenstein/superadmin
Superadmin group
2018-10-12 09:16:33 +02:00
FinnStutzenstein 1e4eacecfd New superadmin group 2018-10-12 07:58:18 +02:00
Finn Stutzenstein 8cd55352c6
Merge pull request #3894 from FinnStutzenstein/newMotionFeatures
New motion features
2018-10-12 07:34:43 +02:00
FinnStutzenstein f7d392f1fc New motion features
- Added weight and sort_parent fields to the motion model
- Added motion sort view (adapted from agenda)
- Added statute-paragraph model and tests for it
- Added statute_paragraph foreign key to the motion model
- Created migrations for sorting and statute-paragraph
2018-10-12 07:15:58 +02:00
Sean db29d1cab1
Merge pull request #3915 from MaximilianKrambach/os3/fonts
os3: Change default font to Roboto
2018-10-11 15:07:34 +02:00
Maximilian Krambach 831b0a42ae add roboto/roboto-condensed font, set as used font (wip) 2018-10-11 14:37:20 +02:00
Finn Stutzenstein 24abdc7bd0
Merge pull request #3905 from FinnStutzenstein/commentfields
Motion comment section list
2018-10-09 14:03:30 +02:00
FinnStutzenstein b1ea59ea28 Motion comment section list 2018-10-09 13:57:55 +02:00
Finn Stutzenstein d1bc995830
Merge pull request #3908 from tsiegleauq/ul-groups
Add group matrix.
2018-10-09 13:41:33 +02:00
sean 33922f1abf Add group matrix.
Create, Read, Update, Delete works
2018-10-09 13:36:30 +02:00
Finn Stutzenstein 81aa763ae9
Merge pull request #3895 from MaximilianKrambach/os3/settings
implement settings
2018-10-09 13:13:33 +02:00
Maximilian Krambach 5c1092b537 implement settings
Whats still missing, but has not a high priority:
- DateTimePicker. Entering dates through the popup works (but only with
a hack in the config-field.component update() method). Displaying values
from the server does not work. Also the localisation is missing. See
attempts to fix it in the sheared module.
- Errors, if the server cannot be reached. Should be solved in another
PR fixing the datasendservice and make generic error messages.
- Custom translations are missing
2018-10-09 13:06:44 +02:00
Finn Stutzenstein 8a04951940
Merge pull request #3865 from FinnStutzenstein/OpenSlides-3-tests
OpenSlides 3 tests
2018-10-08 14:16:55 +02:00
Tobias Hößl 9f291308aa Initial tests for OpenSlides3. Parallel execution of server and client
tests.
2018-10-08 14:10:18 +02:00
Sean 5d4faa288b
Merge pull request #3897 from jsaalfeld/angular7
Updating Angular to the new 7 RC
2018-10-01 17:26:48 +02:00
Jochen Saalfeld e013aeea64
Updating Angular to the new 7 beta
This enables us to use Drag n Drop and other components, without
using any plugins.
2018-10-01 09:06:40 +02:00
Finn Stutzenstein 19d78a3361
Merge pull request #3890 from FinnStutzenstein/plugins3
App initialization
2018-09-28 15:55:37 +02:00
Sean 9e0872878a
Merge pull request #3901 from tsiegleauq/motion_control+fix
Add motion controls + small fixes
2018-09-28 15:51:22 +02:00
Sean Engelhardt 0c05eb38e2 Add motion controls + small fixes 2018-09-28 15:18:20 +02:00
Oskar Hahn 2b5df310af
Merge pull request #3892 from ostcar/update-dev-tools
update the dev tools
2018-09-28 15:13:04 +02:00
FinnStutzenstein be9f98cfd0 App initialization
Used for internal apps as well as for plugins. The pluginpart is
currently missing, in fact that the main OpenSlides part is more
important. Apps can give their models and mainmenu entries.

Routes are not enabled, because the routes have to be static for webpack
to build the bundles. If we want to keep lazy loading, I see no
possibility to encapsulate the routes from the site-routing module.
2018-09-28 15:03:04 +02:00
Sean b6ad0d759c
Merge pull request #3891 from tsiegleauq/cu-user
User create update and details view

Some open tasks left (features are quire heavy). See recent issues
2018-09-28 12:42:30 +02:00
sean adb7556be0 User create update and details view 2018-09-28 12:29:33 +02:00
Norman Jäckel 8bc7828e60
Merge pull request #3868 from tsiegleauq/remove_root_package-lock
Remove package-lock from root, add it to gitignore (fixes #3858)
2018-09-24 21:11:19 +02:00
Emanuel Schütze d4f9da9cdb
Merge pull request #3889 from FinnStutzenstein/fixImagePlugin
Fix image plugin
2018-09-24 13:06:50 +02:00
Sean 781a2dcdf8
Merge pull request #3887 from jsaalfeld/categories
implementing categories
2018-09-24 10:53:30 +02:00
Jochen Saalfeld d785d77207 restructuring patching of values to ensure type safety
fix disappearing submitters (hopefully)

- replaced "motion from form values" function with deserialize
- fix some typos
- make id id again

null, in contrast to undefined, will be send to the server...

Better typing and changed the create/update signatures in BaseViewModel

- use object as default type for BaseModel.
- use partial objects for updating
- Displayable should not have an id. Moved this into own interface
Identifiable and make the id in the BaseViewMotion abstract.
- create only takes a BaseModel. A ViewModel should not exists so far.
- Updated the update and create method for motions.
2018-09-24 10:45:53 +02:00
Oskar Hahn 07a8a5c3cb update the dev tools 2018-09-23 18:07:49 +02:00
Oskar Hahn b6968fdfd5
Merge pull request #3843 from ostcar/ensuce_cache
ensures test on startup
2018-09-23 17:12:04 +02:00
Oskar Hahn 9af6bf1606 ensures test on startup 2018-09-23 16:57:49 +02:00
FinnStutzenstein eebd7a1fce Fix image plugin 2018-09-20 13:06:02 +02:00
Jochen Saalfeld 48526d6c19
implementing categories 2018-09-20 11:22:24 +02:00
Emanuel Schütze d2c4aff7a4
Merge pull request #3888 from emanuelschuetze/release2.3
Release 2.3
2018-09-20 09:33:18 +02:00
Emanuel Schütze dca94333e8 Update version to 2.3.1-dev 2018-09-20 09:27:03 +02:00
Emanuel Schütze 772c032357 Release 2.3 2018-09-20 09:24:34 +02:00
Emanuel Schütze 7b9d84dabd
Merge pull request #3886 from FinnStutzenstein/export-filename
Fixed filenames in motion export dialog
2018-09-18 19:37:02 +02:00
FinnStutzenstein 2815d5f62c Fixed filenames in motion export dialog 2018-09-18 15:03:55 +02:00
Finn Stutzenstein 849da27745
Merge pull request #3877 from tsiegleauq/views
Create more list views
2018-09-18 11:52:10 +02:00
Emanuel Schütze 3481ca58d8
Merge pull request #3885 from emanuelschuetze/translations
Updated German translations.
2018-09-18 11:23:17 +02:00
Emanuel Schütze 7a9921a85f Updated German translations. 2018-09-18 10:42:57 +02:00
Sean Engelhardt 80cfeaac35 Create more list views
Also:
- Update dependencies
- Clean up proxy file
2018-09-18 10:21:59 +02:00
Emanuel Schütze 9432367f1b
Merge pull request #3884 from FinnStutzenstein/fixes
Little fixes for current master (fixes #3883, fixes #3882, fixes #3880)
2018-09-18 09:57:01 +02:00
FinnStutzenstein f17951f363 Little fixes for current master (fixes #3883, fixes #3882, fixes #3880) 2018-09-18 09:49:40 +02:00
Finn Stutzenstein 582c2603a6
Merge pull request #3860 from FinnStutzenstein/fixed-config-variables
Moved the collection of config variables before the generation of ang…
2018-09-18 07:56:12 +02:00
FinnStutzenstein 180dedfc38 Moved the collection of config variables before the generation of angular constants 2018-09-18 07:50:33 +02:00
Emanuel Schütze c164766fa5
Merge pull request #3879 from emanuelschuetze/readme
Updated 'used software' links in README. Fixed formatting for pypi.
2018-09-17 10:24:17 +02:00
Emanuel Schütze f340048d56 Updated 'used software' links in README. Fixed formatting for pypi. 2018-09-17 09:46:51 +02:00
Sean 9d59da1352
Merge pull request #3869 from FinnStutzenstein/modelInterface
Introduce more basemodel functionality used by the agenda, generic views
2018-09-14 11:06:30 +02:00
FinnStutzenstein 1ee76de417 Handling of titles, projection and content objects in items
Restructure the titles for motion, motion-block, assignment and topic.
Less possibilities for more clear code. Added mote base models enabling
functionalities of projection and being a content object for items
2018-09-14 08:36:35 +02:00
Sean 68b39ee8f4
Merge pull request #3870 from FinnStutzenstein/DS
Don't static-inject the DataStore
2018-09-13 17:17:26 +02:00
FinnStutzenstein faa2507c0d remove console.log 2018-09-13 15:07:56 +02:00
FinnStutzenstein 1b691f5eb6 Removed root injector 2018-09-13 15:06:43 +02:00
Finn Stutzenstein 2269ddef91
Merge pull request #3866 from jsaalfeld/sc_multi_value_selector
multi-value-selector as shared component
2018-09-13 08:33:18 +02:00
Jochen Saalfeld 535e0b2ba3
search-value-selector as shared component
Also making sure that every BaseModel implements onString to be
displayable by a Selector.

And adding the new search-value-selector in the motion-detail-view
2018-09-13 07:57:46 +02:00
Sean Engelhardt 7e91f416ec Remove package-lock from root, add it to gitignore 2018-09-11 11:13:56 +02:00
Sean 34412c7d9e
Merge pull request #3867 from FinnStutzenstein/baseRepo
first work for BaseRepo
2018-09-11 11:02:25 +02:00
FinnStutzenstein 0a40e4e292 first work for BaseRepo 2018-09-11 10:50:53 +02:00
Finn Stutzenstein c25aa682ef
Merge pull request #3854 from tsiegleauq/motion_repo
Motion Repository
2018-09-10 14:59:17 +02:00
Sean Engelhardt 39f266d2de Motion Repository
Adds a repository to remove the logic in the motion domain object
The repository will add a new model layer between the components
and the domain objects

implicitly add a new buttion into the motion detail view
2018-09-10 14:53:47 +02:00
Finn Stutzenstein a5f06d3347
Merge pull request #3863 from FinnStutzenstein/constructors
rework on model constructors, adapt newest changes to motion models
2018-09-10 11:57:29 +02:00
FinnStutzenstein 4717529ed0 rework on model constructors, adapt newest changes to motion models 2018-09-10 11:47:28 +02:00
Finn Stutzenstein 44b287248c
Merge pull request #3864 from tsiegleauq/restructure_pp_ln
Routing for Privacy Policy and Legal Notice + Restructure Login Components
2018-09-10 11:46:22 +02:00
FinnStutzenstein 3e0618063b Routing for the privacy policy and legal notice.
Save those values in a new service, that will also watch for changes in
config variables. UI is not good; this can be done later

Share legal notice and privacy policy

Created some containers for them
2018-09-10 11:39:46 +02:00
Finn Stutzenstein 805b6a3fdd
Merge pull request #3862 from FinnStutzenstein/linter
Stricter linting rules
2018-09-10 10:32:19 +02:00
FinnStutzenstein 9bb44f13bd Stricter linting rules
Parameter and return types are required now
2018-09-10 10:24:28 +02:00
Finn Stutzenstein 0abd36b75c
Merge pull request #3861 from FinnStutzenstein/interfered-generics-in-DS
Type interference for the DS
2018-09-10 10:14:07 +02:00
FinnStutzenstein dc0c92253d Type interference for the DS 2018-09-10 09:53:21 +02:00
Finn Stutzenstein 548e720795
Merge pull request #3842 from FinnStutzenstein/no-motion-version
Remove motion version and comments rework
2018-09-10 09:09:14 +02:00
FinnStutzenstein f1ddd16dc6 Motion rework
- remove motion version
- migrations for versions and change recommendations
- Redone motion comments. Wording changed from comment fields to comment
  sections
- fixed test order, tests are not atomic
- introduce get_group_model. Just use OpenSlides Groups and not the
django's ones.
2018-09-10 09:00:55 +02:00
Finn Stutzenstein 3b57fbcd8c
Merge pull request #3857 from FinnStutzenstein/delete-observable
changed and deleted observable for the datastore. Removed ModelId
2018-09-10 08:33:20 +02:00
Finn Stutzenstein 1d16c6e88e
Merge pull request #3856 from jsaalfeld/npm_updates
updating dependencies and replacing node-uuid with uuid
2018-09-10 08:16:57 +02:00
FinnStutzenstein e53a75f922 changed and deleted observable for the datastore. Removed ModelId 2018-09-07 12:51:16 +02:00
Finn Stutzenstein befbaba525
Merge pull request #3853 from FinnStutzenstein/workflowId
Expose the workflow id during motion serialization
2018-09-07 11:12:07 +02:00
Jochen Saalfeld 68e27c439e
updating dependencies and replacing node-uuid with uuid 2018-09-07 10:59:13 +02:00
Finn Stutzenstein e0c38cba01
Merge pull request #3855 from jsaalfeld/fix_migrate
fixing pytest version and continue if db not available
2018-09-07 10:49:50 +02:00
Jochen Saalfeld b5366ea90f
fixing pytest version and continue if db not available 2018-09-07 10:39:16 +02:00
FinnStutzenstein 9226874010 Expose the workflow id during motion serialization 2018-09-06 13:39:16 +02:00
Norman Jäckel 4feb2a8e21
Merge pull request #3828 from ostcar/super_fastest_even_faster
Faster then fastes big_mode (with tests)
2018-09-04 21:14:00 +02:00
Finn Stutzenstein 32c7959b1c
Merge pull request #3849 from FinnStutzenstein/constructors
less constructors
2018-09-04 14:58:32 +02:00
FinnStutzenstein 98250f4e45 less constructors 2018-09-04 14:46:21 +02:00
Finn Stutzenstein 753f5f2175
Merge pull request #3850 from FinnStutzenstein/config
ConfigService
2018-09-04 14:44:14 +02:00
FinnStutzenstein 698f3d83fe ConfigService 2018-09-04 14:12:10 +02:00
Finn Stutzenstein 05dd25bf0d
Merge pull request #3845 from tsiegleauq/motion_desktop_view
Add Motion Detail Desktop view
2018-09-04 12:33:35 +02:00
Finn Stutzenstein fab5a8ec02
Merge pull request #3847 from jsaalfeld/fix_footer
inserting fixed footer (with @tsiegleauq)
2018-09-04 12:21:38 +02:00
Jochen Saalfeld 9f226c75ee
inserting fixed footer (with @tsiegleauq) 2018-09-04 12:09:14 +02:00
Sean Engelhardt 90e8c81ddc Add Motion Detail Desktop view 2018-09-04 11:49:58 +02:00
Finn Stutzenstein fa9d8de21c
Merge pull request #3841 from FinnStutzenstein/models-more-types-and-cleanup
More type annotations and resulting changes, cleanup
2018-09-04 11:27:51 +02:00
Finn Stutzenstein 1b02b7c692
Merge pull request #3837 from FinnStutzenstein/constants
Angular constants via WebSocket
2018-09-04 09:40:12 +02:00
FinnStutzenstein 41c09ce9ea More type annotations and resulting changes, cleanup 2018-09-04 09:39:51 +02:00
FinnStutzenstein ea71d0a942 moved privacy policy to users, adapt client 2018-09-04 08:57:54 +02:00
Oskar Hahn 732de97ec2 Make Consumer real async again 2018-09-04 08:57:50 +02:00
FinnStutzenstein 8adaa6118a Angular constants via WebSocket
- new format for constants on the server
- adaptions for the old client
2018-09-04 08:57:11 +02:00
Finn Stutzenstein b6f6d6f720
Merge pull request #3844 from jsaalfeld/update_compodoc
updating the compodoc run command
2018-09-04 08:52:46 +02:00
Finn Stutzenstein 65a9fe2fa2
Merge pull request #3846 from tsiegleauq/change-prefix
change the global prefix to "os"
2018-09-04 08:47:13 +02:00
Sean Engelhardt 0f55527d6a change the global prefix to "os"
Also:
Set linting output to "stylish" (more readable error messages in terminal output)
Remove 2nd linting output
rename "appOsPerms" to just "osPerms" including filename and classname
rename all selectors from "app" to "os"
2018-09-03 18:13:57 +02:00
Jochen Saalfeld 5da2bed4d1
updating the compodoc run command 2018-09-03 12:05:01 +02:00
Jochen Saalfeld b4498e1534 use 3.7-slim instead of 3.7 (#17) 2018-09-01 21:03:57 +02:00
Oskar Hahn c3bc1487d7
Merge pull request #3823 from ostcar/fix_empty_data_in_rest
fix empty values in rest
2018-09-01 15:13:54 +02:00
Emanuel Schütze db919d3a4b
Merge pull request #3840 from emanuelschuetze/release2.3b1
Release2.3b1
2018-08-30 15:34:13 +02:00
Emanuel Schütze 865940bd12 Update version to 2.3b2-dev 2018-08-30 15:24:42 +02:00
Emanuel Schütze 90370ea628 Release 2.3b1 2018-08-30 15:24:42 +02:00
Emanuel Schütze cbd7566885
Merge pull request #3839 from emanuelschuetze/translations
Final translations for 2.3
2018-08-30 15:24:06 +02:00
Emanuel Schütze 48537dbfbf Updated all translations. 2018-08-30 15:08:51 +02:00
Emanuel Schütze 6bae5cf87a Fixed translation strings and permission check. Updated Changelog. 2018-08-30 15:05:08 +02:00
Finn Stutzenstein 970f9e19b2
Merge pull request #3836 from FinnStutzenstein/linter
More linter rules
2018-08-29 15:11:53 +02:00
FinnStutzenstein b4e7d949b1 More linter rules 2018-08-29 13:57:43 +02:00
Finn Stutzenstein b07641b85c
Merge pull request #3834 from FinnStutzenstein/operator
Auth/Operator/Anonymous/WS-Stuff
2018-08-29 13:13:45 +02:00
FinnStutzenstein 4e41e8c603 Auth/Operator/Anonymous/WS-Stuff
- operator is more lightweight
- auth and auth-guard service updated
- anonymous in login form
- improved login form
- websocket retries to reconnect
2018-08-29 13:07:05 +02:00
Finn Stutzenstein 4f463470fc
Merge pull request #3835 from tsiegleauq/head-bar-component
Add reusable head bar component
2018-08-28 14:42:01 +02:00
Sean Engelhardt 897488f3a4 Add reusable head bar component
- implement the head bar in all apps
- work on the documentation
2018-08-28 13:55:19 +02:00
Finn Stutzenstein 65a945841c
Merge pull request #3833 from jsaalfeld/travis-linting
Travis linting and some minor changes
2018-08-28 10:47:12 +02:00
Jochen Saalfeld f8d29d083a
Travis linting and some minor changes
* properly ignore multiple virtual environments and vscode folders

* use scss instead of css in app.component

* remove yarn from client

* remove deprication error

* auditing packages

* updating travis to work with the new client
2018-08-28 10:35:22 +02:00
Finn Stutzenstein 3fced15d7f
Merge pull request #3831 from FinnStutzenstein/clientCaching
Caching, preparations for the chage id
2018-08-27 12:41:56 +02:00
FinnStutzenstein 4d6f703e32 Caching, preparations for the chage id 2018-08-27 12:36:33 +02:00
Emanuel Schütze 1dd1a4bac8
Merge pull request #3832 from FinnStutzenstein/hideSortInAgenda
Hide Sort button in agenda (closes #3812)
2018-08-27 12:14:26 +02:00
FinnStutzenstein d1b52a9302 Hide Sort button in agenda (closes #3812) 2018-08-27 11:24:52 +02:00
Emanuel Schütze b3e86c0507
Merge pull request #3830 from emanuelschuetze/categoryListView
Added motion category list view.
2018-08-27 10:09:52 +02:00
Emanuel Schütze ba496d54b4 Added motion category list view. 2018-08-27 09:10:57 +02:00
Oskar Hahn 2ae42caceb Faster then fastes big_mode (with tests) 2018-08-25 17:11:29 +02:00
Emanuel Schütze bec7224c9b
Merge pull request #3827 from emanuelschuetze/motion-pdf-default
Change default for motion export dialog.
2018-08-24 16:23:22 +02:00
Emanuel Schütze 702bc67334 Change default for motion export dialog. 2018-08-24 16:14:01 +02:00
Emanuel Schütze 053b284691
Merge pull request #3826 from emanuelschuetze/motionPDF
Enable/disable category in motion PDF.
2018-08-24 14:52:17 +02:00
Emanuel Schütze 56706e6cef
Merge pull request #3824 from tsiegleauq/work-on-motion-copy
Work on local motion copy
2018-08-24 14:05:31 +02:00
Emanuel Schütze 6c2fbf7389 Enable/disable category in motion PDF. 2018-08-24 14:00:53 +02:00
Oskar Hahn a67e0943fb
Merge pull request #3825 from ostcar/OpenSlides-3
fix new super fast big mode (even faster)
2018-08-24 13:07:41 +02:00
Oskar Hahn 2613c7fe05 fix new super fast big mode (even faster) 2018-08-24 12:36:21 +02:00
Sean Engelhardt 5fc85f2621 Work on local motion copy 2018-08-24 12:29:07 +02:00
Oskar Hahn dc7ca5e2c4 fix empty values in rest 2018-08-24 12:14:02 +02:00
Finn Stutzenstein 52df9dee68
Merge pull request #3822 from FinnStutzenstein/clientCaching
Singleton DS, inject things into it.
2018-08-24 10:54:58 +02:00
FinnStutzenstein 95564f9a74 Singleton DS, inject things into it. 2018-08-24 10:47:17 +02:00
Norman Jäckel 36cfb41ff7
Merge pull request #3818 from normanjaeckel/Changelog
Changed CHANGELOG.
2018-08-23 21:53:23 +02:00
Norman Jäckel 7c96e2f462 Changed CHANGELOG. 2018-08-23 21:50:46 +02:00
Oskar Hahn 401e7821ae Merge remote-tracking branch 'upstream/master' into OpenSlides-3 2018-08-23 21:31:24 +02:00
Norman Jäckel 7dd7bb1b8d
Merge pull request #3807 from ostcar/websocket_protocol
Add a protocol for websocket
2018-08-23 21:15:48 +02:00
Norman Jäckel 39e27c740e
Merge pull request #3817 from ostcar/extra_requirements
Add an easier way to install big_mode
2018-08-23 21:05:31 +02:00
FinnStutzenstein 22f7d84cae New websocket message format for both clients 2018-08-23 21:02:59 +02:00
Oskar Hahn fed6d6f435 Add a protocol for websocket
{'type': STRING, 'content': ANY}
2018-08-23 21:02:52 +02:00
Oskar Hahn d21d7dc49e Add an easier way to install big_mode 2018-08-23 20:58:56 +02:00
Oskar Hahn e8283ac90b
Merge pull request #3805 from ostcar/drop_python3.5
drop python 3.5
2018-08-23 17:59:57 +02:00
Oskar Hahn aac9dcabf5 drop python 3.5 2018-08-23 17:51:30 +02:00
Finn Stutzenstein cbf8a33b8d
Merge pull request #3815 from tsiegleauq/MobileObserveService
ViewportService and new Prefix
2018-08-23 17:38:42 +02:00
Emanuel Schütze 96637e18c4
Merge pull request #3804 from normanjaeckel/ChangeCollectStatic
Fixed collectstattic command so that it does not write into openslide…
2018-08-23 17:38:26 +02:00
Emanuel Schütze 2a4056816c
Merge pull request #3816 from emanuelschuetze/translations
Updated German translations.
2018-08-23 17:30:15 +02:00
Sean Engelhardt 3d54ee9668 Add viewport service, adjust proxy and environment 2018-08-23 17:25:58 +02:00
Emanuel Schütze 7d24066be7 Updated German translations. 2018-08-23 17:20:40 +02:00
Emanuel Schütze c49eb8bf64
Merge pull request #3808 from FinnStutzenstein/diverses
Layout changes for motion detail view and PDF
2018-08-23 16:49:30 +02:00
FinnStutzenstein cece35b3a5 Layout changes for motion detail view and PDF 2018-08-23 16:38:12 +02:00
Norman Jäckel e012589ab0
Merge pull request #3814 from emanuelschuetze/fix3813
Fixed TypeError in Motion and Assignment Slides (Fixed#3813)
2018-08-23 15:48:15 +02:00
Emanuel Schütze 8ed043bbe8
Merge pull request #3806 from normanjaeckel/FixAgenda
Fixed agenda get_restricted_data() if no agenda items exist.
2018-08-23 15:47:34 +02:00
Norman Jäckel 3578d0e850 Fixed collectstattic command so that it does not write into openslides app dir. 2018-08-23 15:47:19 +02:00
Emanuel Schütze c852f72c20
Merge pull request #3811 from normanjaeckel/ElectionBar
Fixed assignment election bar for votes mode. Fixed #3598.
2018-08-23 15:42:50 +02:00
Emanuel Schütze 0036567f7d Fixed TypeError in Motion and Assignment Slides (Fixed#3813)
in MotionPollDecimalPlaces and AssignmentPollDecimalPlaces
2018-08-23 15:39:15 +02:00
Finn Stutzenstein 95c6628732
Merge pull request #3809 from tsiegleauq/MotionStates
Read the Workflow by state_id in Motion
2018-08-23 15:11:03 +02:00
Sean Engelhardt fc7f68f7db Read the motion workflow by state 2018-08-23 15:00:49 +02:00
Finn Stutzenstein 172f1ed890
Merge pull request #3810 from emanuelschuetze/workflow-sorting
Fix sorting of states in workflow detail view.
2018-08-23 14:35:04 +02:00
Oskar Hahn 545431e23a
Merge pull request #3799 from ostcar/new_big_mode
Updates files for big mode
2018-08-23 11:37:18 +02:00
Norman Jäckel cbd970ba9d Fixed assignment election bar for votes mode. Fixed #3598. 2018-08-23 11:30:46 +02:00
Norman Jäckel 123b7c702b
Merge pull request #3803 from FinnStutzenstein/voting_decimal_places
Support for decimal places in motion and assignment polls
2018-08-23 11:28:26 +02:00
Oskar Hahn 062862683b Updates files for big mode 2018-08-23 11:26:05 +02:00
Emanuel Schütze 2cd8262025 Fix sorting of states in workflow detail view. 2018-08-23 11:12:53 +02:00
Norman Jäckel dc4fd6a93e Fixed agenda get_restricted_data() if no agenda items exist. 2018-08-23 09:48:47 +02:00
Emanuel Schütze 768c97e89c
Merge pull request #3785 from FinnStutzenstein/no-changeable-first-state
Do not allow changing a workflow's first state (closes #3778)
2018-08-23 09:24:29 +02:00
FinnStutzenstein 9c1290ee0b Do not allow changing a workflow's first state (closes #3778) 2018-08-23 09:09:18 +02:00
FinnStutzenstein 9bac396b67 Support for decimal places in motion and assignment polls 2018-08-23 08:53:59 +02:00
Oskar Hahn d09086f08c
Merge pull request #3798 from ostcar/url-schema
New url schema
2018-08-22 22:14:05 +02:00
Oskar Hahn e5dd857e87 New url schema 2018-08-22 22:05:06 +02:00
Emanuel Schütze 11958c9d1b
Merge pull request #3801 from normanjaeckel/FixAgenda
Changed default agenda type for new topics.
2018-08-22 17:47:09 +02:00
Norman Jäckel 27e0564a23 Changed default agenda type for new topics. 2018-08-22 17:27:21 +02:00
Norman Jäckel 48a2a3fe53 Fixed settings creation for windows. 2018-08-22 16:51:46 +02:00
Emanuel Schütze ad6d05639d
Merge pull request #3800 from tsiegleauq/ms4
Add create update forms
2018-08-22 16:28:05 +02:00
Norman Jäckel 83295ebec1
Merge pull request #3797 from normanjaeckel/FixWindows
Fixed settings creation for windows.
2018-08-22 16:04:28 +02:00
Sean Engelhardt 70416df50b Add data-send, option to delete motion 2018-08-22 16:03:49 +02:00
Norman Jäckel 07ffb3b6c5 Fixed settings creation for windows. 2018-08-22 12:39:59 +02:00
Sean Engelhardt de61505b00 Put/Post motions to server
Temporarily over dataStore, will need own service
2018-08-22 11:26:53 +02:00
Oskar Hahn 6d1d085e28
Merge pull request #3796 from ostcar/channels2
Update to  channels 2
2018-08-22 06:37:29 +02:00
Oskar Hahn 10b3bb6497 Update to channels 2
* geis does not work with channels2 and never will be (it has to be python now)
* pytest
* rewrote cache system
* use username instead of pk for admin user in tests
2018-08-22 06:30:11 +02:00
Sean Engelhardt 133ecb4724 add new Motion form 2018-08-21 14:56:26 +02:00
Oskar Hahn d11d2844b8 Merge remote-tracking branch 'upstream/master' into OpenSlides-3 2018-08-20 20:54:54 +02:00
sean b808228b42 Save updated motion in DataStore, reactive form 2018-08-20 18:13:28 +02:00
Sean Engelhardt d26d131fa6 Motion Workflow observing 2018-08-20 15:30:56 +02:00
Sean Engelhardt f1da2689b9 Add motion update form 2018-08-17 15:18:33 +02:00
Emanuel Schütze dbd808c02b
Merge pull request #3794 from emanuelschuetze/translations
Updated German translations.
2018-08-17 10:21:25 +02:00
Emanuel Schütze 6bbaf39bce Updated German translations. 2018-08-17 09:13:09 +02:00
Emanuel Schütze c940275693
Merge pull request #3792 from FinnStutzenstein/diverses
Layout changes, config for enabling amendments in the motions table
2018-08-17 08:46:56 +02:00
FinnStutzenstein 65ec9cbf73 Layout changes, config for enabling amendments in motions table
- fixed update form bug, explicit link to parent motion
- br space in pdf and motion-text (restrict to linenumbermode none)
2018-08-17 08:38:41 +02:00
Emanuel Schütze 4605d4429c
Merge pull request #3790 from FinnStutzenstein/hidden-items
New item type internal.
2018-08-17 08:24:07 +02:00
FinnStutzenstein 1a17862d6b New item type internal.
The old hidden type was used as internal, so everything is changed to
not be shown if the item is internal. hidden is "new", and actually
behaves as hidden now.
2018-08-16 15:28:30 +02:00
Emanuel Schütze 32e20aa670
Merge pull request #3789 from FinnStutzenstein/redis-session
Use newer version of django-redis-sessions, new settings format
2018-08-15 11:45:52 +02:00
FinnStutzenstein 78dab97673 Use newer version of django-redis-sessions, new settings format 2018-08-15 11:37:20 +02:00
Sean Engelhardt 13470ed974 re-add package.json 2018-08-15 10:19:46 +02:00
Sean Engelhardt fa106a46c9 More dynamic Motion-Detail metainfo
* Adjust login page
* Rework legal notice and pp
* Add more custom animations
* Add Router to navigation panel
2018-08-15 10:19:46 +02:00
Sean Engelhardt 54cc737ede Create an infinite amount of virtual motions for testing 2018-08-15 10:19:46 +02:00
Sean Engelhardt 4b8076c562 Hide unset motion detail values. 2018-08-15 10:19:46 +02:00
Sean Engelhardt f01d3a5f6a Motion detail with routing
For small screens only
2018-08-15 10:19:46 +02:00
Sean Engelhardt 7856b7e07f Remove vertical dots, put lang menu in nav 2018-08-15 10:19:46 +02:00
Sean Engelhardt 0099c34615 enhance motion tables with observer 2018-08-15 10:19:46 +02:00
Sean Engelhardt 8cfb5bf597 Hide projector icon for now 2018-08-15 10:19:46 +02:00
Sean Engelhardt e36e4ed655 First motion list view 2018-08-15 10:19:46 +02:00
Sean Engelhardt cbb9185c2a Change language indicator 2018-08-15 10:19:46 +02:00
Sean Engelhardt fcc5c008a1 Read and observe config values in start page 2018-08-15 10:19:46 +02:00
Sean Engelhardt b64b49cc2e Layout and translation fixes 2018-08-15 10:19:46 +02:00
Sean Engelhardt c5b38cc430 Improve user menu 2018-08-15 10:19:46 +02:00
Sean Engelhardt a6ba1b92dc Add legal notice and privacy police
enhanced visuals and site container
2018-08-15 10:19:46 +02:00
Sean Engelhardt ec646a80dc Add animation to transitions, and navigation.
Also add new login page with validation
2018-08-15 10:19:46 +02:00
Sean Engelhardt 41ba616dc1 create OpenSlides3 Material CSS Theme
Add theming options, custom component theming.
Creating themes for specfic brands is very easy now.
2018-08-15 10:19:46 +02:00
Sean Engelhardt 76ce18cfd8 Add modules and lazy loading
- core modules contains core services
- shared module contains "dumb" components (directives, models)
  - used by nearly all modules
- site, it's children and projector are now feature modules
  - full lazy loading with independent routing
  - routing for children (extremely helpful for plugins (later))
2018-08-15 10:19:46 +02:00
Sean Engelhardt 6b09427565 document, restructure, add relations
- models get other models from DataStore (Relations)
- documentation using Compodoc
- rename and restructure
- http-interceptor makes all http-objections obsolete
- created 'Deserializable model' interface for better mapping of JSON objects
  - Supports multiple nested objects
  - No foreign dependancies, no magic
  - Simple yet efficient deserialize function
  - arrays of nested objects
- created more classes for better OOP AOP
2018-08-15 10:19:46 +02:00
Sean Engelhardt 30ac9c8e36 autoupdate, permissions, operator, directive
-overworked login and logout
-new directive 'appOsPerms'
(former os-perms)
-appOsPerms compares with groups in Operator
-login observes operator for user-information
(also serves as example on how to user observables and subjects)
-operator observes datastore for groups
(so the  operators knows it's groups by creation or directly after an
autoupdate)
2018-08-15 10:19:46 +02:00
Sean Engelhardt 2331ecd6b8 Add classes for models, rework datastore, injections
- Basic construction and datatypes of all objects
- create objects out of websocket response
- autoupdate service
- re-structure core models
- DataStore is easier to use
2018-08-15 10:19:46 +02:00
Sean Engelhardt 2b60b4ef4f simplify models, and datastore
- example on static functions and TS generics
- exmaple on data encapsulation and "single responsibility"
2018-08-15 10:19:46 +02:00
FinnStutzenstein 8b31fa15f2 First Idea for the DataStore 2018-08-15 10:19:46 +02:00
FinnStutzenstein b9116b799d updte yarn.lock 2018-08-15 10:19:46 +02:00
Sean Engelhardt e605649a9b Add translation module and lang switcher
- uses ngx-translate
- extracts all strings marked with " XXX | translate " or <X translate>
  using ngx-translate-extract (npm run extract)
- custom translation loader prevents empty strings
- default language is english
- will try to use the browsers language, will fallback to english
- functional language switching menu
- not compatible with current PO files
- current JSON-translation can be re-used
2018-08-15 10:19:46 +02:00
Sean Engelhardt 0b6996b700 Add WebSockets using rxjs/webSocket, autoupdate example 2018-08-15 10:19:46 +02:00
Sean Engelhardt 986e5f03b5 Add Material "Snackbar", restructure projector
- Since MaterialUI does not have an equivalent to bootstrap alterts,
the toast service and alert service are marked as deprecated for now.
The functionality has been replaced with the snackbar.
2018-08-15 10:19:46 +02:00
Sean Engelhardt 4966092b31 Add basic material ui components 2018-08-15 10:19:46 +02:00
Sean Engelhardt 42473e1a8a cleanup and refractor code
-combine the features of the two previous commits
-add prettier and pretty-quick
-more routing and logout button
2018-08-15 10:19:46 +02:00
FinnStutzenstein 3f78ba1f3d Structural changes:
- AuthenticationService->AuthService
- removed underscore-directories
- put site related stuff into site/
- same for projector
- auth service went into a core/ directory, used by site and projector
- the alert is now not global anymore. Every view can have its own alert
- make the auth service query users/whoami for the current user
- made a new OpenSlides service for managing the startup
... A lot todo ...
2018-08-15 10:19:45 +02:00
Sean Engelhardt ed2e44b484 Add scaffold for angular 6 client
- basic client structure
- authentication towards OS-server
- access REST-Api
- webpack proxy for convenient usage
- fontawesome
- twitter bootstrap 3.3.7
- login example (recreate login page)
- routing
- template for agenda and motions
- dynamic content loading
- custom alert component
- add auth-guard
- checks if a user is logged in and makes correct forwarding
- authentification towards OS works
- saving the log in information is WIP
2018-08-15 10:19:45 +02:00
Emanuel Schütze 944c00b8a0
Merge pull request #3788 from emanuelschuetze/translations
Updated German translations.
2018-08-14 15:40:44 +02:00
Emanuel Schütze ab587b48cd Updated German translations. 2018-08-14 15:33:33 +02:00
Emanuel Schütze 4b6936572f
Merge pull request #3781 from FinnStutzenstein/modified-final-version
New temporal field for editing the final version of a motion.
2018-08-14 14:24:08 +02:00
FinnStutzenstein e073084f74 New temporal field for editing the final version of a motion. 2018-08-14 14:15:11 +02:00
Emanuel Schütze 7e472ab472
Merge pull request #3787 from FinnStutzenstein/missing_templatehook
Added missing templatehook for the voting plugin
2018-08-14 13:33:10 +02:00
FinnStutzenstein 9f24ec559b Added missing templatehook for the voting plugin 2018-08-14 13:26:54 +02:00
Emanuel Schütze e9ad439cdd
Merge pull request #3774 from FinnStutzenstein/abstain-no-for-assignment-votes
Added general abstain/no fields for assignments. Used in votes mode.
2018-08-14 09:34:37 +02:00
Oskar Hahn 15e4832d40
Merge pull request #3786 from ostcar/requirements_again
support python 3.7
2018-08-11 12:56:56 +02:00
Oskar Hahn 92a39a3fc6 support python 3.7
fix new pep8 stype
2018-08-08 21:46:56 +02:00
Oskar Hahn bf3e000c5b
Merge pull request #3777 from ostcar/update-python-requirements
Update python requirements
2018-08-07 15:29:35 +02:00
Oskar Hahn acceeff8f8 * Update python requirements
* drop python 3.4
2018-08-07 15:23:11 +02:00
FinnStutzenstein bb654f7517 Added general abstain/no fields for assignments. Used in votes mode. 2018-07-28 12:29:26 +02:00
Emanuel Schütze 2da894b517
Merge pull request #3766 from tsiegleauq/Toc-Page-Numbers
Add page numbers categories in motion TOC
2018-07-13 14:43:47 +02:00
Sean Engelhardt 6e4665041e Added page numbers and categories in TOC of motion PDF. 2018-07-13 14:26:29 +02:00
Emanuel Schütze 166d287a75
Merge pull request #3780 from emanuelschuetze/translations
Updated German translations.
2018-07-13 14:07:40 +02:00
Emanuel Schütze 732f5e7327 Updated German translations. 2018-07-13 13:47:13 +02:00
Emanuel Schütze 5d966192c0
Merge pull request #3768 from tsiegleauq/pdf-logo-right
Add motion PDF logos on the right side
2018-07-13 13:44:31 +02:00
FinnStutzenstein 56cdfebe85 Added migrations for the available logos and move old values to new ones, remove old entries in the database 2018-07-13 13:20:22 +02:00
Sean Engelhardt a6ed54eb92 Added new config options to show logos on the right side in motion PDF. 2018-07-13 13:19:55 +02:00
Emanuel Schütze d9d0c84a1a
Merge pull request #3772 from FinnStutzenstein/custom-state-workflow
Custom workflows and states
2018-07-13 10:44:16 +02:00
FinnStutzenstein 9e4cafd0f0 Custom workflows and states:
- Added new workflow list view
 - Added state table for each workflow
 - Added new StateViewSet to handle states of workflows
2018-07-13 10:29:06 +02:00
Emanuel Schütze e9b23c89c2
Merge pull request #3769 from emanuelschuetze/fix-dockerfile
Fix dockerfile to build with gulp4/node10.
2018-07-02 21:32:37 +02:00
Finn Stutzenstein 56a7bd6840
Merge pull request #3767 from FinnStutzenstein/gdpr-login
make the privacy policy available for non logged in users (closes #3757)
2018-06-30 17:03:53 +02:00
Emanuel Schütze 2129ffe73a Fix dockerfile to build with gulp4/node10. 2018-06-26 10:25:24 +02:00
FinnStutzenstein 26d168110f make the privacy policy available for non logged in users (closes #3757) 2018-06-25 17:28:24 +02:00
Emanuel Schütze 4007610a54
Merge pull request #3755 from jsaalfeld/gulp_4
upgrade to node v10 and gulp 4
2018-06-18 19:32:33 +02:00
Jochen Saalfeld c81e318705 Upgrade to node v10 and gulp 4 2018-06-15 08:54:09 +02:00
Emanuel Schütze 393a4f54c2
Merge pull request #3765 from emanuelschuetze/translations
Updated German translations.
2018-06-14 13:40:51 +02:00
Emanuel Schütze 8dca3b5321 Updated German translations.
Changed some strings in source.
Fixed some regressions introduces by new sort-submitters and amendment features.
2018-06-14 13:08:52 +02:00
Emanuel Schütze 5a5475299c
Merge pull request #3637 from CatoTH/Paragraph-Based-Amendments
Paragraph based amendments / Diff
2018-06-14 11:11:39 +02:00
Tobias Hößl d9c08b65b7 New Feature: Paragraph based amendments
With new amendment list table:
- Removed title from table, leadmotion can be selected now
- rename the new list, added the export dialog, multiselect actions and supporter badge in the amendment list view
- Moved collission detection to own factory, compute collissions in the amendment list view
- Delegates can now enter paragraph based amendments
- new amendment list as pdf/csv export
- improved caching of amendments
- Parse styles in headings and removed all double-quotes
- Performance improvements:
  * Removed ng-mouseover/mouseleave actions in amendment-list
  * disable collission detection in amendment list view.
  * Improved state/recommendation dropdown in amendment list.
2018-06-14 11:01:03 +02:00
Emanuel Schütze 7ad7e9fd5d
Merge pull request #3763 from FinnStutzenstein/remarks
Fixed remarks (closes #3760)
2018-06-14 09:31:56 +02:00
FinnStutzenstein 66c72f4345 Fixed remarks (closes #3760) 2018-06-14 07:24:55 +02:00
Emanuel Schütze 5735cebcf9
Merge pull request #3647 from FinnStutzenstein/submitterSort2
Sort submitters
2018-06-13 14:34:31 +02:00
FinnStutzenstein b0a42e19e1 Sort submitters 2018-06-13 14:16:25 +02:00
Emanuel Schütze 6b2a736a6c
Merge pull request #3762 from FinnStutzenstein/typo
typo
2018-06-13 12:32:16 +02:00
FinnStutzenstein 7ad81d3385 typo 2018-06-13 12:13:49 +02:00
Emanuel Schütze 452f788aaa
Merge pull request #3761 from emanuelschuetze/yarn
Updated yarn.lock (for using with node 10.x).
2018-06-13 08:54:08 +02:00
Emanuel Schütze e21985d608 Updated yarn.lock (for using with node 10.x). 2018-06-12 14:21:44 +02:00
Emanuel Schütze a5a8a1371e
Merge pull request #3748 from FinnStutzenstein/scrollProjectorToLine
Scroll projector to a given line
2018-06-12 13:31:19 +02:00
Emanuel Schütze 97bf5adc6a
Merge pull request #3749 from FinnStutzenstein/motionNumberingException
Removed the ValidationError in motion numbering (fixed #3680)
2018-06-12 13:06:29 +02:00
FinnStutzenstein 252ba02e86 Scroll projector to a given line 2018-06-12 13:02:22 +02:00
Emanuel Schütze 011ec56b88
Merge pull request #3759 from emanuelschuetze/release2.2
Release 2.2
2018-06-06 15:18:48 +02:00
Emanuel Schütze 2c1ce6ff37 Update version to 2.3-dev. 2018-06-06 14:23:35 +02:00
Emanuel Schütze 8d64c586bc Release 2.2 2018-06-06 14:16:46 +02:00
Emanuel Schütze bebd7e18e7
Merge pull request #3758 from emanuelschuetze/readme
Updated README and CHANGELOG for 2.2 release.
2018-06-06 14:13:49 +02:00
Emanuel Schütze 054a345808 Updated README and CHANGELOG for 2.2 release.
Rename CHANGELOG to CHANGELOG.rst to show a nice page with linkable sections on GitHub.
2018-06-06 13:36:37 +02:00
Emanuel Schütze 407b640f80
Merge pull request #3740 from FinnStutzenstein/voting-plugin
Changes for the voting plugin and usability improvements
2018-05-29 15:02:37 +02:00
Emanuel Schütze d555801a45
Merge pull request #3754 from emanuelschuetze/translations
Updated all translations.
2018-05-23 16:54:39 +02:00
Emanuel Schütze e4e6becf02 Updated all translations for 2.2 release. 2018-05-23 16:43:17 +02:00
Emanuel Schütze 1b321fb680
Merge pull request #3750 from FinnStutzenstein/assignmentPollInputs
no negative votes and better scrolling in forms with number inputs (c…
2018-05-23 15:58:01 +02:00
Emanuel Schütze e52910a67b
Merge pull request #3751 from jsaalfeld/dsgvo
adding working privacy policy
2018-05-23 15:53:23 +02:00
Jochen Saalfeld 9e66f05603
adding working privacy policy
In order to archive GDPR compliance we need a privacy policy.
2018-05-23 15:13:05 +02:00
FinnStutzenstein e4735b9437 no negative votes and better scrolling in forms with number inputs (closes #3739) 2018-05-22 14:30:25 +02:00
FinnStutzenstein 5833393268 Messaging docstring and user callback
only hide votes for unpublished polls
2018-05-22 09:20:19 +02:00
FinnStutzenstein 562d620851 Removed the ValidationError in motion numbering (fixed #3680) 2018-05-22 07:44:21 +02:00
Emanuel Schütze 7ab5611a50
Merge pull request #3747 from emanuelschuetze/misc-improvements
Minor template improvements and fixes
2018-05-17 09:09:07 +02:00
Emanuel Schütze 682a5eea5a Minor template improvements and fixes
- Fix back-to-motion-block-link in item detail view.
- Show projector name in window title.
- Fix sorting for motion blocks and categories in motion list view.
- Fix missing permission check for editing motion block.
- Improved style of rejected CR in motionn detail view.
2018-05-16 17:50:24 +02:00
Emanuel Schütze 8d7bcedd32
Merge pull request #3746 from FinnStutzenstein/pdfImageErrors
Throw errors, if the pds generation fails, if an image could not be l…
2018-05-16 17:24:52 +02:00
FinnStutzenstein ecb76fd888 Throw errors if pdf generation fails, if an image could not be loaded (fixes #3730) 2018-05-16 17:06:42 +02:00
Emanuel Schütze 79b7fd29cf
Merge pull request #3745 from FinnStutzenstein/groupDelete
Autoupdate with affected users on group delete (fixes #3455)
2018-05-16 16:55:36 +02:00
FinnStutzenstein 185055d604 Autoupdate with affected users on group delete (fixes #3455) 2018-05-16 13:03:37 +02:00
Emanuel Schütze f8df7ddda6
Merge pull request #3742 from FinnStutzenstein/deleteUserChache
Delete restricted data cache on permission changes (closes #3396)
2018-05-16 12:39:40 +02:00
Emanuel Schütze 164867f00d
Merge pull request #3743 from FinnStutzenstein/motionComments
Fixed logic for saving motion comments
2018-05-16 12:11:34 +02:00
FinnStutzenstein 0fd1cd688b Fixed logic for saving motion comments 2018-05-16 11:54:46 +02:00
FinnStutzenstein 2989024cca Delete restricted data cache on permission changes (closes #3396) 2018-05-16 10:59:00 +02:00
Emanuel Schütze a7af01b507
Merge pull request #3738 from FinnStutzenstein/moveCode
fixed #3708
2018-05-15 09:35:14 +02:00
Emanuel Schütze ea8a540a71
Merge pull request #3735 from FinnStutzenstein/improvements
Fixed percentage for special values (fixes #3736), added config to couple the candidates with the list of speakers (closes #3737)
2018-05-15 09:26:31 +02:00
FinnStutzenstein c7a2f5c47c Fixed percentage for special values (fixes #3736), added config to couple the candidates with the list of speakers (closes #3737) 2018-05-11 15:15:53 +02:00
FinnStutzenstein f1ab2b3afc fixed #3708 2018-05-09 08:48:37 +02:00
Emanuel Schütze 39da8f942f
Merge pull request #3734 from FinnStutzenstein/AgendaProjection
Fixes for the item projection (fixes #3733)
2018-05-04 10:44:22 +02:00
FinnStutzenstein 0a141adbd1 Fixes for the item projection (fixes #3733) 2018-05-04 10:27:39 +02:00
Emanuel Schütze 7b9d8d11a6
Merge pull request #3732 from FinnStutzenstein/MotionProjectorFix
Fixed deleted comment fields
2018-05-04 09:34:08 +02:00
FinnStutzenstein d189e5bca8 Fixed deleted comment fields 2018-05-03 17:26:47 +02:00
Emanuel Schütze cb42af7c8b
Merge pull request #3731 from FinnStutzenstein/MotionCommentsInlineEditingFix
Fixed wrong index for inline editors
2018-05-02 20:18:54 +02:00
FinnStutzenstein 902ca96a16 Fixed wrong index for inline editors 2018-05-02 15:35:49 +02:00
Emanuel Schütze b37bad72ef
Merge pull request #3729 from FinnStutzenstein/pdfImageSize
Fixed parsing of image sizes
2018-05-02 13:53:34 +02:00
FinnStutzenstein 06ddd8ee46 Fixed parsing of image sizes 2018-05-02 13:44:35 +02:00
Emanuel Schütze cc5a1ea0fe
Merge pull request #3702 from FinnStutzenstein/motionAgendaTitle
new style for motion agenda title
2018-05-02 13:37:44 +02:00
Emanuel Schütze 331eb9fc22
Merge pull request #3728 from FinnStutzenstein/stylistic-remarks
Fixed stylistic remarks from #3682 (fixes #3709)
2018-05-02 13:35:44 +02:00
FinnStutzenstein 754040570d New style for motion agenda title and list of speakers
Improved list of speakers slide title:
- h2 subtitle: use always motion identifier only (like in motion slides)
- h1 title: use always "list of speakers" (long motion title not useful
  if an other projector shows the motion slide with full title
  (identifier is enough)
2018-05-02 13:29:59 +02:00
FinnStutzenstein 0224c4287a Fixed stylistic remarks from #3682 (fixes #3709) 2018-05-02 10:13:45 +02:00
Emanuel Schütze 60ae155d96
Merge pull request #3724 from emanuelschuetze/translations
Updated German translations.
2018-04-25 16:24:02 +02:00
Emanuel Schütze d522e8e308 Updated German translations. 2018-04-25 16:01:59 +02:00
Emanuel Schütze bf27b6f016
Merge pull request #3723 from emanuelschuetze/fixes
Template improvements
2018-04-25 16:01:21 +02:00
Emanuel Schütze ef2a22fefe Template improvements
- Show item duration and done for normal users correctly.
- Fixed CSS class for countdown warning time.
- Improved projector manage button layout.
- Updated fontawsome icons to 4.7.
- Fixed iframe width/height to show border correctly.
- Improved 'close list of speakers' button.
- Improved 'clear all filter' icons.
- Fixed election pdf if candidate was deleted.
- Moved ban icon for internal icons.
- Improved edit projector form. Show simple scaling steps instead of
  width/height resolution.
- Consolidated both agenda item filters.
- Used better sort icon.
- Installed colordialog plugin for ckeditor to select more colors.
- Several css improvements.
2018-04-25 15:47:39 +02:00
Emanuel Schütze 8680d4af85
Merge pull request #3722 from FinnStutzenstein/betterProjectorButton
precalculate projectorchanges in the client
2018-04-25 14:13:52 +02:00
FinnStutzenstein 08045638ab precalculate projectorchanges in the client 2018-04-25 11:08:23 +02:00
Emanuel Schütze 08b89858c6
Merge pull request #3720 from tsiegleauq/conversations_hook
add template hook in user div
2018-04-24 13:07:00 +02:00
Sean Engelhardt 85e329b9b3 add template hook in user div 2018-04-24 11:53:31 +02:00
Emanuel Schütze 231d8de036
Merge pull request #3719 from FinnStutzenstein/changeMediafileProtectionLogicAgain
Changed mediafile protection logic (closes #3707)
2018-04-24 11:48:21 +02:00
Emanuel Schütze 334a6880b5
Merge pull request #3718 from FinnStutzenstein/autoupdateAmendments
Watch for changes of amendments in the motion detail view.
2018-04-24 11:38:56 +02:00
Emanuel Schütze 15d8a5fbc0
Merge pull request #3717 from FinnStutzenstein/motionProjectorRequirements
Added motions from state and recommendation to the projector requirem…
2018-04-24 11:33:48 +02:00
Emanuel Schütze 024cf6c1b0
Merge pull request #3715 from FinnStutzenstein/projectorDisconnect
Remove projector from projector-all
2018-04-24 11:33:33 +02:00
Emanuel Schütze b8ee6d91f7
Merge pull request #3714 from FinnStutzenstein/pdfjs-distIE11Fix
Fixed IE11 Error in pdfjs-dist
2018-04-24 11:33:16 +02:00
FinnStutzenstein 2220856e5d Changed mediafile protection logic (closes #3707) 2018-04-24 11:32:17 +02:00
FinnStutzenstein 07f3880ad3 Watch for changes of amendments in the motion detail view. 2018-04-24 11:27:33 +02:00
FinnStutzenstein d4a9751474 Added motions from state and recommendation to the projector requirements 2018-04-24 11:22:24 +02:00
FinnStutzenstein 83edfc2af0 Remove projector from projector-all 2018-04-24 11:20:15 +02:00
FinnStutzenstein c3ef007227 Fixed IE11 Error in pdfjs-dist 2018-04-24 11:18:54 +02:00
Emanuel Schütze 198e19d3d1
Merge pull request #3713 from FinnStutzenstein/oneRequestProjection
One request for each projection. Added some validation for clear_elem…
2018-04-24 11:15:04 +02:00
FinnStutzenstein 10038b782f One request for each projection. Added some validation for clear_elements and prune_elements 2018-04-24 10:23:28 +02:00
Emanuel Schütze f1b87af623
Merge pull request #3706 from emanuelschuetze/release2.2b3
Release 2.2b3
2018-04-13 16:26:09 +02:00
Emanuel Schütze 03b17837ed Update version to 2.2b4-dev 2018-04-13 16:08:01 +02:00
Emanuel Schütze a0ac02d391 Release 2.2b3 2018-04-13 16:07:33 +02:00
Emanuel Schütze c3f6c8a3a2
Merge pull request #3705 from emanuelschuetze/translations
Updated German translations.
2018-04-13 15:36:18 +02:00
Emanuel Schütze 13921da15b Updated German translations. 2018-04-13 15:21:26 +02:00
Emanuel Schütze b6ebc78e85
Merge pull request #3682 from FinnStutzenstein/voting-plugin
Changes for the voting plugin
2018-04-13 15:11:48 +02:00
Emanuel Schütze a6537fb919
Merge pull request #3695 from FinnStutzenstein/fixRemarks
fixed remarks from #3525 (closes #3681)
2018-04-13 15:07:05 +02:00
Emanuel Schütze 11ba5a7c37
Merge pull request #3704 from emanuelschuetze/fixRecommendationExtensionField
Add missing permission check for recommendation extension field.
2018-04-13 14:21:47 +02:00
Emanuel Schütze b95a76493d
Merge pull request #3697 from FinnStutzenstein/protectNumbering
Protect numbering of the agenda
2018-04-13 14:21:06 +02:00
Emanuel Schütze 4a2410a596
Merge pull request #3700 from FinnStutzenstein/titleInMotionBlockSlide
Added a short title in the motion block slide
2018-04-13 14:20:31 +02:00
FinnStutzenstein 595bcab845 Added shortened motion title to motion block slide. 2018-04-13 10:13:17 +02:00
FinnStutzenstein fa5b81dad8 Protect numbering of the agenda 2018-04-13 10:09:22 +02:00
Emanuel Schütze 71b3cc181f
Merge pull request #3698 from FinnStutzenstein/topPagination
Proposal for top pagenavigation
2018-04-13 10:06:01 +02:00
Emanuel Schütze 22975b75e5
Merge pull request #3701 from FinnStutzenstein/agendaConfigHiddenItems
Config variable to hide internal items on projector
2018-04-13 10:04:54 +02:00
Emanuel Schütze 384a7869ec
Merge pull request #3699 from FinnStutzenstein/attachmentsOrder
Order attachments by title
2018-04-13 10:00:48 +02:00
FinnStutzenstein 094fa4da84 Added pagination on top of lists (Fixed #3667). 2018-04-13 09:51:14 +02:00
Emanuel Schütze cdea91c780 Add missing permission check for recommendation extension field. 2018-04-13 09:42:07 +02:00
FinnStutzenstein fe5308505d Config variable for hiding internal items on projector 2018-04-11 13:46:40 +02:00
FinnStutzenstein 30b307d309 Order attachments by title 2018-04-11 12:56:34 +02:00
Emanuel Schütze bc7ae87591
Merge pull request #3694 from FinnStutzenstein/removeTodo
Removed todo (closes #3580).
2018-04-11 12:46:44 +02:00
FinnStutzenstein 6463af4b10 fixed remarks from #3525 (closes #3681) 2018-04-11 10:56:49 +02:00
FinnStutzenstein a17c853d67 Removed todo (closes #3580).
For explaination see the issue.
2018-04-11 10:39:44 +02:00
FinnStutzenstein 2256031184 Changes for the voting plugin
- new-style template hooks. See changes in the template hook documentation
- reordered user list view to get more space for extra things
- added template hooks.
2018-04-11 10:31:48 +02:00
Emanuel Schütze 2497969864
Merge pull request #3693 from emanuelschuetze/translations
Updated German translaitons.
2018-04-11 08:16:39 +02:00
Emanuel Schütze f57038253f Updated German translaitons. 2018-04-11 08:06:14 +02:00
Emanuel Schütze 5a8bfbd403
Merge pull request #3692 from emanuelschuetze/issue3588
New config to hide motion meta information box on projector (Fixed #3588)
2018-04-11 08:02:42 +02:00
Emanuel Schütze 8c1c6241d1 New config to hide motion meta information box on projector (Fixed #3588). 2018-04-11 07:52:40 +02:00
Emanuel Schütze ad959f7856
Merge pull request #3691 from emanuelschuetze/exportButton
Use simple pdf export button for delegates.
2018-04-11 07:39:38 +02:00
Emanuel Schütze 8094bc5855
Merge pull request #3690 from emanuelschuetze/issue3593
Linebreak protection for motion sidebox (Fixed #3593).
2018-04-10 15:26:57 +02:00
Emanuel Schütze 04843294ac Use simple pdf export button for delegates.
Don't use drop down list with one entry only.
Show agenda docx entry for managers only.
2018-04-10 15:25:34 +02:00
Emanuel Schütze ca21401384 Linebreak protection for motion sidebox (Fixed #3593). 2018-04-10 14:48:00 +02:00
Emanuel Schütze 9e2c6a14fa
Merge pull request #3685 from FinnStutzenstein/fixedMotionSlide
Fixed motion slide not showing any diffs
2018-04-10 14:00:30 +02:00
Emanuel Schütze 47dfff2199
Merge pull request #3689 from FinnStutzenstein/scrollToTop
Scroll to top on every state change
2018-04-10 13:47:45 +02:00
Emanuel Schütze 15403e9ba3
Merge pull request #3688 from FinnStutzenstein/validateAssignmentDescription
Validize assignment description, if old-style play intext is in the d…
2018-04-10 13:46:38 +02:00
FinnStutzenstein 634dd70f90 Scroll to top on every state change 2018-04-10 13:35:33 +02:00
Emanuel Schütze 272552055c
Merge pull request #3686 from emanuelschuetze/resetScrollLevel
Reset scroll level for each new projection.
2018-04-10 13:33:07 +02:00
Emanuel Schütze 9a098af650
Merge pull request #3687 from emanuelschuetze/templateFixes
Template fixes (fixed #3603, fixed #3601, fixed #3555)
2018-04-10 13:28:00 +02:00
Emanuel Schütze 560e28f19e Reset scroll level for each new projection. 2018-04-10 13:24:34 +02:00
FinnStutzenstein 5b8d11d661 Validize assignment description, if old-style play intext is in the database 2018-04-10 08:14:42 +02:00
Emanuel Schütze 7f0386138f Template fixes (fixed #3603, fixed #3601, fixed #3555)
- Fixed agenda import preview (Fixed #3603)
- Show import error only if available; for agenda/motions/users (Fixed #3601)
- Added missing tooltips in detail views (Fixed #3555).
2018-04-09 18:01:05 +02:00
FinnStutzenstein 75e0955a29 Fixed motion slide not showing any diffs 2018-04-06 14:24:52 +02:00
Emanuel Schütze ba579637bd
Merge pull request #3684 from FinnStutzenstein/fixMypy
Fixed mypy for utils/migration.py
2018-04-05 09:02:05 +02:00
FinnStutzenstein 23a7481277 Fixed mypy for utils/migration.py. 2018-04-04 15:47:13 +02:00
Emanuel Schütze 0710af827e
Merge pull request #3600 from ostcar/cache-api
Cache api
2018-04-04 13:41:27 +02:00
Emanuel Schütze f3797601c9
Merge pull request #3578 from jsaalfeld/master
Patch userdetails without redundant declaration of users details
2018-04-04 12:15:34 +02:00
Emanuel Schütze ef90f55472
Merge pull request #3683 from FinnStutzenstein/addFontsToMediafileServeView
Add fonts to the medifile serve view
2018-04-04 12:15:07 +02:00
FinnStutzenstein df531b8747 Add fonts to the medifile serve view 2018-04-04 11:57:40 +02:00
Emanuel Schütze 147fa6f370
Merge pull request #3679 from FinnStutzenstein/fixes
fixed indentions in pdf, remove every tab in html (fixes #3678)
2018-04-04 11:39:48 +02:00
Emanuel Schütze 4cb9692ad3
Merge pull request #3677 from FinnStutzenstein/pdf-custom-numbering
Custom numbering in PDF
2018-04-04 11:27:36 +02:00
Emanuel Schütze acc86b4c83
Merge pull request #3676 from FinnStutzenstein/pdf-fix
Fixed pdf export when element is null
2018-04-04 11:24:47 +02:00
FinnStutzenstein ad5c81a3db fixed indentions and wrong line breaks in pdf, remove every tab in html (fixes #3678) 2018-03-25 11:10:17 +02:00
FinnStutzenstein 249d1c8ddb Custom numbering in PDF 2018-03-23 08:41:18 +01:00
FinnStutzenstein badd6764aa Fixed pdf export when element is null 2018-03-22 09:34:01 +01:00
Emanuel Schütze 209ea70d75
Merge pull request #3674 from emanuelschuetze/translations
Updated German translations
2018-03-21 12:51:18 +01:00
Emanuel Schütze a12735b49e Updated German translations 2018-03-21 12:43:39 +01:00
Norman Jäckel e66718b5f0
Merge pull request #3650 from FinnStutzenstein/multiple-files
New file upload form (fixes #3510, fixed #3082)
2018-03-19 21:23:41 +01:00
Emanuel Schütze 1dc4e5ef05
Merge pull request #3659 from FinnStutzenstein/agenda-autoupdates
Autoupdates for all children if the item type has changed (fixes #3636).
2018-03-19 16:07:41 +01:00
Emanuel Schütze 58dcb0c3b4
Merge pull request #3657 from CatoTH/Issue3656-Too-Much-Caching-Line-Numbers
Add firstLine to cache definition - fixes #3656
2018-03-19 16:06:48 +01:00
Emanuel Schütze a8aa366b3c
Merge pull request #3661 from FinnStutzenstein/improvements
Fixing translations (fixes #3607, fixes #3604).
2018-03-19 15:34:06 +01:00
FinnStutzenstein 05d740b190 Autoupdates for all children if the item type has changed (fixes #3636). 2018-03-19 15:32:20 +01:00
Emanuel Schütze f9d178506a
Merge pull request #3660 from emanuelschuetze/pdfAssignmentBallotFix
Fix for creating assignment ballot pdf.
2018-03-19 15:26:59 +01:00
FinnStutzenstein 052daa2b19 Fixing translations (fixes #3607, fixes #3604). 2018-03-19 15:23:34 +01:00
Emanuel Schütze 288c1cafb9 Fix for creating assignment ballot pdf. 2018-03-19 10:15:23 +01:00
FinnStutzenstein a4d460a8f0 New file upload form (fixes #3510, fixed #3082) 2018-03-18 15:16:02 +01:00
Tobias Hößl 652701e4f3
Add firstLine to cache definition - fixes #3656 2018-03-15 19:34:42 +01:00
Emanuel Schütze 09e74481cb
Merge pull request #3655 from emanuelschuetze/groupSorting
Fix group filtering in users list view
2018-03-15 14:17:38 +01:00
Emanuel Schütze 3b0e32b0a2 Fix group filtering in users list view
Use ":true" for angular filter to exact match for searching id (e.g. '2' not '12').
Order groups by id (only important for big mode with caching).
2018-03-15 14:02:05 +01:00
Emanuel Schütze 972d76cf21
Merge pull request #3644 from CatoTH/Isuue3643-OL-Offsets
OL Offsets - fixes #3643
2018-03-15 12:53:13 +01:00
Emanuel Schütze 78747fad35
Merge pull request #3646 from CatoTH/Issue3645-Goto-Original-View-After-Deleting-Title-CR
Go to original view after deleting the Title CR...
2018-03-15 12:42:06 +01:00
Tobias Hößl 76fd094ddc OL Offsets - fixes #3643 2018-03-15 12:38:18 +01:00
Emanuel Schütze 3ef39ed116
Merge pull request #3649 from FinnStutzenstein/nginx-doku-fix
Fixed Nginx settings
2018-03-15 12:25:37 +01:00
Emanuel Schütze 1ac3cb7552
Merge pull request #3641 from FinnStutzenstein/add-perms-during-migrations
Adding new permission to groups during migration from 2.1.1 to 2.2
2018-03-15 12:22:28 +01:00
Emanuel Schütze b1d5fa21c9
Merge pull request #3652 from emanuelschuetze/numberingCategory
Improved error handling of re-numbering motions of a category.
2018-03-14 18:03:48 +01:00
Emanuel Schütze 79d69068f5 Improved error handling of re-numbering motions of a category. 2018-03-14 17:49:25 +01:00
Emanuel Schütze 319f329b5e
Merge pull request #3651 from emanuelschuetze/layoutImprovements
Layout improvements for agenda and motions
2018-03-14 17:17:33 +01:00
Emanuel Schütze bee73d3a28 Layout improvements for agenda and motions
- Use more compact agenda on projector (reduce line height)
- Fixed sorting of motions and limit motion title lenght in recommendation dropdown menu.
- Improved CSS for using tables in topic text (site and projector).
2018-03-14 12:06:26 +01:00
FinnStutzenstein b291cc6ad6 Fixed Nginx settings 2018-03-12 15:16:43 +01:00
Emanuel Schütze 2828b8be8a
Merge pull request #3648 from FinnStutzenstein/pdf-fix
Pdf fixes
2018-03-12 14:17:48 +01:00
FinnStutzenstein b081401d57 Adding new permission to groups during migration from 2.1.1 to 2.2 2018-03-12 14:11:20 +01:00
FinnStutzenstein 9639d9233f Pdf fixes 2018-03-12 14:00:23 +01:00
Tobias Hößl b2043fa49d
Go to original view after deleting the Title CR, if it is the last one - fixes #3645 2018-03-11 18:28:16 +01:00
Emanuel Schütze a9e0f36ab9
Merge pull request #3642 from CatoTH/Bugfix-Title-Recommendations-On-Screen
Bugfix: Title change recommendations on the projector
2018-03-09 16:26:23 +01:00
Tobias Hößl 611be75d95
Bugfix: Title change recommendations on the projector 2018-03-09 14:34:09 +01:00
Jochen Saalfeld d525f2d7d2
patch userdetails without unnecessary double verification 2018-03-09 07:20:40 +01:00
Emanuel Schütze 3e3b62bc38
Merge pull request #3640 from emanuelschuetze/translations
Updated js translations (DE, ES, CS, FR, PT, RU).
2018-03-08 11:15:11 +01:00
Emanuel Schütze bc5eb84647
Merge pull request #3639 from emanuelschuetze/layout-improvements
Some minor CSS improvements.
2018-03-08 11:03:01 +01:00
Emanuel Schütze 6a388a5bb5 Updated js translations (DE, ES, CS, FR, PT, RU). 2018-03-08 11:00:58 +01:00
Emanuel Schütze 6daf262c0e Some minor CSS improvements.
- Projector: Use same line height in list elements as in content.
- Projector: Reduce indentation of ul/ol lists.
- Projector: Add more space between line numbers and motion text,
- Agenda list: Remove padding-left in item list view.
2018-03-08 10:51:31 +01:00
Emanuel Schütze 85bbaea3e5
Merge pull request #3638 from FinnStutzenstein/agenda-collapse
Disable the agenda hierachy just for searchning, not for filtering
2018-03-08 10:49:45 +01:00
FinnStutzenstein fce2c5857c Disable the agenda hierachy just for searchning, not for filtering 2018-03-08 09:33:49 +01:00
Emanuel Schütze f3c634e677
Merge pull request #3626 from CatoTH/Title-Change-Recommendations
Change recommendations for motion titles
2018-03-08 09:18:02 +01:00
Tobias Hößl 9f8dce6e34
Change recommendations for titles 2018-03-07 16:36:30 +01:00
Emanuel Schütze 10bee988af
Merge pull request #3634 from emanuelschuetze/event-name
Added event name to web interface header.
2018-03-07 13:12:46 +01:00
Emanuel Schütze 4abb2402f8
Merge pull request #3621 from emanuelschuetze/admingroup
New admin user group
2018-03-07 12:46:38 +01:00
Emanuel Schütze 5db632365f Added event name to web interface header. 2018-03-06 12:20:35 +01:00
Emanuel Schütze 4e1c7b7497 New admin user group 2018-03-06 11:21:00 +01:00
Emanuel Schütze d073cbbf6f
Merge pull request #3566 from FinnStutzenstein/noCachingFlag
Added --no-template-caching
2018-03-06 10:01:36 +01:00
Norman Jäckel 79700caefb
Merge pull request #3633 from FinnStutzenstein/saml-changes
Changes needed for the saml plugin: It is possible now to hook into t…
2018-03-05 20:43:03 +01:00
Norman Jäckel ec0094827d
Merge pull request #3630 from FinnStutzenstein/fix-deselection
Fixed delection of logos and fonts. Closes #3606
2018-03-05 20:42:13 +01:00
Norman Jäckel ae3277b747
Merge pull request #3631 from FinnStutzenstein/pdf-images-in-vfs
Moved image sources to the virtual filesystem
2018-03-05 20:35:46 +01:00
FinnStutzenstein c5906b2dba Changes needed for the saml plugin: It is possible now to hook into the complete usermenu 2018-03-05 14:08:39 +01:00
Emanuel Schütze db981a0c2d
Merge pull request #3590 from emanuelschuetze/pdfjs-dist-fix
Downgrade angular-pdf to 1.3.0 (Fixed #3552).
2018-03-05 13:17:19 +01:00
FinnStutzenstein aacdc29394 Added --no-template-caching 2018-03-05 11:55:15 +01:00
FinnStutzenstein 1949a00ee7 Moved image sources to the virtual filesystem 2018-03-05 11:51:35 +01:00
FinnStutzenstein 2269679186 Fixed delection of logos and fonts. Closes #3606 2018-03-05 09:15:40 +01:00
Norman Jäckel a30a30d72f
Merge pull request #3617 from emanuelschuetze/issue3614
Improved motion import/export (Fix #3614).
2018-03-04 20:59:24 +01:00
Norman Jäckel 15ad9340f4
Merge pull request #3616 from emanuelschuetze/issue3613
Adapt motion csv import example file (Fix #3613).
2018-03-04 20:58:50 +01:00
Norman Jäckel 2c266ffc03
Merge pull request #3612 from emanuelschuetze/fixAgendaImport
Fixed agenda import with empty duration (fix #3603, fix #3601).
2018-03-04 20:58:23 +01:00
Emanuel Schütze a733f2edb4 Improved motion import/export (Fix #3614).
- Fix motion import if names of paricipants are sorted by surname.
- Support multiple submitters in motion export csv.
2018-03-01 11:21:23 +01:00
Emanuel Schütze 0899bc5e22 Adapt motion csv import example file (Fix #3613). 2018-03-01 10:22:16 +01:00
Emanuel Schütze c4c9cd9d6e Fixed agenda import with empty duration (fix #3603, fix #3601). 2018-02-28 13:14:33 +01:00
Oskar Hahn 5aa8f6193e Add methods to delete the restricted_data_cache 2018-02-24 18:04:32 +01:00
Oskar Hahn c47d054c67 Activate the restricted_data_cache again.
restricted_data_cache.update_element(...) only adds an element to the cache, when
there are already other elements in the cache. So then add_element is never used,
the cache is never created.
2018-02-24 16:57:18 +01:00
Oskar Hahn 6c3ae7cb4e fix mypy 2018-02-24 16:38:17 +01:00
Emanuel Schütze f909dcfd66 Downgrade angular-pdf to 1.3.0 (Fixed #3552).
using pdfjs-dist#1.3.100
angular-pdf 1.3.1 does not work in Firefox with PDF documents >127kb.
2018-02-23 13:33:28 +01:00
Emanuel Schütze d185e05ab1
Merge pull request #3584 from emanuelschuetze/release2.2b2
Release2.2b2
2018-02-16 22:32:24 +01:00
Emanuel Schütze ce141410f8 Update version to 2.2b3-dev 2018-02-16 22:18:55 +01:00
Emanuel Schütze bb6286b4a5 OpenSlides 2.2b2 2018-02-16 22:18:40 +01:00
Emanuel Schütze 471c6ef990
Merge pull request #3585 from emanuelschuetze/translations2
Added missing translations.
2018-02-16 22:15:34 +01:00
Emanuel Schütze 4783c94779 Added missing translations. 2018-02-16 22:06:32 +01:00
Emanuel Schütze 3b48dc6988
Merge pull request #3583 from emanuelschuetze/translations
Updated German translations.
2018-02-16 16:56:01 +01:00
Emanuel Schütze 4067a52dda Updated German translations. 2018-02-16 16:41:55 +01:00
Emanuel Schütze 252c19b8ee
Merge pull request #3576 from FinnStutzenstein/ckeditor-remove-markup
Custom format remover plugin for CKEditor.
2018-02-16 16:39:06 +01:00
Emanuel Schütze 99e7182cfb
Merge pull request #3579 from jsaalfeld/update_requirements
Updating requirements and locking versions
2018-02-16 15:42:42 +01:00
FinnStutzenstein bbd3aa2ec8 Custom format remover plugin for CKEditor. 2018-02-16 15:38:36 +01:00
Emanuel Schütze 1d49121cb6
Merge pull request #3581 from FinnStutzenstein/li-space
Add space between list elements in motion text and pdf
2018-02-16 15:30:48 +01:00
Emanuel Schütze d22a2c3c58
Merge pull request #3567 from FinnStutzenstein/layoutChanges
Collapsable agenda, one panel for each motion comment and hide closed…
2018-02-16 14:55:05 +01:00
FinnStutzenstein 1c62f7510b Add space between list elements in motion text and pdf 2018-02-16 14:54:19 +01:00
Jochen Saalfeld 096587f59c
Updating requirements and locking versions
Locking the versions of channels and daphne, because it would break
OpenSlides otherwise
2018-02-16 14:38:50 +01:00
FinnStutzenstein 44fcfb447e Collapsable agenda, one panel for each motion comment and hide closed agenda items in the item slide. 2018-02-16 14:30:03 +01:00
Emanuel Schütze f859a27fca
Merge pull request #3565 from FinnStutzenstein/splitup-comment-perms
Splitup comment see and manage permissions for motion comments
2018-02-16 14:26:11 +01:00
Emanuel Schütze 9458ac8161
Merge pull request #3568 from FinnStutzenstein/fonts
Custom fonts for pdf and projector
2018-02-16 14:23:39 +01:00
FinnStutzenstein ca8ee3edd6 Splitup comment see and manage permissions for motion comments 2018-02-16 14:09:32 +01:00
FinnStutzenstein dfb40684ee Custom fonts for pdf and projector 2018-02-16 14:06:54 +01:00
Emanuel Schütze 8042beda60
Merge pull request #3577 from CatoTH/Issue3563-Escaping-Ampersands
Escape Ampersands - fixes #3563
2018-02-15 08:23:54 +01:00
Emanuel Schütze 2a1b0a645a
Merge pull request #3569 from FinnStutzenstein/dgb-1
Agenda DOCX export, motion log message when comment edited, motion se…
2018-02-14 11:07:20 +01:00
FinnStutzenstein 3ba39c37c1 Agenda DOCX export, motion log message when comment edited, motion sequential number in detail view and PDF, save pagination state to session storage (fixes #3558). 2018-02-14 10:25:51 +01:00
Emanuel Schütze df523ce526
Merge pull request #3570 from FinnStutzenstein/markSpeaker
Mark speakers
2018-02-14 10:24:36 +01:00
Norman Jäckel 6c418bb850
Merge pull request #3575 from emanuelschuetze/fix3573
Fix regression of #3573.
2018-02-13 22:15:50 +01:00
Tobias Hößl a345815b57 Escape Ampersands - fixes #3563 2018-02-13 16:43:07 +01:00
Emanuel Schütze bdd65d90b8 Fix regression of #3573. Refactor the code. 2018-02-13 10:45:00 +01:00
FinnStutzenstein 5fc7dce567 Mark speakers 2018-02-13 10:32:31 +01:00
Emanuel Schütze 3ddc73b0a0
Merge pull request #3562 from CatoTH/Issue3512-LinebreaksInPdfGeneration
Don't show BR-tags in PDF when line number mode is set to none - fixes #3512
2018-02-11 20:13:48 +01:00
Emanuel Schütze a6cdb75093
Merge pull request #3564 from FinnStutzenstein/improvements
Fixed email translations, motion sorting, undefined in DOCX, reduced …
2018-02-11 20:12:25 +01:00
Norman Jäckel a18ef1a3fd
Merge pull request #3573 from FinnStutzenstein/pdfListFix
Fixed PDF list
2018-02-11 13:42:28 +01:00
Norman Jäckel 79a96cd6fa
Merge pull request #3571 from FinnStutzenstein/fixMotionDiffCss
Fixed wrong css hierachy
2018-02-11 13:42:01 +01:00
Norman Jäckel 318ff7eff6
Merge pull request #3561 from FinnStutzenstein/agenda-css
Fixed outdated css classes (fixes #3540)
2018-02-10 11:24:15 +01:00
FinnStutzenstein c3bdd78c0e FIxed PDF list 2018-02-09 11:13:14 +01:00
FinnStutzenstein dea62c8394 Fixed wrong css hierachy 2018-02-06 15:53:24 +01:00
FinnStutzenstein 0b04b7478f Fixed email translations, motion sorting, undefined in DOCX, reduced motion search 2018-02-02 12:48:01 +01:00
Tobias Hößl 77ec2e00b1 Don't show BR-tags in PDF when line number mode is set to none 2018-01-30 11:25:43 +01:00
FinnStutzenstein ae18a31e4c Fixed outdated css classes (fixes #3540) 2018-01-30 09:41:49 +01:00
Emanuel Schütze ec2fcbdd73
Merge pull request #3341 from normanjaeckel/BetterAgenda
Supported server side setup of new agenda items (type and parent).
2018-01-29 10:38:50 +01:00
FinnStutzenstein 39e49f7226 Finally removed AgendaAutoupdate 2018-01-29 09:18:15 +01:00
Norman Jäckel 4aad16db4f Enhance setup of new agenda items for topics, motions and motion blocks. 2018-01-29 09:18:07 +01:00
Norman Jäckel 22231e5852
Merge pull request #3560 from FinnStutzenstein/cke-imageplugin-icon-fix
Fixed image plugin icon (fixes #3553)
2018-01-28 14:01:08 +01:00
Emanuel Schütze 9c4a8cc7fc
Merge pull request #3539 from normanjaeckel/BundleAutoupdate
Added autoupdate bundle middleware.
2018-01-26 15:23:32 +01:00
Emanuel Schütze 6957933b12
Merge pull request #3541 from normanjaeckel/CleanupConfig
Cleaned up config app. Removed OPTIONS request. Fixed #3531.
2018-01-26 15:15:01 +01:00
Emanuel Schütze 8e1ca4ac69
Merge pull request #3559 from FinnStutzenstein/fix-createsettings
Fixed createsettings command
2018-01-26 15:14:19 +01:00
Norman Jäckel 1527cc69dd Cleaned up config app. Removed OPTIONS request. Fixed #3531. 2018-01-26 13:58:21 +01:00
FinnStutzenstein 47730045dd Fixed image plugin icon (fixes #3553) 2018-01-26 10:05:15 +01:00
FinnStutzenstein bc8a1037a2 Fixed createsettings command 2018-01-26 09:35:49 +01:00
FinnStutzenstein f7de741e10 Removed agenda related options from assignment client code 2018-01-25 23:37:23 +01:00
Norman Jäckel 4a78298f94 Supported server side setup of new agenda items (type and parent). 2018-01-25 23:14:26 +01:00
Norman Jäckel d381ca36dd Added autoupdate bundle middleware. 2018-01-25 23:09:28 +01:00
Norman Jäckel b5157cd418
Merge pull request #3550 from emanuelschuetze/defaultpassword
Save default password with createopenslidesuser command.
2018-01-23 20:08:31 +01:00
Norman Jäckel e4a18b482b
Merge pull request #3549 from FinnStutzenstein/master-fix
Repair the master
2018-01-23 20:06:28 +01:00
FinnStutzenstein 60b6ef1415 Repair the master 2018-01-23 14:02:16 +01:00
Emanuel Schütze 47697fe90c Save default password with createopenslidesuser command. 2018-01-23 10:29:11 +01:00
Emanuel Schütze 172581d557
Merge pull request #3548 from CatoTH/Bugfix-Diff-Inserted-Whitespace-After-BR
Diff-Bugfix: Whitespace was inserted after <br>
2018-01-22 09:26:28 +01:00
Tobias Hößl c7729a6619 Diff-Bugfix: Whitespace was inserted after <br> 2018-01-22 09:12:36 +01:00
Emanuel Schütze fc4f9d39c1
Merge pull request #3535 from FinnStutzenstein/saml
Preparations for the SAML plugin; Fixed caching of main views.
2018-01-21 12:05:20 +01:00
FinnStutzenstein 5e089bfcdc Preparations for the SAML plugin; Fixed caching of main views. 2018-01-21 11:54:01 +01:00
Emanuel Schütze 39c499dc68
Merge pull request #3547 from emanuelschuetze/fix-language-set
Fix regression of #3543: Missing function to set current language.
2018-01-21 11:36:07 +01:00
Emanuel Schütze 2f7bc4227a
Merge pull request #3546 from CatoTH/Bugfix-Diff-Bugfix-Moving-Words
Fixes an edge case in the diff
2018-01-21 10:30:44 +01:00
Tobias Hößl e4da7905ca Fixes an edge case in the diff 2018-01-21 10:21:22 +01:00
Emanuel Schütze fd709c8203 Fix regression of #3543: Missing function to set current language. 2018-01-21 10:04:50 +01:00
Emanuel Schütze 3ac072d1a2
Merge pull request #3534 from normanjaeckel/BetterProjectorPrioritization
Split send_data channel into send_data_projector and send_data_site f…
2018-01-21 09:23:19 +01:00
Emanuel Schütze 3d04594fc7
Merge pull request #3538 from emanuelschuetze/improvements
Improvements
2018-01-20 22:01:10 +01:00
Emanuel Schütze 60fa629857 Set new default for projector resolution (1220x915, Fixed #2549). 2018-01-20 21:20:52 +01:00
Emanuel Schütze 2bd4e9c1f7 Remove unused config field 'event_organizer' (Fixed #804) 2018-01-20 21:20:27 +01:00
Emanuel Schütze fd324658f5 Added more margin-bottom for h1 on projector (Fixed #3147) 2018-01-20 21:20:27 +01:00
Emanuel Schütze ced36d0c0d
Merge pull request #3543 from jsaalfeld/master
save language selection to session storage
2018-01-20 21:19:48 +01:00
Jochen Saalfeld 612924c087
save language selection to session storage
and adding @FinnStutzenstein remarks

adding changelog entry
2018-01-20 20:57:53 +01:00
Norman Jäckel 940f0bbd1b
Merge pull request #3537 from CatoTH/Bugfix-Diff-Linebreaks-At-Dashes
Bugfix: Diff and Line breaks at dashes
2018-01-20 12:41:58 +01:00
Norman Jäckel 9615149442
Merge pull request #3536 from rrenkert/master
Locked bootstrap version (3.3.7). Added myself to AUTHORS.
2018-01-20 12:04:09 +01:00
Tobias Hößl b574502a37 Bugfix: Diff and Line breaks at dashes 2018-01-20 11:48:46 +01:00
Raimund Renkert 55503c4262 Locked bootstrap version (3.3.7). Added myself to AUTHORS. 2018-01-20 11:46:52 +01:00
Norman Jäckel aaeb85db61 Split send_data channel into send_data_projector and send_data_site for projector prioritization. Fixed #3426. 2018-01-20 11:07:28 +01:00
Finn Stutzenstein cfefd1c7b7
Merge pull request #3507 from FinnStutzenstein/css
split up css classes
2018-01-16 09:41:08 +01:00
FinnStutzenstein cc75452691 split up css classes using sass 2018-01-16 08:38:11 +01:00
Emanuel Schütze 879e9bcbb7
Merge pull request #3529 from FinnStutzenstein/hideIdentifierFieldDelegates
Hide identifier field in motion update form if the user is delegate
2018-01-12 15:44:23 +01:00
Emanuel Schütze 42b82c683b
Merge pull request #3530 from FinnStutzenstein/emailDebugFlag
Email debug flag (fixes #3526)
2018-01-12 15:37:01 +01:00
Emanuel Schütze c6f4a6f162
Merge pull request #3525 from FinnStutzenstein/emailfix
Filter for email and more dialog to the user, if some users have no emails
2018-01-12 15:33:37 +01:00
FinnStutzenstein 9c3260d400 Email debug flag (fixes #3526) 2018-01-12 08:40:15 +01:00
FinnStutzenstein 264b6f7d34 Hide identifier field in motion update form if the user is delegate (fixes #3528) 2018-01-12 08:08:01 +01:00
Norman Jäckel 541e1edb27
Merge pull request #3518 from FinnStutzenstein/delegateDelete
fixed ValidationError
2018-01-10 19:44:48 +01:00
FinnStutzenstein 453d981d6b Filter for email and more dialog to the user, if some users have no
emails
2018-01-09 15:23:24 +01:00
FinnStutzenstein 5cf82e5921 fixed ValidationError 2018-01-08 10:41:09 +01:00
Emanuel Schütze e067866ff2
Merge pull request #3523 from emanuelschuetze/release2.2b1
Release2.2b1
2017-12-20 21:29:51 +01:00
Emanuel Schütze e400a115a9 Update version to 2.2b2-dev 2017-12-20 21:18:47 +01:00
Emanuel Schütze 6ffb79f514 Release 2.2b1 2017-12-20 21:17:53 +01:00
Emanuel Schütze a1beee2402
Merge pull request #3521 from emanuelschuetze/translations
Updated translations for CS, ES, FR, PT, RU.
2017-12-20 21:05:20 +01:00
Emanuel Schütze 01d396d925 Updated translations for CS, ES, FR, PT, RU. 2017-12-20 20:44:27 +01:00
Emanuel Schütze cf95c64f88
Merge pull request #3515 from emanuelschuetze/speakers-overlay-fix
Fix linebreak after microphone icon in speakers overlay.
2017-12-15 10:42:16 +01:00
Emanuel Schütze 3271ff368c
Merge pull request #3516 from FinnStutzenstein/delegateDelete
Allow to delete own motions
2017-12-15 10:41:16 +01:00
FinnStutzenstein a934ab3845 Allow to delete own motions. 2017-12-15 10:20:40 +01:00
Emanuel Schütze 0abda3f344
Merge pull request #3517 from emanuelschuetze/translations
Updated German translations.
2017-12-15 10:16:13 +01:00
Emanuel Schütze 177c2a888e Updated German translations. 2017-12-15 09:56:17 +01:00
Emanuel Schütze 2fde162357 Fix linebreak after microphone icon in speakers overlay. 2017-12-15 09:21:51 +01:00
Emanuel Schütze b3a71a741f
Merge pull request #3514 from emanuelschuetze/assignmentHTMLFix
Remove HTML tags from description in assignment PDF.
2017-12-15 09:18:54 +01:00
Emanuel Schütze aad74bdbb4 Remove HTML tags from description in assigment PDF.
Fix usage of clearfix in assignment templates.
2017-12-15 08:49:45 +01:00
Emanuel Schütze 2fe1218fbb
Merge pull request #3503 from FinnStutzenstein/emailTest
Send invitation emails
2017-12-15 08:29:09 +01:00
FinnStutzenstein 2220112d27 Send invitation emails with OpenSlides login. 2017-12-15 08:16:29 +01:00
Norman Jäckel 912876c895
Merge pull request #3505 from FinnStutzenstein/legalNotice
extended the legal notice page (fixes #3504)
2017-12-11 21:49:00 +01:00
Emanuel Schütze 52ffe95226
Merge pull request #3508 from emanuelschuetze/assignmentImprovements
Assignment improvements
2017-12-05 14:17:22 +01:00
Emanuel Schütze 3d264683ff Assignment improvements
- Use ckeditor for assignment description field (e.g. for candidatures
  using html).
- Use 2 decimal places for percentage of voting results (motions/assignments)
- Allow css style attributes 'float' and 'padding'.
- Remove progress bar in election result slide to get more space (height)
  for candidate rows.
2017-12-05 14:04:35 +01:00
FinnStutzenstein a998657923 extended the legal notice page (fixes #3504) 2017-12-05 07:55:12 +01:00
Emanuel Schütze 8da08d9b36
Merge pull request #3506 from emanuelschuetze/translations
Updated German translations.
2017-12-01 16:36:18 +01:00
Emanuel Schütze 95be44e7f7 Updated German translations. 2017-12-01 12:07:50 +01:00
Emanuel Schütze a34ad1485a
Merge pull request #3490 from FinnStutzenstein/followRecommendation
Reduce autoupdates by adding a follow_recommendation view (fixes #348…
2017-12-01 09:34:56 +01:00
Emanuel Schütze 5caeb11a1c
Merge pull request #3501 from FinnStutzenstein/motionFilter
Added is amendment filter, fixed ckeditor image browser logo, changed…
2017-12-01 09:26:46 +01:00
FinnStutzenstein b6a2530618 Reduce autoupdates by adding a follow_recommendation view (fixes #3488, fixes #3489) 2017-12-01 09:17:50 +01:00
FinnStutzenstein 34ac4a347c Added is amendment filter, fixed ckeditor image browser logo, changed motion table header layout 2017-12-01 09:16:48 +01:00
Norman Jäckel 3ac1c3c756
Merge pull request #3495 from FinnStutzenstein/ChangeRecoOther
New change recommendation type other
2017-11-30 21:52:17 +01:00
Norman Jäckel 21b652ec74
Merge pull request #3496 from FinnStutzenstein/UserRegisterForm
Added presence view
2017-11-30 21:48:44 +01:00
Norman Jäckel af2af7e6d2
Merge pull request #3500 from FinnStutzenstein/motionSorting
Fixed sorting
2017-11-30 21:45:30 +01:00
Norman Jäckel 05e747cd48
Merge pull request #3502 from FinnStutzenstein/fullscreenCountdown
Countdown in a fullscreen view
2017-11-30 21:31:42 +01:00
FinnStutzenstein 6e4fae522b CountdownView 2017-11-28 13:54:23 +01:00
Emanuel Schütze 174e8076ac
Merge pull request #3487 from FinnStutzenstein/twisted
Use native twisted for daphne
2017-11-28 12:10:39 +01:00
FinnStutzenstein 513f2a887f Use native twisted for daphne 2017-11-28 11:06:39 +01:00
FinnStutzenstein 2a0a0049b0 New change recommendation type other 2017-11-24 13:30:19 +01:00
FinnStutzenstein 3f0f98dc24 Added presence view 2017-11-24 13:29:33 +01:00
FinnStutzenstein af96239b9a Fixed sorting 2017-11-24 12:07:21 +01:00
Norman Jäckel 3161bdaa05
Merge pull request #3498 from FinnStutzenstein/MotionHref
Give motions by id in state and recommendation.
2017-11-21 20:41:47 +01:00
Norman Jäckel 87e0fd8705
Merge pull request #3497 from FinnStutzenstein/FixDebugFolder
remove debug folder
2017-11-21 20:38:55 +01:00
Norman Jäckel 44b0f14f65
Merge pull request #3494 from FinnStutzenstein/Exportdialog
Extended exportdialog
2017-11-21 20:33:37 +01:00
FinnStutzenstein 2bdaf85b67 Give motions by id in state and recommendation. 2017-11-21 16:56:52 +01:00
FinnStutzenstein 79e6e31229 Extended motion export dialog (fixes #3493)
- Cleanup formfield types
- Remove complete columns in the csv
2017-11-21 16:27:05 +01:00
FinnStutzenstein 240b8d97dd fixed untracked files 2017-11-21 10:55:38 +01:00
Emanuel Schütze 7a3d3d99d6
Merge pull request #3482 from FinnStutzenstein/Improvements
Some improvements
2017-11-17 14:55:38 +01:00
FinnStutzenstein 1b1c486c9d Some improvements 2017-11-17 12:14:07 +01:00
Emanuel Schütze 4f9b1e178f
Merge pull request #3481 from FinnStutzenstein/LockoutProtection
fixed client site lockout protection (fixed #3467)
2017-11-15 12:37:36 +01:00
Emanuel Schütze ec4873a30c
Merge pull request #3480 from FinnStutzenstein/mediafilesPagination
Added pagination for mediafiles (fixes #3448)
2017-11-15 12:28:41 +01:00
FinnStutzenstein 446cab3b44 Added pagination for mediafiles (fixes #3448) 2017-11-15 12:14:18 +01:00
Emanuel Schütze de47da646b
Merge pull request #3492 from emanuelschuetze/templateImprovements
Template improvements for motions and projector
2017-11-15 12:08:24 +01:00
Emanuel Schütze b515e68068
Merge pull request #3483 from emanuelschuetze/issue3427
Adds elements to restricted data cache only if cache already exists
2017-11-15 12:05:59 +01:00
Norman Jäckel 2d67cd5948
Merge pull request #3486 from FinnStutzenstein/MotionDetailTemplateFix
Fix the motion detail template
2017-11-14 16:47:49 +01:00
Emanuel Schütze 279c2ba796 Adds elements to restricted data cache only if cache already exists (hotfix for #3427).
Prevents corrupt cache if restricted data cache is cleared while runtime.
2017-11-12 17:39:46 +01:00
Emanuel Schütze 702b452b6e Template improvements for motions and projector
- Use same title layout for (current) list of speakers slide.
- Set default choose for current list of speakers slide to 'project as slide'
  if more than one projectors available.
- Remove additional control bottons in list of speakers view to stop/end current/next speech.
  (User should better use the start/stop buttons behind the speaker names.)
- Fix typo in projection defaults.
- Set sidebox in motion slide to fix position (should not scroll).
- Fix order of amendments in motion detail template.
- Increase font size of motion block items on slide.
2017-11-12 17:23:05 +01:00
FinnStutzenstein db9e132e08 Fix the motion detail template 2017-11-10 17:27:39 +01:00
FinnStutzenstein bb322b7793 fixed client site lockout protection (fixed #3467) 2017-11-07 09:57:09 +01:00
Norman Jäckel 9fd0121132
Merge pull request #3476 from emanuelschuetze/motionTitle
Do not show identifier in motion detail template twice.
2017-11-03 22:04:32 +01:00
Norman Jäckel b5c04f2bc5
Merge pull request #3475 from FinnStutzenstein/layoutMotionBlockSlide
Motion block slide layout
2017-11-03 22:03:37 +01:00
Emanuel Schütze b76fd2303c Do not show identifier in motion detail template twice. 2017-11-03 17:02:55 +01:00
FinnStutzenstein 3affb27507 Motion block slide layout 2017-11-03 14:52:31 +01:00
Emanuel Schütze 7721715e94
Merge pull request #3474 from FinnStutzenstein/motionSlide
Do not show identifier in motion slide twice
2017-11-03 13:14:17 +01:00
FinnStutzenstein b7da8cf7ec Do not show identifier in motion slide twice 2017-11-03 13:06:51 +01:00
Emanuel Schütze bed42b5c66
Merge pull request #3472 from FinnStutzenstein/templateChanges
Template changes and IE fix
2017-11-03 12:55:17 +01:00
FinnStutzenstein 9e46924c77 Template changes and IE fix
- Fix IE11 that projector shows JS error if 'startsWith' is used.
  Projector was updated very slowly.
- Hide the valid/invalid/casted ballot rows on projector if empty.
- Use 80% width for motion reason in PDF.
2017-11-03 12:36:03 +01:00
Emanuel Schütze 432ab9068d
Merge pull request #3473 from FinnStutzenstein/zoomcontent
Do not zoom slideheaders
2017-11-03 12:33:42 +01:00
FinnStutzenstein 323534700c Do not zoom slideheaders 2017-11-03 12:17:29 +01:00
Emanuel Schütze 5558ba3fc6
Merge pull request #3470 from FinnStutzenstein/SpeakersInMotionListView
Showing the number of next speakers in motion list view
2017-11-03 10:55:13 +01:00
Emanuel Schütze 969274faf3
Merge pull request #3471 from FinnStutzenstein/hideWrongErrorMessageInProjector
hide 'undefined' error message
2017-11-03 10:47:49 +01:00
Emanuel Schütze 4cbf7d6c9f
Merge pull request #3469 from FinnStutzenstein/CountdownRace
Bundle autoupdates for beginning a speech
2017-11-03 10:47:22 +01:00
Emanuel Schütze 4a241f86c9
Merge pull request #3468 from emanuelschuetze/translation
Updated German translations.
2017-11-03 10:30:29 +01:00
FinnStutzenstein 1236fee7ee Showing the number of next speakers in motion list view 2017-11-03 10:29:34 +01:00
FinnStutzenstein 834ed77a2c Bundle autoupdates for beginning a speech 2017-11-03 10:27:45 +01:00
FinnStutzenstein 84f755a6e5 hide 'undefined' error message 2017-11-03 10:25:22 +01:00
Emanuel Schütze 3706a36051 Updated German translations. 2017-11-03 09:16:08 +01:00
Emanuel Schütze e774e2127d
Merge pull request #3466 from CatoTH/Bugfix-No-Word-Wrap-After-Insertion
Bugfix no word wrap after insertion
2017-11-02 09:35:37 +01:00
Tobias Hößl e18f22f200 Break lines in nodes that have already been parsed 2017-11-02 09:16:36 +01:00
Tobias Hößl a2b8f84c73 Add a karma:watch command 2017-11-02 09:16:33 +01:00
Emanuel Schütze c40ae6e9d1
Merge pull request #3465 from CatoTH/Bugfix-More-Tolerant-Diff
Better handling of inserted paragraphs
2017-11-02 09:11:28 +01:00
Emanuel Schütze 4a2d09e56c
Merge pull request #3459 from FinnStutzenstein/MotionOptimizations
Motion optimizations
2017-11-02 09:10:20 +01:00
FinnStutzenstein 5e8662e470 Motion optimizations 2017-11-02 08:50:33 +01:00
Tobias Hößl 6891471c45 Better handling of inserted paragraphs 2017-11-01 10:29:18 +01:00
Emanuel Schütze a8ff32bbb1
Merge pull request #3442 from FinnStutzenstein/MotionIdentifierInTitle
Show motion identifier in (current) list of speakers
2017-11-01 10:23:19 +01:00
FinnStutzenstein 39bd6653f0 Show motion identifier in (current) list of speakers 2017-11-01 09:58:22 +01:00
Norman Jäckel 6767dbc40a
Merge pull request #3457 from CatoTH/Bugfix-Fail-Less-Dramatically-With-Inconsistent-Data2
try/catch for inconsistent data
2017-10-29 17:59:18 +01:00
Norman Jäckel 452ecfbbd0
Merge pull request #3454 from FinnStutzenstein/UserFormFix
Fixed user form for groups with ids greater than 9
2017-10-29 17:57:18 +01:00
Norman Jäckel e259e10202
Merge pull request #3461 from FinnStutzenstein/followRecommendationAutoCopy
Update state field when following a recommendation
2017-10-29 17:53:30 +01:00
Norman Jäckel 50bed94249
Merge pull request #3463 from FinnStutzenstein/PdfListstyle
Implement list styles in pdf (fixes #3338)
2017-10-29 17:52:59 +01:00
Norman Jäckel e944cd2509
Merge pull request #3464 from emanuelschuetze/splitSeparator
Added '!' as new split separator for better motion diff view.
2017-10-29 17:52:37 +01:00
Emanuel Schütze b50d5e10ee Added '!' as new split separator for better motion diff view. 2017-10-27 14:50:38 +02:00
FinnStutzenstein 78f5d1f516 Implement list styles in pdf (fixes #3338) 2017-10-27 14:35:09 +02:00
FinnStutzenstein 1c508765fa Update state field when following a recommendation 2017-10-27 12:36:31 +02:00
Tobias Hößl 5fd8741fdb try/catch for inconsistent data 2017-10-24 20:06:04 +02:00
FinnStutzenstein f479a7a1ab Fixed user form for groups with ids greater than 9 2017-10-24 10:23:49 +02:00
Norman Jäckel 73407133bd Merge pull request #3444 from FinnStutzenstein/ScrollTopOnPageChange
Go to top on a page change
2017-10-22 15:35:12 +02:00
Norman Jäckel d175e4a200 Merge pull request #3452 from FinnStutzenstein/Plugin
Added TemplateHooks for the protocol plugin.
2017-10-19 21:21:49 +02:00
FinnStutzenstein 9c657016e3 Added TemplateHooks for the protocol plugin. 2017-10-18 11:35:22 +02:00
Emanuel Schütze 4ff7d0b7dc Merge pull request #3450 from CatoTH/Bugfix-Disable-Change-Ratio
Disable change ratio detection / Fix marking unchanged dangling line as changed
2017-10-16 13:05:35 +02:00
Tobias Hößl e651c124e4 Disable change ratio detection / Fix for marking unchanged line as changed 2017-10-16 12:27:44 +02:00
Emanuel Schütze 5eda3131a8 Merge pull request #3449 from emanuelschuetze/motionTemplateImprovements
Motion template improvements (Fixed #3303)
2017-10-16 12:10:00 +02:00
Emanuel Schütze c02f00da7d Merge pull request #3446 from FinnStutzenstein/Identifier
New motion identifier behavior
2017-10-16 12:08:53 +02:00
Emanuel Schütze 17959bd9c5 Motion template improvements (Fixed #3303)
- Sort categories drop downs by config value (name or prefix) (fixed #3303).
- Show comment fiels in pdf without "Comment" as prefix.
- Improved heading style in web and pdf.
- Added motion block to motion pdf.
2017-10-16 09:35:06 +02:00
Emanuel Schütze 721064700a Merge pull request #3441 from FinnStutzenstein/CommentsFilterMove
Move comments filter behind motion block filter
2017-10-13 23:38:45 +02:00
Norman Jäckel 611776d38c Merge pull request #3445 from FinnStutzenstein/MotionTextFullWidth
Limit the reason display width
2017-10-13 18:35:47 +02:00
Norman Jäckel cd2316652d Merge pull request #3443 from FinnStutzenstein/ResetCountdown
Reset Countdown when a speech was ended
2017-10-13 18:23:34 +02:00
Norman Jäckel 9b64bd5646 Merge pull request #3438 from FinnStutzenstein/PDF
Fixing multiline headers in PDF
2017-10-13 18:21:34 +02:00
Norman Jäckel 487b286b79 Merge pull request #3436 from FinnStutzenstein/Remarks
Fixed all remarks
2017-10-13 18:20:45 +02:00
FinnStutzenstein 5b9933e930 Move comments filter behind motion block filter 2017-10-13 14:25:31 +02:00
FinnStutzenstein 1da34f744f New motion identifier behavior 2017-10-13 14:06:01 +02:00
FinnStutzenstein 5f45e2d748 Fixed all remarks 2017-10-13 12:02:23 +02:00
FinnStutzenstein 96cd3405aa Go to top on a page change 2017-10-13 11:46:41 +02:00
FinnStutzenstein 6584c7b035 Limit the reason display width 2017-10-13 11:16:01 +02:00
FinnStutzenstein 256c12af8e Reset Countdown when a speech was ended 2017-10-13 11:13:31 +02:00
Norman Jäckel 3c9ae628e8 Merge pull request #3439 from FinnStutzenstein/PdfInsertFix
Fixed indention of inserted paragraphes
2017-10-12 20:29:41 +02:00
Norman Jäckel 4e672c5832 Merge pull request #3440 from CatoTH/20171011-Diff-Improvements
Diff: use comma as a word separator
2017-10-12 20:25:04 +02:00
Tobias Hößl a09a12c55c Diff: use comma as a word separator 2017-10-11 22:15:12 +02:00
FinnStutzenstein fc185e2eeb Fixing multiline headers in PDF 2017-10-11 14:21:35 +02:00
FinnStutzenstein b8e23e6a4f Fixed indention of inserted paragraphes 2017-10-11 14:04:31 +02:00
Emanuel Schütze 20cf124e9e Merge pull request #3435 from emanuelschuetze/docFixes
Added missing CHANGLOG entry. Minor fix in DEVELOPMENT.rst.
2017-10-06 10:40:14 +02:00
Emanuel Schütze 1a27aa975c Added missing CHANGLOG entry. Minor fix in DEVELOPMENT.rst. 2017-10-06 09:54:27 +02:00
Emanuel Schütze 0171855e51 Merge pull request #3434 from emanuelschuetze/translation
Updated German translations.
2017-10-05 13:40:55 +02:00
Emanuel Schütze 84e2ec2a29 Updated German translations. 2017-10-05 13:33:32 +02:00
Emanuel Schütze 18d138ebf1 Merge pull request #3433 from emanuelschuetze/layoutIssues
Fixed minor layout issues on projector and pdf.
2017-10-05 13:29:38 +02:00
Emanuel Schütze 886d76ff06 Merge pull request #3432 from emanuelschuetze/additionalOptions
Added new motion configs to hide reason/recommendation on projector.
2017-10-05 13:29:12 +02:00
Emanuel Schütze 02857bdbf1 Fixed minor layout issues on projector and pdf.
Especially for motion diff view.
2017-10-05 13:05:49 +02:00
Emanuel Schütze 0a04ee0716 Added new motion configs to hide reason/recommendation on projector. 2017-10-05 12:54:40 +02:00
Emanuel Schütze 188f29a6c3 Merge pull request #3424 from FinnStutzenstein/Issue3422
Generate webclient-realm.js while collecting staticfiles (fixes #3422)
2017-10-05 12:53:28 +02:00
FinnStutzenstein 46364a84e1 Generate webclient-realm.js while collecting staticfiles (fixes #3422) 2017-10-04 12:26:30 +02:00
Norman Jäckel 3840c0ac5e Merge pull request #3431 from FinnStutzenstein/NginxInstructions
Updated Nginx configuration
2017-10-03 21:14:52 +02:00
FinnStutzenstein 00296a802b Updated Nginx configuration 2017-09-28 12:19:32 +02:00
Emanuel Schütze de9c54513d Merge pull request #3430 from FinnStutzenstein/AgendaFix
Fixed projecting subitems
2017-09-28 11:40:47 +02:00
FinnStutzenstein 343ddf5ac5 Fixed projecting subitems 2017-09-28 11:33:33 +02:00
Emanuel Schütze 6d791c7828 Merge pull request #3429 from FinnStutzenstein/NginxInstructions
Instructions for using Nginx in big mode
2017-09-28 11:29:12 +02:00
FinnStutzenstein 2ba1fe2a0f Instructions for using Nginx in big mode 2017-09-28 09:35:05 +02:00
Emanuel Schütze 4c9a8b4ec7 Merge pull request #3425 from FinnStutzenstein/ProjectorPrio
Naive projector prioritization
2017-09-27 15:23:24 +02:00
FinnStutzenstein 5862e054e3 Naive projector prioritization 2017-09-27 14:46:16 +02:00
Emanuel Schütze c269ae5cf8 Merge pull request #3419 from FinnStutzenstein/ViewCaching
Index and Webclient View caching
2017-09-27 13:21:46 +02:00
FinnStutzenstein 178948b269 Index and Webclient View caching 2017-09-27 12:50:59 +02:00
Emanuel Schütze 863e929470 Merge pull request #3423 from emanuelschuetze/dockerfile
Install vim in Dockerimage.
2017-09-27 12:12:48 +02:00
Emanuel Schütze e3e8785079 Install vim in Dockerimage. 2017-09-27 11:12:00 +02:00
Emanuel Schütze 231a056790 Merge pull request #3418 from FinnStutzenstein/ServeLogos
Serve Logos
2017-09-27 10:52:29 +02:00
Emanuel Schütze 0b10933d67 Merge pull request #3417 from FinnStutzenstein/HidePassword
Hide password in change password view
2017-09-27 10:52:09 +02:00
Emanuel Schütze 456d1ff763 Merge pull request #3421 from FinnStutzenstein/MotionCommentsFix3
Fixing motion comments
2017-09-27 09:35:11 +02:00
FinnStutzenstein 6f33c8a866 Fixing motion comments (fixes #3420) 2017-09-27 09:20:07 +02:00
FinnStutzenstein 841383d414 Serve Logos 2017-09-26 10:56:43 +02:00
FinnStutzenstein ab08708ec1 Hide password in change password view 2017-09-26 09:03:05 +02:00
Emanuel Schütze 88fabd10ab Merge pull request #3416 from FinnStutzenstein/MotionCommentsFix2
Fixing special comments fields.
2017-09-22 13:54:16 +02:00
FinnStutzenstein aa13e5ddd0 Fixing special comments fields, reconnect timeout, minor things. 2017-09-22 13:45:52 +02:00
Emanuel Schütze 6f3e2a74f8 Merge pull request #3410 from CatoTH/Issue3409-Workaround-For-Newlines
Line break algorithm should not be distracted by newline characters
2017-09-21 16:35:14 +02:00
Emanuel Schütze c68688c2ff Merge pull request #3414 from FinnStutzenstein/Fixes
Motion comments fix and close open dialogs if a relogin is necessary
2017-09-21 16:29:32 +02:00
Tobias Hößl ee37cfed9c Line break algorithm should not be distracted by newline characters
- Cancel out newlines inserted when inline-editing motions
- Bugfix for newlines after BRs
2017-09-21 16:24:54 +02:00
Emanuel Schütze dfafa69381 Merge pull request #3413 from emanuelschuetze/dockerfile-2
Updated Dockerfile to use requirements_big_mode.txt.
2017-09-21 16:10:27 +02:00
Emanuel Schütze 3d9a237963 Merge pull request #3415 from FinnStutzenstein/MotionCommentsFix
Fixing motion access permissions
2017-09-21 15:56:28 +02:00
FinnStutzenstein a4ae174a94 Fixing motion access permissions 2017-09-21 12:43:07 +02:00
FinnStutzenstein 31708df436 Motion comments fix and close open dialogs if a relogin is necessary 2017-09-20 07:34:57 +02:00
Emanuel Schütze e193c8560a Updated Dockerfile to use requirements_big_mode.txt. 2017-09-19 11:47:31 +02:00
Emanuel Schütze 1fafd74dfa Merge pull request #3412 from emanuelschuetze/fix-karma-test
Fixed karma diff test of #3408.
2017-09-18 12:21:14 +02:00
Emanuel Schütze 9f6deb89c1 Fixed karma diff test of #3408. 2017-09-18 12:02:09 +02:00
Emanuel Schütze 61f59b962d Merge pull request #3411 from emanuelschuetze/stylistic-remarks
Fixed two stylistic remarks.
2017-09-18 11:16:39 +02:00
Emanuel Schütze e313731c9e Merge pull request #3408 from CatoTH/Issue3401-Inline-Diff-When-First-Word-Changed
Inline-Diff when the first word in a paragraph is replaced - fixes #3401
2017-09-18 11:15:52 +02:00
Emanuel Schütze 08ce201b42 Merge pull request #3407 from CatoTH/Issue3402-Diff-With-SPAN-Styles
Sort attributes before applying the diff - fixes #3402
2017-09-18 11:07:38 +02:00
Tobias Hößl 8650bc0401 Inline-Diff works when the first word in a paragraph is being replaced - fixes #3401 2017-09-18 11:05:00 +02:00
Emanuel Schütze 6f4d122e0f Fixed two stylistic remarks. 2017-09-18 09:40:57 +02:00
Tobias Hößl da8f825d42 Sort attributes before applying the diff - fixes #3402 2017-09-16 14:06:12 +02:00
Emanuel Schütze c4a25637d6 Merge pull request #3406 from emanuelschuetze/dockerfile
Updated Dockerfile and yarn.lock.
2017-09-15 15:28:14 +02:00
Emanuel Schütze 08d8b3d7c2 Updated Dockerfile and yarn.lock. 2017-09-15 15:04:31 +02:00
Emanuel Schütze b824e0387c Merge pull request #3390 from ostcar/rewrite_restricted_data
CollectionElement and Autoupdate cleanups to help mypy
2017-09-15 12:23:50 +02:00
Emanuel Schütze c4c3b615df Merge pull request #3405 from emanuelschuetze/translations
Updated German translations.
2017-09-15 12:23:22 +02:00
Oskar Hahn d7db714562 CollectionElement and Autoupdate cleanups
* change get_restricted_data and get_projector_data to always use a list
* Add typings to all get_restricted_data and get_projector_data methods
* Replace CollectionElementList with a real list
* Fixed arguments of inform_deleted_data
* Moved CollectionElementCache to cache.py and refactored it
* Run tests with cache enabled (using fakeredis)
2017-09-15 12:11:32 +02:00
Emanuel Schütze 483410fe0c Updated German translations. 2017-09-15 12:08:26 +02:00
Emanuel Schütze 4565e7e4a6 Merge pull request #3400 from FinnStutzenstein/UserAutoupdate
Autoupdates on user login (fixes #3395, fixes #3392)
2017-09-15 11:48:35 +02:00
Emanuel Schütze 8e15b5dafe Merge pull request #3404 from FinnStutzenstein/Improvements
Goto top link, improved title, stylistic changes, and more
2017-09-15 11:16:46 +02:00
FinnStutzenstein c580ee4c8d Goto top link, improved title, stylistic changes, and more 2017-09-15 11:06:19 +02:00
Emanuel Schütze 2c4a1d5a6c Merge pull request #3376 from FinnStutzenstein/MotionCommentsRework
Rework on motion comments.
2017-09-15 10:59:02 +02:00
Emanuel Schütze 83f67b23c9 Merge pull request #3403 from ostcar/optional_restricted_data_cache
Make RestrictedDataCache optional
2017-09-15 10:56:22 +02:00
FinnStutzenstein 16abfd0dbf Autoupdates on user login (fixes #3395, fixes #3392) 2017-09-15 10:40:04 +02:00
Oskar Hahn faf44602cb Make RestrictedDataCache optional 2017-09-15 09:55:21 +02:00
Norman Jäckel 0eccd78b78 Merge pull request #3384 from FinnStutzenstein/SecureMedifiles
Secure Mediafiles and check view permissions
2017-09-14 20:31:33 +02:00
FinnStutzenstein 288a706d01 Rework on motion comments (fixes #3350). 2017-09-12 14:58:43 +02:00
Emanuel Schütze 7eaa388747 Merge pull request #3356 from FinnStutzenstein/Issue3353
Clear the identifier_number on identifier reset (fixes #3353)
2017-09-08 22:21:45 +02:00
FinnStutzenstein 8adf2a6729 Clear the identifier_number on identifier reset (fixes #3353) 2017-09-08 22:09:25 +02:00
Emanuel Schütze 3a25e87330 Merge pull request #3366 from FinnStutzenstein/Issue3363
New permission for managing lists of speakers (fixes #3363)
2017-09-08 22:05:32 +02:00
Emanuel Schütze 62f0f23228 Merge pull request #3393 from FinnStutzenstein/Issue3389
Pagination for assingment list (fixes #3389)
2017-09-08 21:57:25 +02:00
FinnStutzenstein 4472734d09 New permission for managing lists of speakers (fixes #3363) 2017-09-08 21:55:42 +02:00
FinnStutzenstein dc03a67281 Pagination for assingment list (fixes #3389) 2017-09-08 21:45:37 +02:00
Norman Jäckel 8e89db5940 Merge pull request #3397 from emanuelschuetze/issue3387
Pin angular-ui-tree to last working version v2.22.5. (Fixed #3387)
2017-09-08 20:00:34 +02:00
Norman Jäckel 544dd4ce13 Merge pull request #3398 from emanuelschuetze/motion-detail-style
Fixed motion detail style issues
2017-09-08 19:43:31 +02:00
Emanuel Schütze 29f60fc6aa Fixed motion detail style issues
- margin in motion diff view
- personal note box
2017-09-08 18:25:48 +02:00
Emanuel Schütze 1e1e7637f9 Merge pull request #3379 from FinnStutzenstein/AgentaTitle
New layout for agenda list slide, fixing long titles in agenda list v…
2017-09-08 15:16:52 +02:00
Emanuel Schütze 0eae11c4c2 Pin angular-ui-tree to last working version v2.22.5. (Fixed #3387) 2017-09-08 11:03:17 +02:00
Oskar Hahn 37b2996b6c Merge pull request #3358 from ostcar/restricted_user_cache
Add restricted_data_cache
2017-09-06 18:38:14 +02:00
Oskar Hahn 0978cfd5d5 Add restricted_data_cache
This replaces the startup cache
2017-09-06 18:06:57 +02:00
Oskar Hahn 71e154ec6d Merge pull request #3382 from ostcar/remove_dispatch
Rewrite projector_element without dispatch
2017-09-06 18:06:39 +02:00
Oskar Hahn b80e95a321 Rewrite projector_element without dispatch 2017-09-05 22:46:13 +02:00
Norman Jäckel c9ad15621c Merge pull request #3383 from FinnStutzenstein/CustomTranslations
Custom Translations
2017-09-05 22:15:21 +02:00
FinnStutzenstein b35ea2ea5b New layout for agenda list slide, fixing long titles in agenda list view, fixing mediafiles in fullscreen (fixes #3369) 2017-09-05 15:30:59 +02:00
Emanuel Schütze b416786b40 Merge pull request #3360 from FinnStutzenstein/PinPersonalNote
Pin personal note.
2017-09-05 09:52:31 +02:00
FinnStutzenstein 02428eb8f0 Pin personal note. 2017-09-05 08:24:16 +02:00
FinnStutzenstein b30919eada Custom Translations 2017-09-05 08:04:02 +02:00
Oskar Hahn f1d7f85be9 Merge pull request #3380 from ostcar/more_typings
More typings
2017-09-03 19:00:34 +02:00
Oskar Hahn be94e97889 more typings 2017-09-03 18:34:55 +02:00
Norman Jäckel 438318d3d0 Merge pull request #3386 from emanuelschuetze/fixReasonInlineEditing
Fixed inline editing of motion reason.
2017-09-01 20:41:09 +02:00
Norman Jäckel fcbe70f742 Merge pull request #3388 from ostcar/fix_3377
Fix PersonalNoteAccessPermissions for anonymous user
2017-09-01 20:33:59 +02:00
FinnStutzenstein ab1f745be2 Secure Mediafiles and check view permissions 2017-09-01 14:29:46 +02:00
Oskar Hahn 24b07da7b4 Fix PersonalNoteAccessPermissions for anonymous user
fixes: #3377
2017-08-31 22:00:22 +02:00
Emanuel Schütze f4ac0dd30d Fixed inline editing of motion reason. 2017-08-30 19:23:52 +02:00
Emanuel Schütze cd637a94c8 Merge pull request #3385 from emanuelschuetze/translations-de
Updated German translations.
2017-08-30 18:04:49 +02:00
Emanuel Schütze b806e24f87 Updated German translations. 2017-08-30 17:40:26 +02:00
Emanuel Schütze 97a1431c32 Merge pull request #3372 from FinnStutzenstein/Issue3365
Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367)
2017-08-29 11:44:47 +02:00
Emanuel Schütze 0dda74b99b Merge pull request #3375 from emanuelschuetze/ckeditor
Updated to ckeditor 4.7.2
2017-08-29 11:36:58 +02:00
FinnStutzenstein 7d333d4f3b Multiselect filter for motion comments, filter and sorting fixes (fixes #3365, fixes #3367) 2017-08-29 11:36:00 +02:00
Emanuel Schütze 7d6e1f1b97 Merge pull request #3371 from ostcar/new_config
Rewrite config to have id field
2017-08-29 11:31:43 +02:00
Emanuel Schütze e2e6c8c4b4 Updated to ckeditor 4.7.2 2017-08-29 11:26:18 +02:00
Norman Jäckel 0f322720a4 Merge pull request #3374 from emanuelschuetze/fix-pdf-error-for-reason
Fixed pdf generation error for motion reason.
2017-08-28 21:07:39 +02:00
Norman Jäckel ffde351718 Merge pull request #3368 from FinnStutzenstein/Issue3364
Different ckeditor toolbar for inline editing
2017-08-28 20:59:44 +02:00
Norman Jäckel 1ca829f902 Merge pull request #3361 from FinnStutzenstein/ReasonInlineEditing
Inline editing for motion reason
2017-08-28 20:53:28 +02:00
Emanuel Schütze 96d3b4178a Fixed pdf generation error for motion reason. 2017-08-24 19:07:01 +02:00
FinnStutzenstein efbb68cf55 Different ckeditor toolbar for inline editing 2017-08-24 18:49:54 +02:00
Oskar Hahn 87b889fbf2 Rewrite config to have id field 2017-08-24 15:02:42 +02:00
Oskar Hahn 9d1ebac86e Add typing (#3370)
Add typing
2017-08-23 20:51:06 +02:00
FinnStutzenstein 0f6d2d431c Inline editing for motion reason 2017-08-23 09:42:10 +02:00
Norman Jäckel c4fe50b38d Merge pull request #3362 from FinnStutzenstein/ScrollImprovement
Scroll improvement
2017-08-18 14:30:43 +02:00
Norman Jäckel effe42464f Merge pull request #3355 from FinnStutzenstein/Issue3169
Mediafile fullscreen (fixes #3169)
2017-08-18 14:26:38 +02:00
Norman Jäckel acdb66ee36 Merge pull request #3354 from FinnStutzenstein/AssignmentSelectAllFix
Fixing selecting all of assignments
2017-08-18 14:25:09 +02:00
Norman Jäckel 8f9d6fcc07 Merge pull request #3359 from FinnStutzenstein/MediafilesLayout
Fixing layout issues in mediafiles list view
2017-08-18 14:24:38 +02:00
Norman Jäckel da0a1f76cd Merge pull request #3357 from FinnStutzenstein/ProjectorHeaderFooter
Config for projector header and footer
2017-08-18 14:18:52 +02:00
FinnStutzenstein 94a58afbdf Scroll improvement 2017-08-18 11:55:52 +02:00
FinnStutzenstein 4ec4694f01 Fixing layout issues in mediafiles list view 2017-08-18 08:06:13 +02:00
FinnStutzenstein 07e584ae63 Mediafile fullscreen (fixes #3169) 2017-08-16 14:42:19 +02:00
FinnStutzenstein c72399ff9b Config for projector header and footer 2017-08-16 14:39:58 +02:00
Emanuel Schütze 14e38861c7 Merge pull request #3342 from FinnStutzenstein/Umlaute
Fixing strange umlauts when copy text from word
2017-08-16 14:11:28 +02:00
FinnStutzenstein 0a1432f047 Fixing strage umlauts when copy text from word 2017-08-16 11:49:31 +02:00
Norman Jäckel 40e3958a7d Merge pull request #3351 from FinnStutzenstein/NoSpecialCommentsInConfig
Exclude special comments in comment field settings; fixing the inline…
2017-08-16 11:45:28 +02:00
Norman Jäckel 76ff708e0e Merge pull request #3348 from FinnStutzenstein/Issue3344
Default sorting for users, mediafiles and assignments (fixes #3344)
2017-08-16 11:44:24 +02:00
Norman Jäckel 0fe7b6bf7d Merge pull request #3337 from FinnStutzenstein/CKEditorImages
Custom CKEditor plugin for browsing mediafiles
2017-08-16 11:41:55 +02:00
FinnStutzenstein b63262c943 Custom CKEditor plugin for browsing mediafiles 2017-08-16 10:15:34 +02:00
Emanuel Schütze b01513ac60 Merge pull request #3347 from FinnStutzenstein/Issue3343
Fixing paragraphs in lists when exporting PDF (fixes #3343)
2017-08-16 10:11:39 +02:00
FinnStutzenstein c36b756f25 Fixing paragraphs in lists when exporting PDF (fixes #3343) 2017-08-16 09:52:30 +02:00
FinnStutzenstein 1fb9b07c6b Fixing selecting all of assignments 2017-08-16 09:49:07 +02:00
FinnStutzenstein a365127a1c default sorting for users, mediafiles and assignments (fixes #3344) 2017-08-16 09:13:33 +02:00
FinnStutzenstein a12440ed2c Exclude special comments in comment field settings; fixing the inline editiing 2017-08-16 09:09:22 +02:00
Emanuel Schütze f0d840148e Merge pull request #3330 from FinnStutzenstein/PluginDev
Improvements for plugin integration
2017-08-14 15:06:14 +02:00
Emanuel Schütze 81f841d5e5 Merge pull request #3310 from emanuelschuetze/new-logo
Added new logo placeholder for web interface header logo.
2017-08-14 14:50:07 +02:00
FinnStutzenstein 08c9dda1de Improvements for plugin integration 2017-08-14 14:48:31 +02:00
Emanuel Schütze 32c36996b0 Merge pull request #3345 from FinnStutzenstein/testData
some changes in the example data plugin
2017-08-14 10:52:45 +02:00
Emanuel Schütze 298d41def7 Merge pull request #3346 from FinnStutzenstein/Issue3232
removing obsolete merge-before
2017-08-14 10:00:57 +02:00
FinnStutzenstein 727d1341e8 some changes in the example data plugin 2017-08-14 09:56:48 +02:00
FinnStutzenstein 52e2d2ca83 removing obsolete merge-before (fixes #3232) 2017-08-14 09:51:20 +02:00
Norman Jäckel e2a32e403d Merge pull request #3349 from FinnStutzenstein/ColorInPdf
Fixing wrong styles in PDF
2017-08-12 13:48:08 +02:00
Norman Jäckel 0c8bf5c5ba Merge pull request #3336 from normanjaeckel/RemoveElementsProjector
Unproject elements when they are deleted. Fixed #3292.
2017-08-12 13:35:09 +02:00
Norman Jäckel 305356f75f Unproject elements when they are deleted. Fixed #3292. 2017-08-12 13:27:23 +02:00
Norman Jäckel c8e56b29a6 Merge pull request #3340 from CatoTH/Issue3339-Allow-OL-start-tag
Allow OL[start] - fixes #3339
2017-08-12 13:19:46 +02:00
Emanuel Schütze 2c43bfee47 Rework on ballot paper layout for using logos. 2017-08-11 12:50:49 +02:00
FinnStutzenstein bf56067d17 poll and ballot paper logos 2017-08-11 12:48:48 +02:00
Emanuel Schütze 3e1c1abe14 Added new logo placeholder for web interface header logo. 2017-08-11 12:48:48 +02:00
FinnStutzenstein 5d902d809f Fixing wrong stlyes in PDF 2017-08-11 10:34:03 +02:00
Tobias Hößl 54e067d9d9 Allow OL[start] - fixes #3339
Style
2017-08-02 21:27:12 +02:00
Norman Jäckel 2aeaf251a2 Merge pull request #3335 from emanuelschuetze/config-order
Reorder weight fields of core configs.
2017-07-28 14:53:53 +02:00
Emanuel Schütze 0cb4243891 Merge pull request #3334 from emanuelschuetze/motion-fixes
Motion formatting and sort fixes
2017-07-28 14:36:22 +02:00
Emanuel Schütze 5ee0219702 Reorder weight fields of core configs. 2017-07-28 14:31:59 +02:00
Emanuel Schütze 96be75fc0d Motion formatting and sort fixes
- Adapt font size of outside linenumbers in motion pdf, depending on
  selected standard font size.
- Enlarge width of first column in of meta table of motion pdf.
- Fixed order issue in motion list: Sort always by identifier (also
  after selecting a custom sort parameter).
2017-07-28 14:26:28 +02:00
Emanuel Schütze c5c15d26b5 Merge pull request #3333 from emanuelschuetze/translations
Updated German translations.
2017-07-27 15:24:16 +02:00
Emanuel Schütze 6b291726a4 Updated German translations. 2017-07-27 15:17:40 +02:00
Emanuel Schütze 2dc7db2b8c Merge pull request #3288 from CatoTH/Issue3269-Issue3232-Split-Elements2
Issue3269 issue3232 split elements2
2017-07-27 15:12:44 +02:00
Emanuel Schütze 3c9a67d084 Merge pull request #3332 from emanuelschuetze/fontsize
Added config option for standard font size in PDF.
2017-07-27 15:04:01 +02:00
Tobias Hößl 7b62c60350 Marks split list items with CSS-classes and hides the bullet points - fixes #3269 2017-07-27 14:42:51 +02:00
Emanuel Schütze d57d3efcf4 Added config option for standard font size in PDF. 2017-07-27 14:36:49 +02:00
Emanuel Schütze 3c747c01e2 Merge pull request #3331 from FinnStutzenstein/no-special-comments-in-export
Hide special comments in export
2017-07-27 14:36:04 +02:00
Emanuel Schütze 7f20a7d358 Merge pull request #3324 from FinnStutzenstein/configvalue-for-id
Configvalue for sequential number
2017-07-27 13:45:19 +02:00
FinnStutzenstein 2e2d28288a Hide special comments in export 2017-07-27 12:44:13 +02:00
FinnStutzenstein c65976715e configvalue for sequential number 2017-07-27 11:15:12 +02:00
Emanuel Schütze 9dca7fa3b6 Merge pull request #3327 from FinnStutzenstein/configvalue-pdf-pagenumber-alignment
Configvalue for pagenumber alignment in PDF
2017-07-27 11:02:15 +02:00
FinnStutzenstein 1f59336e3e Configvalue for pagenumber alignment in PDF 2017-07-27 10:55:40 +02:00
Emanuel Schütze 41ab706939 Merge pull request #3323 from FinnStutzenstein/hide-error-on-load
Delay the projector not loaded error.
2017-07-27 10:51:18 +02:00
Norman Jäckel f806dc4017 Merge pull request #3329 from FinnStutzenstein/category-sort-in-export
Add the option to sort the categories different in the motion export
2017-07-27 10:41:02 +02:00
FinnStutzenstein 8560509ace Delay the projector not loaded error. 2017-07-27 10:06:11 +02:00
Emanuel Schütze c0bd367342 Merge pull request #3328 from FinnStutzenstein/mediafile-type-fix
Fixing mediafiles list view for medifiles without a type
2017-07-27 09:54:30 +02:00
FinnStutzenstein a32b046fa5 Add the option to sort categories different in motion export. 2017-07-27 09:50:03 +02:00
FinnStutzenstein 6c5cc799ca Fixing mediafiles list view for medifiles without a type 2017-07-26 15:46:14 +02:00
Emanuel Schütze 5644e99b43 Merge pull request #3319 from FinnStutzenstein/docx-text-missing
fixing docx parser missing text
2017-07-26 15:03:27 +02:00
Emanuel Schütze a44b84e836 Merge pull request #3318 from normanjaeckel/CategorySortError
Fixed error on category numbering. Fixed #3315.
2017-07-26 14:41:27 +02:00
Emanuel Schütze c58f3071f2 Merge pull request #3321 from FinnStutzenstein/docx-comments-filter
fixing wrong entered comments
2017-07-26 14:33:04 +02:00
FinnStutzenstein 9c0a10df63 fixing wrong entered comments 2017-07-20 14:43:58 +02:00
FinnStutzenstein 615327f64d fixing docx parser missing text 2017-07-19 13:08:31 +02:00
Emanuel Schütze 9c1d2319ac Merge pull request #3317 from normanjaeckel/Changelog
Updated CHANGELOG.
2017-07-07 11:28:34 +02:00
Norman Jäckel 41a70f40df Fixed error on category numbering. Fixed #3315. 2017-07-05 22:13:54 +02:00
Norman Jäckel e2d710a84c Updated CHANGELOG. 2017-07-05 21:30:16 +02:00
Norman Jäckel 77a321894b Merge pull request #3306 from FinnStutzenstein/Issue2862
Remove OPTION request to query permissions (fixes #2862)
2017-07-05 21:26:08 +02:00
Emanuel Schütze 3006cb388f Merge pull request #3304 from CatoTH/Issue3298-PreventCollidingChangeRecommendations
Prevent colliding change recommendations - fixes #3298
2017-06-29 18:18:36 +02:00
Tobias Hößl 65d5bbccd6 Prevent colliding change recommendations - fixes #3298 2017-06-29 18:03:58 +02:00
FinnStutzenstein 90af3e6d1d remove OPTION request to query permissions (fixes #2862) 2017-06-29 13:25:52 +02:00
Norman Jäckel 1701fd72f2 Merge pull request #3314 from FinnStutzenstein/Bugfixes
Minor Bugfixes (fixes #3312, fixes #3313)
2017-06-29 10:45:13 +02:00
FinnStutzenstein 37eec7d99b Minor Bugfixes (fixes #3312, fixes #3313) 2017-06-29 08:59:41 +02:00
Emanuel Schütze 574d815397 Merge pull request #3311 from FinnStutzenstein/projector-size
Projectorsize selection with slider
2017-06-28 12:43:42 +02:00
FinnStutzenstein 2d35b9e371 Projectorsize selection with slider 2017-06-28 09:23:40 +02:00
Emanuel Schütze b1d98ca33a Merge pull request #3308 from FinnStutzenstein/agenda-project
call the own project method from a content object of an agenda item
2017-06-27 12:53:02 +02:00
Norman Jäckel 029366de5f Merge pull request #3301 from FinnStutzenstein/related-projected
Highlight objects in list view, if related objects are projected
2017-06-21 22:56:15 +02:00
Norman Jäckel e72af0101c Merge pull request #3309 from FinnStutzenstein/Issue3307
fix not supported 'startsWith' function in IE11 (fixes #3307)
2017-06-21 21:45:15 +02:00
Norman Jäckel 79b48e7054 Merge pull request #3305 from FinnStutzenstein/projector-is-stuck
fix projector reconnecting if websocket is closed
2017-06-21 21:44:49 +02:00
FinnStutzenstein f42b6f0d37 fix not supported 'startsWith' function in IE11 (fixes #3307) 2017-06-21 15:28:43 +02:00
FinnStutzenstein ef60f5ea44 call the own project method from a content object of an agenda item 2017-06-21 15:09:38 +02:00
FinnStutzenstein 0a1ea46b8d fix projector reconnecting if websocket is closed 2017-06-21 13:18:06 +02:00
FinnStutzenstein 2536b35c0e Highlight objects in list view, if related objects are projected 2017-06-21 07:52:10 +02:00
Emanuel Schütze 573fc4da57 Merge pull request #3267 from normanjaeckel/NewPersonalNote
Rework on personal notes.
2017-06-16 12:38:40 +02:00
Emanuel Schütze 72aaac169e Merge pull request #3300 from emanuelschuetze/translations
Updated js pot file and German translations.
2017-06-16 12:38:20 +02:00
Emanuel Schütze 45a2e3bbc4 Updated js pot file and German translations. 2017-06-16 12:24:11 +02:00
Emanuel Schütze bef986630e Merge pull request #3297 from FinnStutzenstein/Issue3295
improved reconnect handling if the server was flushed (fixed #3295)
2017-06-16 07:56:30 +02:00
Emanuel Schütze a3a401ec80 Merge pull request #3299 from FinnStutzenstein/improvements
Some small changes and bugfixes
2017-06-16 07:51:57 +02:00
FinnStutzenstein 4387a56fb1 Improved reconnect handling if the server was flushed (fixed #3295).
just ping with whoami request
2017-06-16 07:47:17 +02:00
FinnStutzenstein 2e898275cb Some small changes and bugfixes 2017-06-15 14:25:55 +02:00
Emanuel Schütze 4810177b37 Merge pull request #3296 from normanjaeckel/FixCollectionRemoveHotfix
Fixed get_projector_data impementation. Closed #3282.
2017-06-15 12:25:15 +02:00
Norman Jäckel eaebeb8f06 Fixed get_projector_data impementation. Closed #3282. 2017-06-13 22:21:56 +02:00
FinnStutzenstein c80b0abc82 Personal note: client rework 2017-06-13 20:58:17 +02:00
Norman Jäckel 91d365e386 Rework on personal notes. Fixed #3262. 2017-06-13 20:58:17 +02:00
Norman Jäckel 7947f2ed34 Merge pull request #3293 from ostcar/no_anonymous_no_cry
Block anonymous from websocket, if they are deactivated
2017-06-13 11:34:02 +02:00
Norman Jäckel 260cd5cd16 Merge pull request #3290 from FinnStutzenstein/Issue1533-neu
Massimport for users
2017-06-12 22:07:32 +02:00
Norman Jäckel d1c86e8b0d Merge pull request #3291 from FinnStutzenstein/userImportFix
Fix import on not full populated csv files
2017-06-12 22:04:56 +02:00
Oskar Hahn 8920ffac66 Block anonymous from websocket, if they are deactivated 2017-06-10 09:25:27 +02:00
FinnStutzenstein 8cb6342e73 Fix import on not full populated csv files 2017-06-09 14:57:06 +02:00
FinnStutzenstein 433cdc42fa Massimport for users 2017-06-08 14:40:29 +02:00
Emanuel Schütze fb56215a26 Merge pull request #3233 from normanjaeckel/FixFreeUserAgenda
Fixes autoupdate bug for a user without user.can_see_name permission …
2017-06-07 21:00:12 +02:00
Norman Jäckel ea50971ae6 Fixes autoupdate bug for a user without user.can_see_name permission. 2017-06-07 20:55:00 +02:00
Emanuel Schütze 5a945c3a71 Merge pull request #3287 from CatoTH/diff-bugfix
Fix a bug where a single moved word was not highlighted in the diff
2017-06-07 20:15:48 +02:00
Emanuel Schütze 3f1aa959b5 Merge pull request #3286 from FinnStutzenstein/PdfFix
Fixes some PDF issues
2017-06-07 12:08:19 +02:00
FinnStutzenstein 9448beb903 Fixes some PDF issues 2017-06-07 07:55:49 +02:00
Tobias Hößl 029ca0b8e3 Fix a bug where a single moved word was not highlighted in the diff 2017-06-06 19:28:52 +02:00
Emanuel Schütze c5be76ace2 Merge pull request #3285 from emanuelschuetze/pdfmake
Updated to pdfmake 0.1.30.
2017-06-02 07:41:35 +02:00
Emanuel Schütze 58cb34c0c4 Updated to pdfmake 0.1.30. 2017-06-02 07:33:40 +02:00
Emanuel Schütze 074559ba23 Merge pull request #3279 from FinnStutzenstein/Issue3273
Fixing linenumbers on page break (fixes #3273)
2017-06-01 15:31:36 +02:00
Emanuel Schütze 53d50242b6 Merge pull request #3274 from FinnStutzenstein/Issue3259
Do not reload all projector elements on every autoupdate (fixes #3259).
2017-06-01 15:24:02 +02:00
FinnStutzenstein a83cd5b947 Fixing linenumbers on page break (fixes #3273) 2017-06-01 15:22:52 +02:00
Emanuel Schütze 59a21c6cbc Merge pull request #3283 from emanuelschuetze/issue3282
Hotfix for issue #3282.
2017-06-01 15:20:53 +02:00
Emanuel Schütze c361bb5a02 Merge pull request #3278 from emanuelschuetze/pdfmake
Updated pdfmake to 0.1.29
2017-06-01 15:20:08 +02:00
FinnStutzenstein 678a56db08 Do not reload all projector elements on every autoupdate (fixes #3259). 2017-06-01 15:01:24 +02:00
Emanuel Schütze 2994f7713b Hotfix for issue #3282.
(projector autoupdate problem by deleting projected object)
2017-06-01 14:57:33 +02:00
Emanuel Schütze 5e8a508890 Updated pdfmake to 0.1.29
Improved performance to pdf generation significantly!
2017-06-01 14:57:12 +02:00
Emanuel Schütze 5771eab820 Merge pull request #3284 from emanuelschuetze/isort
Set isort to 4.2.5 in requirements.txt (see #3281).
2017-06-01 14:56:46 +02:00
Emanuel Schütze c5db2fa4e7 Set isort to 4.2.5 in requirements.txt (see #3281). 2017-06-01 14:51:00 +02:00
Norman Jäckel 400273dfa6 Merge pull request #3277 from emanuelschuetze/empty-span
Removed empty <span> tags in ckeditor.
2017-05-31 22:10:12 +02:00
Norman Jäckel 364c3e59a9 Merge pull request #3276 from CatoTH/Yarn-Test-Runner-Shortcut
Add a easier command to run the karma-tests
2017-05-31 22:09:46 +02:00
Emanuel Schütze b48c850e79 Removed empty <span> tags in ckeditor. 2017-05-31 21:35:32 +02:00
Tobias Hößl 769f9af4bd Add a easier command to run the karma-tests 2017-05-31 20:17:58 +02:00
Norman Jäckel d20945bcb6 Merge pull request #3272 from FinnStutzenstein/tracker14
Fixed missing styles of headings in motion pdf.
2017-05-31 10:08:02 +02:00
FinnStutzenstein 8cd22daff3 Fixed missing styles of headings in motion pdf.
Also some refactoring/clean up of pdf code.
2017-05-29 13:03:12 +02:00
Emanuel Schütze 1b6dd93e6e Merge pull request #3268 from emanuelschuetze/pdf-issue
Fixed formatting errors in motion pdf (Fixed #3228).
2017-05-23 22:52:31 +02:00
Emanuel Schütze eee0e0fc06 Fixed formatting errors in motion pdf (Fixed #3228).
for diff view
2017-05-23 22:42:14 +02:00
Emanuel Schütze b9a115d3b8 Merge pull request #3266 from normanjaeckel/RenameFunction
Renamed is_user_data_required to required_users. Fixed #3238.
2017-05-23 22:31:28 +02:00
Emanuel Schütze 878345f155 Merge pull request #3265 from normanjaeckel/RemoveOptionForm
Removed old poll code snippets.
2017-05-23 22:29:25 +02:00
Norman Jäckel 913bec3e53 Renamed is_user_data_required to required_users. Fixed #3238. 2017-05-22 16:08:52 +02:00
Norman Jäckel f4c30da4a2 Removed old poll code snippets. Fixed #3179. 2017-05-22 15:51:55 +02:00
Emanuel Schütze ed0b1cef54 Merge pull request #3264 from emanuelschuetze/issue3263
Changed PdfImageConverter to ImageConverter (Fixed #3263).
2017-05-21 22:35:10 +02:00
Emanuel Schütze 32610e552c Changed PdfImageConverter to ImageConverter (Fixed #3263). 2017-05-21 22:20:57 +02:00
Emanuel Schütze dda9bb0434 Merge pull request #3239 from FinnStutzenstein/personalNotePDF
Export personal note and comments in PDFs
2017-05-19 14:52:31 +02:00
FinnStutzenstein e7da35398d Export personal note and comments in PDFs. 2017-05-19 14:31:58 +02:00
Emanuel Schütze 8abfe91853 Merge pull request #3258 from FinnStutzenstein/docx
Rework docx parser, add comments to docx
2017-05-19 14:02:29 +02:00
FinnStutzenstein f4c4f2553b Rework docx parser, add comments to docx 2017-05-19 13:55:09 +02:00
Norman Jäckel 76918c47a4 Merge pull request #3261 from FinnStutzenstein/NotifyWithInlineEditing
Also notify users when they inline edit a motion
2017-05-19 13:49:08 +02:00
FinnStutzenstein e396347e00 Also notify users when they inline edit a motion (fixes #2360) 2017-05-19 13:21:19 +02:00
Emanuel Schütze 3b2c7634f0 Merge pull request #3256 from FinnStutzenstein/Issue3243
extending the color parser (fixes #3243)
2017-05-19 08:46:32 +02:00
Norman Jäckel 94aceeffab Merge pull request #3237 from tsiegleauq/issue3180-scale-images
enables pdf image scaling for CKEditor
2017-05-18 21:34:06 +02:00
Norman Jäckel 7c2a28b368 Merge pull request #3257 from CatoTH/Issue3247-Remove-Color-Styles-Inside-Diff
Remove color styles insert .insert/.delete-Paragraphs - fixes #3247
2017-05-18 21:31:51 +02:00
Tobias Hößl 7109c75246 Remove color styles insert .insert/.delete-Paragraphs - fixes #3247 2017-05-17 21:38:35 +02:00
FinnStutzenstein a23e263dcb extending the color parser (fixes #3243) 2017-05-17 09:13:10 +02:00
Emanuel Schütze 70dd9647b4 Merge pull request #3251 from FinnStutzenstein/PdfZipPerformance
Improve zip creation and fixing page numbers
2017-05-17 08:29:00 +02:00
FinnStutzenstein 91882f1d13 Improve zip creation and fixing page numbers 2017-05-17 07:54:35 +02:00
Emanuel Schütze 6eec735c8e Merge pull request #3252 from FinnStutzenstein/PdfZipFilenames
Fixing PDF filenames on zip export if no identifier is given
2017-05-16 20:58:28 +02:00
Emanuel Schütze d5b9a5c590 Merge pull request #3244 from normanjaeckel/Fix3242
Removed default permissions for personal note. Updated Yarn lock. Fix…
2017-05-16 20:26:01 +02:00
Emanuel Schütze c2a271c422 Merge pull request #3254 from emanuelschuetze/Issue3229-Broken-HTML
Detect broken HTML after diff (Fixed #3229)
2017-05-16 14:25:00 +02:00
Tobias Hößl b340256541 Detect broken HTML after diff (Fixed #3229) 2017-05-16 12:19:18 +02:00
Emanuel Schütze f46ad742e3 Merge pull request #3230 from FinnStutzenstein/Issue3219
Cleanup MotionUpdateCtrl (fixes #3219)
2017-05-15 14:17:55 +02:00
Emanuel Schütze e0661e7343 Merge pull request #3248 from FinnStutzenstein/ExportDialogFilename
Fixing error when downloading
2017-05-15 13:45:07 +02:00
Emanuel Schütze 601e2ea2b5 Merge pull request #3249 from FinnStutzenstein/MediafilePdfPageFix
Fixing page controls in mediafiles list view
2017-05-15 13:41:50 +02:00
Emanuel Schütze fe34c592a8 Merge pull request #3250 from FinnStutzenstein/PdfGroup
Fixing user list pdf
2017-05-15 13:39:24 +02:00
Emanuel Schütze 7bc13863bf Merge pull request #3246 from FinnStutzenstein/PluginGitignore
Extend gitignore for plugin development
2017-05-15 13:24:39 +02:00
FinnStutzenstein d1f0b69d35 Fixing PDF filenames on zip export if no identifier is given 2017-05-12 12:02:01 +02:00
FinnStutzenstein 8f070ffaa1 Fixing user list pdf 2017-05-11 12:47:01 +02:00
sean eb259dc5e2 enables pdf image scaling for CKEditor 2017-05-10 13:50:52 +02:00
FinnStutzenstein 2f7b4e5034 Extend gitignore for plugin development 2017-05-10 13:26:23 +02:00
FinnStutzenstein 90c8ce5bf0 Fixing page controls in mediafiles list view 2017-05-10 09:26:31 +02:00
FinnStutzenstein 17d9615631 Fixing error when downloading 2017-05-10 09:04:19 +02:00
Norman Jäckel 754116cdca Removed default permissions for personal note. Updated Yarn lock. Fixed #3242. 2017-05-09 13:49:56 +02:00
Norman Jäckel 2833341867 Merge pull request #3235 from tsiegleauq/issue3231-long-lines-in-lists
fix long lines in pdf list (fixes #3231)
2017-05-08 13:06:48 +02:00
Norman Jäckel db1d087aa0 Merge pull request #3236 from CatoTH/Issue3226-WhitespacesDisturbingLineExtraction
Bugfix: whitespaces were disturbing line extraction - fixes #3226
2017-05-08 13:06:13 +02:00
sean 37b96bb0bc fix long lines in pdf list (fixes #3231) 2017-05-07 22:01:50 +02:00
Emanuel Schütze 4f0691075c Merge pull request #3240 from FinnStutzenstein/FixErr
Fixing wrong err call
2017-05-06 08:13:44 +02:00
FinnStutzenstein 118cff6964 Fixing wrong err call 2017-05-05 17:25:34 +02:00
Norman Jäckel 933a5ba13f Merge pull request #3223 from ostcar/many_restricted_data
Speed up WS connection
2017-05-03 09:06:55 +02:00
Norman Jäckel ebabc291c5 Refactoring of data parsing for startup and autoupdate. 2017-05-03 08:58:29 +02:00
Oskar Hahn 4963bfa7bf Changed restricted data parsing. Cached full data on startup. 2017-05-01 21:52:16 +02:00
Tobias Hößl b0a569fdf3 Bugfix: whitespaces were disturbing line extraction 2017-05-01 15:55:51 +02:00
FinnStutzenstein adb5185fcc Cleanup MotionUpdateCtrl (fixes #3219) 2017-04-28 14:18:29 +02:00
Norman Jäckel 6559f5508f Merge pull request #3227 from FinnStutzenstein/Issue3206
Fixing PDF in IE11 (fixes #3206, fixes #3217)
2017-04-28 14:13:07 +02:00
FinnStutzenstein 239d56f350 Fixing PDF in IE11 (fixes #3206, fixes #3217) 2017-04-28 13:16:46 +02:00
Emanuel Schütze e3c39031c7 Merge pull request #3225 from normanjaeckel/UpdateNodeModules
Updated package.json and yarn.lock.
2017-04-28 13:10:30 +02:00
Norman Jäckel d1b45e043c Updated package.json and yarn.lock. 2017-04-28 12:52:49 +02:00
Norman Jäckel 7d0ce465f4 Merge pull request #3188 from normanjaeckel/Yarn
Switched from npm to Yarn. Closed #3012.
2017-04-28 12:19:54 +02:00
Emanuel Schütze daaf3b5663 Updated Dockerfile for using yarn. 2017-04-28 11:49:56 +02:00
Norman Jäckel f10465c477 Switched from npm to Yarn. Closed #3012. 2017-04-28 11:49:55 +02:00
Emanuel Schütze c7c7bfca9c Merge pull request #3222 from emanuelschuetze/translations
Updated German translations.
2017-04-27 15:38:10 +02:00
Emanuel Schütze dd99be5e69 Merge pull request #3221 from normanjaeckel/ChangeKeyError
Fixed error for internal function get_model_from_collection_string.
2017-04-27 15:34:39 +02:00
Emanuel Schütze a77a4edb75 Merge pull request #3220 from normanjaeckel/CleanUp
Removed unused lines.
2017-04-27 15:33:42 +02:00
Emanuel Schütze 0cc4b0c578 Updated German translations. 2017-04-27 15:26:35 +02:00
Norman Jäckel 4bdb06bd9b Fixed error for internal function get_model_from_collection_string. 2017-04-27 15:16:07 +02:00
Norman Jäckel 9781c0b73b Removed unused lines. 2017-04-27 15:09:42 +02:00
Emanuel Schütze 941ac8809e Merge pull request #3208 from tsiegleauq/logos-in-pdf
add logos in PDF
2017-04-27 15:08:36 +02:00
Emanuel Schütze 9387f83f8a Merge pull request #3212 from normanjaeckel/Notify
Added notify system.
2017-04-27 15:07:15 +02:00
Emanuel Schütze 11aacc71b6 Merge pull request #3216 from ostcar/early_websocket_open
Open websocket connections immediately
2017-04-27 13:13:00 +02:00
FinnStutzenstein 349505ac3d Added a warning, if another user edits the same motion. 2017-04-27 13:09:24 +02:00
Emanuel Schütze 7c8bc935f8 Show pdf footer logo. Fixed layout. 2017-04-27 12:58:11 +02:00
FinnStutzenstein fb45d30a34 Changed PDF documentProvider to accept images and some cleanup. 2017-04-27 12:58:11 +02:00
Sean Engelhardt 2b94dc5942 Added configurable header and footer logos for PDF. 2017-04-27 12:58:11 +02:00
Oskar Hahn 74c1cc63dc Open websocket connections immediately
Also made a performance boost to get_model_from_collection_string()
2017-04-27 12:54:16 +02:00
Emanuel Schütze 06adfa0301 Merge pull request #3190 from normanjaeckel/PersonalNote
Added personal notes for motions
2017-04-27 09:32:54 +02:00
Norman Jäckel bd68997a5d Added notify system. 2017-04-27 09:30:02 +02:00
FinnStutzenstein 96899f63cc Personal note (client side) 2017-04-27 09:10:46 +02:00
Norman Jäckel 6aee27e49f Added personal notes for motions (server side part). 2017-04-27 09:10:46 +02:00
Emanuel Schütze e1a95588e7 Merge pull request #3215 from emanuelschuetze/motionCatalog
Improved motion catalog pdf for one/mutliple motions.
2017-04-24 15:05:37 +02:00
Emanuel Schütze 4cd9d20435 Improved motion catalog pdf for one/mutliple motions. 2017-04-24 14:53:42 +02:00
Emanuel Schütze 459356bf12 Merge pull request #3214 from emanuelschuetze/translations
Updated translation files and German translation.
2017-04-24 10:59:21 +02:00
Emanuel Schütze 9ebf3509c0 Updated translation files and German translation. 2017-04-24 10:44:32 +02:00
Emanuel Schütze b06f10dea8 Merge pull request #3210 from FinnStutzenstein/SpeakerSort
Fixing issue when sorting a new inserted speaker
2017-04-24 09:54:51 +02:00
Emanuel Schütze 31c6b239c1 Merge pull request #3211 from tsiegleauq/issue3205-pdf-align-del
add more distance in PDF for DEL-tags in new lines (fixes #3205)
2017-04-24 09:54:41 +02:00
FinnStutzenstein 7d1b65429e Fixing issue when sorting a new inserted speaker. 2017-04-24 09:45:53 +02:00
Sean Engelhardt 3cb07c97dc Added more distance in motion PDF for DEL-tags in new lines (fixes #3205). 2017-04-24 09:43:18 +02:00
Emanuel Schütze 09840edc0c Merge pull request #3213 from normanjaeckel/Requirements
Updated requirements (channels and asgi-redis).
2017-04-24 09:38:06 +02:00
Norman Jäckel 24e7d42f6f Merge pull request #3207 from FinnStutzenstein/LogoHeader
Configurable projector header
2017-04-21 22:09:18 +02:00
Norman Jäckel 5b5cee0a24 Updated requirements (channels and asgi-redis). 2017-04-20 14:39:20 +02:00
Emanuel Schütze 8c4ec1c218 Merge pull request #3202 from CatoTH/Issue3107-BugfixLineLengthCaching
Bugfix: changing line length did not invalidate cache
2017-04-19 15:03:48 +02:00
FinnStutzenstein 61058fac49 Configurable projector header image 2017-04-19 14:54:31 +02:00
Tobias Hößl 9d2edc23e4 Bugfix: changing line length did not invalidate cache 2017-04-19 14:49:43 +02:00
Norman Jäckel 8380e97f93 Merge pull request #3198 from CatoTH/Issue3183-getTextNoLineBreaks
Add a parameter 'lineBreaks' to getTextByMode
2017-04-19 14:45:24 +02:00
Emanuel Schütze f2e287e4a3 Merge pull request #3201 from emanuelschuetze/fixCSVUserImport
Fixed compare of duplicated users while csv user import.
2017-04-19 13:50:28 +02:00
Emanuel Schütze 3614ba9451 Fixed compare of duplicated users while csv user import. 2017-04-19 13:38:06 +02:00
Emanuel Schütze 146b49c4aa Merge pull request #3199 from FinnStutzenstein/Issue3192
Fix clearing empty chat messages (fixes #3192)
2017-04-19 08:52:26 +02:00
FinnStutzenstein d78a7f91bc Fix clearing empty chat messages (fixes #3192) 2017-04-19 08:00:18 +02:00
Tobias Hößl a558e190ea Add a parameter 'lineBreaks' to getTextByMode 2017-04-18 14:52:15 +02:00
Emanuel Schütze b7fdbc88d6 Merge pull request #3200 from normanjaeckel/PasswordValidator
Added support for password validation using Django or custom validato…
2017-04-18 10:14:43 +02:00
Norman Jäckel 21418f632f Added support for password validation using Django or custom validators e. g. for minimum password length. 2017-04-13 16:20:38 +02:00
Emanuel Schütze 7d2785b9ec Merge pull request #3189 from FinnStutzenstein/pdf-zip
Pdf zip
2017-04-13 11:54:19 +02:00
Emanuel Schütze 768cc5f711 Merge pull request #3196 from emanuelschuetze/motionCommentRegression
Fixed regression that opening of motion create form failed.
2017-04-12 20:12:57 +02:00
Emanuel Schütze d9e81a165d Merge pull request #3197 from emanuelschuetze/translations
Fixed translation strings and updated German translations.
2017-04-12 20:11:22 +02:00
Emanuel Schütze cbccd17752 Fixed translation strings and updated German translations. 2017-04-12 20:03:07 +02:00
FinnStutzenstein 845a1683bb Download multiple pdfs in a zip archive. 2017-04-12 16:01:00 +02:00
Emanuel Schütze d1ff1e540f Fixed regression that opening of motion create form failed.
Introduced with commit 3de4a2af1c.
2017-04-12 15:17:47 +02:00
Emanuel Schütze 6899d93cbf Merge pull request #3181 from tsiegleauq/base64convert
Add local convert to Base64 (Fixes #2705)
2017-04-12 15:09:43 +02:00
Sean Engelhardt 65b51f8975 Add local convert to Base64 (Fixes #2705) 2017-04-12 14:57:40 +02:00
Emanuel Schütze 2be9d45884 Merge pull request #3184 from FinnStutzenstein/Logo
Support logos
2017-04-12 14:49:59 +02:00
FinnStutzenstein 6c932aa77a Support logos 2017-04-12 14:28:46 +02:00
Emanuel Schütze b9bab6fc17 Merge pull request #3191 from normanjaeckel/FreeUser
User without permission to see users can now see some of them.
2017-04-12 10:20:48 +02:00
Emanuel Schütze 34c7b51159 Merge pull request #3194 from emanuelschuetze/motionCommentFix
Fixed empty motion comment field in motion update form.
2017-04-11 17:19:14 +02:00
Norman Jäckel c4ec26c4c0 User without permission to see users can now see some required users.
These are
- agenda item speakers,
- motion submitters and supporters,
- assignment candidates,
- mediafile uploader and
- chat message users
but only if the user has respective permissions. Fixed #3002.
2017-04-11 17:10:49 +02:00
Emanuel Schütze 3de4a2af1c Fixed empty motion comment field in motion update form.
Motion comment values were not extracted. Concerns edit button in
motion list view only.
2017-04-11 17:08:19 +02:00
Emanuel Schütze 152585a73f Merge pull request #3193 from emanuelschuetze/sortLastSpeakers
Fixed sorting of last speakers.
2017-04-11 17:06:25 +02:00
Emanuel Schütze 23fec417f8 Fixed sorting of last speakers. 2017-04-11 15:55:45 +02:00
Norman Jäckel cf9d204e18 Merge pull request #3187 from FinnStutzenstein/Issue3186
Fixes #3060, fixes #3186.
2017-04-07 16:47:42 +02:00
Norman Jäckel 66ad801bad Merge pull request #3172 from FinnStutzenstein/logout
Do not reload on logout (fixes #2868).
2017-04-07 16:32:41 +02:00
FinnStutzenstein c86f6d3684 Do not reload on logout (fixes #2868) 2017-04-07 16:22:32 +02:00
FinnStutzenstein cefdabc3d7 fixes #3060, fixes #3186 2017-04-07 15:16:09 +02:00
Emanuel Schütze 598dc30486 Merge pull request #3185 from FinnStutzenstein/export-dialog
Export dialog for motions
2017-04-07 15:09:15 +02:00
FinnStutzenstein c68d3f0e4a Export dialog for motions 2017-04-07 15:00:21 +02:00
Emanuel Schütze 4ffbe77814 Merge pull request #3182 from emanuelschuetze/Release-2.1.1
Release 2.1.1
2017-04-05 21:48:20 +02:00
Emanuel Schütze 1d1bf7366f Update version to 2.1.2-dev 2017-04-05 20:31:42 +02:00
Emanuel Schütze bbbad71e2d Release 2.1.1 2017-04-05 20:30:07 +02:00
Emanuel Schütze db817fc1b2 Merge pull request #3177 from normanjaeckel/GeissRelease
Added version to getgeiss command.
2017-04-05 17:34:46 +02:00
Emanuel Schütze a45807eddd Merge pull request #3176 from normanjaeckel/TopicTest
Added some tests for topics. See #3175.
2017-04-05 17:31:57 +02:00
Norman Jäckel 757bbc62e5 Added version to getgeiss command. 2017-04-03 13:41:48 +02:00
Norman Jäckel eea623befa Added some tests for topics. See #3175. 2017-04-03 13:17:10 +02:00
Norman Jäckel a350d15bd0 Merge pull request #3174 from FinnStutzenstein/Issue3173
fixes #3173
2017-04-03 09:53:09 +02:00
FinnStutzenstein 44ed866210 fixes #3173 2017-03-31 12:28:13 +02:00
Emanuel Schütze d758159bff Merge pull request #3168 from normanjaeckel/Release-2.1
Release 2.1
2017-03-29 17:29:21 +02:00
Norman Jäckel 7f55bc9377 Update version to 2.1.1-dev 2017-03-29 14:34:17 +02:00
Norman Jäckel 0086b513d0 Release 2.1 2017-03-29 14:33:00 +02:00
Emanuel Schütze 6d7f121a7f Merge pull request #3167 from emanuelschuetze/translations
Updated final 2.1 translations for CS, ES, FR, PT, RU
2017-03-29 14:30:02 +02:00
Emanuel Schütze 861e9674b8 Updated final 2.1 translations for CS, ES, FR, PT, RU 2017-03-29 14:25:02 +02:00
Emanuel Schütze aceee09770 Merge pull request #3166 from normanjaeckel/CHANGELOG
Rework on CHANGELOG.
2017-03-29 13:56:36 +02:00
Norman Jäckel aa718c9113 Rework on CHANGELOG. 2017-03-28 21:28:12 +02:00
Emanuel Schütze bb74e7eaa9 Merge pull request #3165 from normanjaeckel/MotionCreateFix
Fixed creating motion for users with comments permissions.
2017-03-28 21:13:39 +02:00
Norman Jäckel 4cad6943f6 Fixed creating motion for users with comments permissions. 2017-03-28 20:42:13 +02:00
Emanuel Schütze 9e96db894c Merge pull request #3159 from FinnStutzenstein/Issue3140
fixing validate_html and motion saving (fixes #3140)
2017-03-28 19:44:52 +02:00
Emanuel Schütze b162a1d43e Merge pull request #3164 from normanjaeckel/README
Updated README.
2017-03-28 19:43:20 +02:00
FinnStutzenstein d9e3da87f5 fixing validate_html and motion saving (fixes #3140)
using PATCH
2017-03-28 19:39:06 +02:00
Norman Jäckel 2a72b52f8a Updated README. 2017-03-28 18:11:28 +02:00
Emanuel Schütze ba4a408f5e Merge pull request #3156 from emanuelschuetze/issue-3099
Disable edit button and hide remove button if election is finished.
2017-03-28 14:47:09 +02:00
Emanuel Schütze 7ab95773eb Disable edit button and hide remove button if election is finished. (Fixed #3099) 2017-03-28 14:29:32 +02:00
Norman Jäckel 60b80f457c Merge pull request #3163 from emanuelschuetze/pdfmake-update
Updated pdfmake to 0.1.27.
2017-03-28 13:39:36 +02:00
Norman Jäckel 0ab2503fdc Merge pull request #3162 from FinnStutzenstein/assignmentOrder
Fixing order for assignment poll form and translation for slide (fixe…
2017-03-28 13:39:09 +02:00
Emanuel Schütze b30e8c9641 Updated pdfmake to 0.1.27. 2017-03-28 10:50:29 +02:00
Emanuel Schütze c4a4773074 Merge pull request #3157 from normanjaeckel/FixDeletedReferenceProjector
Fixed bug when reference projector for list of speakers slide is dele…
2017-03-28 10:06:12 +02:00
Emanuel Schütze 5bf7caa8f4 Merge pull request #3158 from normanjaeckel/DeleteFile
Delete a file from filesystem when mediafile is deleted/destroied via…
2017-03-28 09:59:21 +02:00
FinnStutzenstein 72ceac3510 Fixing order for assignment poll form and translation for slide (fixes #3160, fixes #3161) 2017-03-28 09:58:02 +02:00
Norman Jäckel 619fc29cd4 Delete a file from filesystem when mediafile is deleted/destroied via REST api. Fixed #3146. 2017-03-28 00:17:55 +02:00
Norman Jäckel 40c6957b21 Merge pull request #3122 from normanjaeckel/ExampleData
Example data
2017-03-27 23:54:51 +02:00
Norman Jäckel d6af67d1df Fixed bug when reference projector for list of speakers slide is deleted. Fixed #3076. 2017-03-27 23:53:35 +02:00
Norman Jäckel bdd5d0666f Added command to create example data. 2017-03-27 23:30:43 +02:00
Norman Jäckel 9ffb008eb0 Merge pull request #3154 from emanuelschuetze/issue-3151
Disabled CKEditor's contextmenu to use browser spellcheck (Fixed #3151).
2017-03-27 12:31:52 +02:00
Norman Jäckel c741ddb909 Merge pull request #3155 from emanuelschuetze/issue3144
Fixed wrong cancel function in mediafile form. (Fixed #3144)
2017-03-27 12:25:24 +02:00
Norman Jäckel 473e48a9e5 Merge pull request #3149 from CatoTH/line-breaks-in-inline-diffs
Line breaks in inline diffs
2017-03-27 12:25:08 +02:00
Emanuel Schütze f971696130 Fixed wrong cancel function in mediafile form. (Fixed #3144) 2017-03-27 11:19:06 +02:00
Emanuel Schütze fa76cb2866 Fixed linebreaks in pdf. 2017-03-27 11:17:04 +02:00
Emanuel Schütze 461be41a64 Disabled CKEditor's contextmenu to use browser spellcheck (Fixed #3151).
To remove the 'contextmenu' plugin also the 'liststyle' and 'tabletools' plugins
have to removed.
2017-03-27 10:09:27 +02:00
Tobias Hößl 0d98fa3a88 Line breaks in inline diffs 2017-03-26 17:55:28 +02:00
Norman Jäckel c8f64783bc Merge pull request #3063 from FinnStutzenstein/dev-guide
Updateing the instructions for big mode
2017-03-25 21:53:48 +01:00
FinnStutzenstein 100db66b8f Updated instructions
Updated big mode and split up requiements_production

Some changes are made by normanjaeckel.
2017-03-25 21:31:30 +01:00
Emanuel Schütze e90266091f Merge pull request #3142 from CatoTH/bugfix-diff-regression
Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe51…
2017-03-25 12:26:21 +01:00
Tobias Hößl d4a72f4b37 Bugfix for regression introduced by #c912811bd37b70b897cdb0fdc50cbe516e853cc0 2017-03-24 21:07:51 +01:00
Norman Jäckel 33a61cb340 Merge pull request #3139 from emanuelschuetze/diff-mode-pdf
Cleanup pdf parsing code for indentation fix in diff mode.
2017-03-24 14:50:46 +01:00
Norman Jäckel 4964c2e84e Merge pull request #3138 from FinnStutzenstein/CountdownBug
Fixing countdown default time
2017-03-24 14:50:35 +01:00
Norman Jäckel 359ad0f60c Merge pull request #3137 from FinnStutzenstein/Issue3053
watch for projector resolution change (fixes #3053)
2017-03-24 14:47:09 +01:00
Norman Jäckel 85d13179da Merge pull request #3111 from FinnStutzenstein/Issue3103
Improving creation of ballots (fixes #3103)
2017-03-24 14:46:25 +01:00
Emanuel Schütze 9472eec69b Cleanup pdf parsing code for indentation fix in diff mode. 2017-03-24 09:35:13 +01:00
FinnStutzenstein 7eef45cd51 Fixing countdown default time 2017-03-24 09:23:28 +01:00
FinnStutzenstein ab245b86a8 watch for projector resolution change (fixes #3053) 2017-03-24 08:46:18 +01:00
FinnStutzenstein 0220a03350 fixing test and inform_changed_data call 2017-03-24 08:14:08 +01:00
Norman Jäckel 5cd3b73725 Merge pull request #3135 from emanuelschuetze/projector-scroll-direction
Switch projector scroll direction
2017-03-23 23:24:02 +01:00
Norman Jäckel e93a2f9f8e Merge pull request #3134 from normanjaeckel/IdentifierWahnsinn
Fixed bug when creating multiple motions at once (problem with unique…
2017-03-23 23:23:40 +01:00
Emanuel Schütze 57025b9792 Switch projector scroll direction
- button 'arrow down': moves the visible part of the projector down
  (forward = text scrolls from bottom to top)
- button 'arrow up': moves the visible part of the projector up
  (backward = text scrolls from top to bottom)

Reverts change from #3094.
2017-03-23 10:51:40 +01:00
Norman Jäckel ced3f6d697 Fixed bug when creating multiple motions at once (problem with unique motion identifier). Fixed #3062. 2017-03-23 00:47:41 +01:00
Norman Jäckel f34c24947a Merge pull request #3133 from emanuelschuetze/order-summary
Fixed wrong order of change recommendations in summary box in PDF.
2017-03-23 00:27:47 +01:00
Norman Jäckel cd105f2271 Merge pull request #3132 from CatoTH/pdf-inline-diff-remove-extra-spaces
Remove erroneous margin around inline diff paragraphs in PDF
2017-03-23 00:27:27 +01:00
Norman Jäckel 5d074136be Merge pull request #3131 from tsiegleauq/change-reco-pdf-paragraphs
adjust indentation for new insertions in PDF
2017-03-23 00:26:25 +01:00
Emanuel Schütze bd5ccb62ba Fixed wrong order of change recommendations in summary box in PDF. 2017-03-22 22:14:07 +01:00
sean 8324dbba16 adjust indentation for new insertions in PDF 2017-03-22 21:57:56 +01:00
Tobias Hößl 45cac43193 Remove erroneous margin around inline diff paragraphs in PDF 2017-03-22 20:54:56 +01:00
Emanuel Schütze e5028f7ef2 Merge pull request #3127 from emanuelschuetze/issue3112
Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, #3038)
2017-03-22 15:54:38 +01:00
Emanuel Schütze 2571d83195 Use a whitelist for getFormOrStateForCurrentSlide (fixes #3112, fixed #3038).
- Provided csv header fields as meta data while csv import (#3038).
- Consolidate (already translated) strings for motion poll.
- Fixed typos for MotionPoll model.
2017-03-22 15:37:08 +01:00
Emanuel Schütze 0c3ecb0acb Merge pull request #3129 from tsiegleauq/issue2811-more-parsing-issues
fix pdf style parsing issue (fixes #2811)
2017-03-22 15:28:05 +01:00
sean bb5394eb36 fix pdf style parsing issue (fixes #2811) 2017-03-22 14:57:08 +01:00
Norman Jäckel 4f3fdf1699 Merge pull request #3125 from CatoTH/pass-line-numbers-through-diff
Beginning: passing line numbers through the diff
2017-03-22 14:24:23 +01:00
Emanuel Schütze 4dfc337626 Merge pull request #3126 from emanuelschuetze/update-translations-2
Updated translations (Fixed #2955)
2017-03-22 12:58:05 +01:00
Emanuel Schütze b6e1b3fc67 Updated translations (Fixed #2955) 2017-03-22 12:52:11 +01:00
Tobias Hößl c912811bd3 Beginning: passing line numbers through the diff 2017-03-22 12:21:45 +01:00
Norman Jäckel 6b253ef4b7 Merge pull request #3124 from emanuelschuetze/tooltip
Fixed hidden tooltip content in motion toolbar.
2017-03-22 10:57:51 +01:00
Norman Jäckel 9ced504908 Merge pull request #3123 from emanuelschuetze/issue3121
Show username if first and last name is empty (Fixed #3121)
2017-03-22 10:57:30 +01:00
Emanuel Schütze af9559d036 Fixed hidden tooltip content in motion toolbar. 2017-03-22 10:38:22 +01:00
Emanuel Schütze 19d16a1ea7 Show username if first and last name is empty (Fixed #3121) 2017-03-22 09:13:33 +01:00
Emanuel Schütze ae098b1439 Merge pull request #3119 from emanuelschuetze/minorFixes
Minor fixes
2017-03-22 08:55:14 +01:00
Emanuel Schütze 869105dc40 Minor fixes
- Added motion change recommendations to full text search.
- Show csv/docx export entries in list views for manager only.
2017-03-22 08:47:32 +01:00
Norman Jäckel 861df5f5c1 Merge pull request #3120 from emanuelschuetze/diff-box
Hide change recommendation diff-box in diff version for normal users.
2017-03-21 23:05:02 +01:00
Norman Jäckel e57afb9ab4 Merge pull request #3118 from emanuelschuetze/issue3081
Allow style attributes for about field in user detail template (Fixed #3081)
2017-03-21 23:03:27 +01:00
Emanuel Schütze 70de0a6e4b Hide change recommendation diff-box in diff version for normal users. 2017-03-21 20:47:58 +01:00
Norman Jäckel b7d3acc94b Merge pull request #3114 from emanuelschuetze/assignment-fixes
Fixed assignment JS bugs (Fixed #3099)
2017-03-21 17:28:03 +01:00
Norman Jäckel c39d003f01 Merge pull request #3113 from FinnStutzenstein/assignment-tabs
Fixes Ballot tabs on create/delete (fixes #3058)
2017-03-21 17:22:15 +01:00
Norman Jäckel a412ff9eb3 Merge pull request #3094 from FinnStutzenstein/Issue3092
Fixes #3092, fixes #2453 and fixed motion projection bug
2017-03-21 17:20:49 +01:00
Norman Jäckel bd8c7f61a0 Merge pull request #3085 from tsiegleauq/issue3025-duplicated-header
fix double PDF Head in Motions (fixes #3025)
2017-03-21 17:19:36 +01:00
Emanuel Schütze 0036029709 Fixed double paragraphs in motion pdf which contains links (Fixed #3095). 2017-03-21 16:08:39 +01:00
Emanuel Schütze 74811a4529 Allow style attributes for about field in user detail template (Fixed #3081) 2017-03-21 15:19:22 +01:00
Emanuel Schütze a4719e68d9 Merge pull request #3117 from emanuelschuetze/fix3079
Updated German translations (Fixed #3079)
2017-03-21 15:09:06 +01:00
Emanuel Schütze bfa8076862 Updated German translations (Fixed #3079) 2017-03-21 14:55:14 +01:00
FinnStutzenstein a0531a3268 Fixes Ballot tabs on create/delete (fixes #3058) 2017-03-21 14:37:10 +01:00
FinnStutzenstein 4f84a9f752 Fixes #3092, fixes #2453 and fixed motion projection bug 2017-03-21 14:29:06 +01:00
Emanuel Schütze 9720de42a1 Merge pull request #3115 from emanuelschuetze/translation-updates
Updated translations (EN+DE).
2017-03-21 14:18:50 +01:00
Emanuel Schütze 0852c14524 Updated translations (EN+DE). 2017-03-21 14:09:20 +01:00
Emanuel Schütze 0082410cc8 Fixed assignment JS bugs (Fixed #3099) 2017-03-21 13:57:48 +01:00
FinnStutzenstein 08bd1251a7 More speed improvements 2017-03-21 11:08:52 +01:00
Emanuel Schütze b8742bcb8f Merge pull request #3061 from FinnStutzenstein/Issue3036
Let users with comments management perms edit them (fixes #3036)
2017-03-21 10:49:13 +01:00
FinnStutzenstein 238b4b7f0a Improving creation of ballots (fixes #3103) 2017-03-21 10:33:36 +01:00
FinnStutzenstein a638b05538 Let users with comments management perms edit them (fixes #3036), fixes #3090 2017-03-21 09:59:49 +01:00
Norman Jäckel 42cf987aed Merge pull request #3096 from CatoTH/Issue3077-highlight-inline-diff
Add an explicit line highlighting function for the diff
2017-03-20 22:09:18 +01:00
Norman Jäckel b6e978f96a Merge pull request #3093 from FinnStutzenstein/ProjectorSidebar
Fixing the sidebar
2017-03-20 22:07:14 +01:00
Tobias Hößl a3c7eeb091 Add an explicit line highlighting function for the diff 2017-03-18 15:24:19 +01:00
FinnStutzenstein 542cb67d59 Fixing the sidebar, fixes #3068 2017-03-17 12:24:40 +01:00
Sean Engelhardt 259e338b17 fix double PDF Head in Motions (fixes #3025) 2017-03-16 23:17:25 +01:00
Norman Jäckel a33f0dd668 Merge pull request #3078 from emanuelschuetze/template-fixes
Several template fixes
2017-03-16 14:14:01 +01:00
Emanuel Schütze b53843c17e Several template fixes
- Motions catalog pdf: Show categories of filtered motions only.
- Fixed permission for "reject all change recommendations" button
- Use color for yes/no/abstain for progress bars in assignment detail.
2017-03-10 22:46:01 +01:00
Emanuel Schütze 26c9937220 Merge pull request #3075 from emanuelschuetze/issue3066
Fixed autoupdate error after deleting a slide (Fixed #3066).
2017-03-09 08:58:24 +01:00
Emanuel Schütze 1be2cbb8dc Fixed autoupdate error after deleting a slide (Fixed #3066). 2017-03-09 08:51:57 +01:00
Norman Jäckel 07faf1078b Merge pull request #3074 from emanuelschuetze/fixes2
Hide empty placeholder of ui-tree in sort templates.
2017-03-09 00:05:28 +01:00
Norman Jäckel 365a65ef7c Merge pull request #3071 from emanuelschuetze/travis
Added karma tests for angular.js to travis.
2017-03-09 00:05:06 +01:00
Emanuel Schütze e611b46784 Added karma tests for angular.js to travis.
Installed required dependencies to run karma test in phantomjs which
is a supported browser by travis.
2017-03-08 23:46:04 +01:00
Emanuel Schütze 780b9e2e9a Hide empty placeholder of ui-tree in sort templates. 2017-03-08 23:07:22 +01:00
Norman Jäckel 82e20ee5a7 Merge pull request #3073 from emanuelschuetze/fixes
Minor template fixes
2017-03-08 23:00:26 +01:00
Norman Jäckel 27bc6a7df4 Merge pull request #3072 from CatoTH/fix-diff-test-cases
Fixes broken diff test cases
2017-03-08 22:51:37 +01:00
Emanuel Schütze 3717f63d12 Minor template fixes
- More column width in all-motions pdf.
  Order categories by prefix.
- Fixed using translations in error messages.
  Removed unused pdf-status template.
2017-03-08 22:46:45 +01:00
Norman Jäckel 4fd70f7eff Merge pull request #3070 from tsiegleauq/issue3069-stroke-out-text
Add strike command to HTML PDF parser (Fixes #3069)
2017-03-08 22:44:00 +01:00
Tobias Hößl c3bd85e5ee Diff-Bugfix: don't repeat unchanged words 2017-03-08 21:29:34 +01:00
Tobias Hößl a6de228f56 Prevent broken HTML like <ins>Test</p></ins> 2017-03-08 20:38:02 +01:00
Tobias Hößl 9f71afa602 Fixes broken diff test cases + Bugfix for: TypeError: Failed to execute 'insertBefore' on 'Node' 2017-03-08 20:10:32 +01:00
Sean Engelhardt 6dc52c6fe2 Add strike command to HTML PDF parser (Fixes #3069) 2017-03-08 15:47:40 +01:00
Emanuel Schütze 48f7c258df Merge pull request #3065 from emanuelschuetze/2.1b4
2.1b4 Release
2017-03-07 22:07:57 +01:00
Emanuel Schütze f457720d29 Update version to 2.1b5-dev 2017-03-07 21:22:53 +01:00
Emanuel Schütze c788e3bfab Release 2.1b4 2017-03-07 21:19:31 +01:00
Norman Jäckel f105ecd68c Merge pull request #2995 from FinnStutzenstein/Issue2957
Autoupdate on permission change
2017-03-07 15:32:56 +01:00
FinnStutzenstein cc0049b55b Adding agenda/topics app, fixes user app 2017-03-07 15:02:39 +01:00
Norman Jäckel 14ec6c0f44 Improved autoupdate on permission change. 2017-03-06 17:42:27 +01:00
FinnStutzenstein bcc85f9cad Autoupdate on user permission change. 2017-03-06 15:08:23 +01:00
Norman Jäckel f1c0821dd0 Merge pull request #2948 from ostcar/getgeiss
Added the command getgeiss
2017-03-06 15:05:26 +01:00
Norman Jäckel 688b247bcc Added flag to use Geiss. Small changes for the new getgeiss command. Changed path of collected statics. 2017-03-06 14:39:55 +01:00
Oskar Hahn e3cc592f70 Added the command getgeiss. Work on start script to use Geiss. 2017-03-06 14:39:26 +01:00
Norman Jäckel 8b710b0b13 Merge pull request #3056 from emanuelschuetze/cleanup
Removed unused ubuntu fonts (from old pdf generation).
2017-03-05 23:54:09 +01:00
Norman Jäckel 0c5746b349 Merge pull request #3055 from emanuelschuetze/fix
Fixed iframeoverlay and missing ErrorMessage.
2017-03-05 22:43:10 +01:00
Emanuel Schütze 1d6326fb1b Removed unused ubuntu fonts (from old pdf generation). 2017-03-05 22:40:38 +01:00
Emanuel Schütze 95c6ed4e76 Merge pull request #3054 from emanuelschuetze/update-translations
Updated all translations.
2017-03-05 22:37:23 +01:00
Emanuel Schütze d92328674a Fixed iframeoverlay and missing ErrorMessage. 2017-03-05 22:27:14 +01:00
Emanuel Schütze 2d65ecbc3a Updated all translations.
Added Russia as new language.
2017-03-05 22:25:48 +01:00
Emanuel Schütze c6ced4e4a0 Merge pull request #3051 from emanuelschuetze/issues-2142
Excluded already elected persons for new ballot (Fixed #2142)
2017-03-05 21:30:35 +01:00
Emanuel Schütze ff840ab3c6 Excluded already elected persons for new ballot (Fixed #2142)
- Reorder assignment ballot tabs in detail template.
- Removed logic to set phase automatically to 'finished' if
  elected candidates reached, because autoupdate makes it unreliable.
2017-03-05 21:25:22 +01:00
Norman Jäckel 4c2b13a142 Merge pull request #3052 from emanuelschuetze/mobile-theme
Responsive design improvements
2017-03-05 20:34:50 +01:00
Norman Jäckel 32aaa28637 Merge pull request #3050 from CatoTH/bugfix-inline-diff-when-replacing-paragraphs
Improve the diff when a paragraph is replaced by another one
2017-03-05 20:25:43 +01:00
Norman Jäckel 6525b79774 Merge pull request #3047 from emanuelschuetze/projector-control
Inscreased projector scroll distance.
2017-03-05 20:23:56 +01:00
Norman Jäckel 0ca8fa57ed Merge pull request #3046 from CatoTH/Projector-Diff-View-Line-Numbers
Bugfix for missing line numbers in diff view in the projector
2017-03-05 20:23:35 +01:00
Norman Jäckel 16743cd9b8 Merge pull request #3044 from CatoTH/Issue3027-LineNumberingBugfix
Handle STRIKE-tags correctly in line numbering - fixes #3027
2017-03-05 20:22:59 +01:00
Norman Jäckel 659c7858eb Merge pull request #3043 from emanuelschuetze/category-sort-template
Added motion detail links to category sort view.
2017-03-05 20:22:40 +01:00
Norman Jäckel 1fdb3a4f2a Merge pull request #3042 from emanuelschuetze/3028
Improved go to line number tooltip/popup. (#3028)
2017-03-05 20:20:25 +01:00
Norman Jäckel a4a7fd255b Merge pull request #3041 from CatoTH/remove-pdf-test-cases
Remove PDF unit tests
2017-03-05 20:19:52 +01:00
Norman Jäckel a33d504c6b Merge pull request #3040 from CatoTH/Issue3024-Escaping-of-HTML-elements
Bugfix for #3024 - escaping HTML tags
2017-03-05 20:19:24 +01:00
Norman Jäckel 26e9265634 Merge pull request #3037 from emanuelschuetze/issue2363
Fixed switching between motion versions (Fixed #2363)
2017-03-05 20:18:53 +01:00
Emanuel Schütze f67afd1823 Responsive design improvements
- Reduce search bar on small devices.
- Use separate projector sidebar for small devices.
- motion detail toolbar: show line number mode and change recommendation
  controls as dropdown (for small/extra small devices) or as
  button group (for medium/large devices).
2017-03-05 00:30:00 +01:00
Tobias Hößl 6577287e26 Improve the diff when a paragraph is replaced by another one 2017-03-04 20:48:18 +01:00
Emanuel Schütze 65d93d1b66 Inscreased projector scroll distance.
Allows faster scrolling for long slides.
2017-03-04 16:52:27 +01:00
Tobias Hößl 0022df2aff Bugfix for missing line numbers in diff view in the projector 2017-03-04 16:42:02 +01:00
Tobias Hößl c8006588c5 Handle STRIKE-tags correctly in line numbering 2017-03-04 16:17:48 +01:00
Emanuel Schütze fa395d6cc2 Added motion detail links to category sort view. 2017-03-04 16:07:05 +01:00
Emanuel Schütze a9144b6d5b Improved go to line number tooltip/popup. (#3028) 2017-03-04 16:00:54 +01:00
Tobias Hößl 3ca45f24c9 Remove PDF unit tests 2017-03-04 15:54:23 +01:00
Tobias Hößl e698d81f9f Bugfix for #3024 - escaping HTML tags 2017-03-04 15:51:33 +01:00
Emanuel Schütze 3903be5d6b Fixed switching between motion versions (Fixed #2363)
- Show correct text and reason for selected version.
- Disable inline editing after save (otherwise inline mode is still
  active when user change version)
2017-03-03 17:03:32 +01:00
Emanuel Schütze 95c19159f8 Merge pull request #3026 from CatoTH/bugfix-line-numbering-diff
Several bug fixes in the diff
2017-03-03 15:26:44 +01:00
Tobias Hößl 74f40395d9 Several bug fixes in the diff 2017-03-03 15:16:51 +01:00
Norman Jäckel cc6d2a6ca9 Merge pull request #3035 from FinnStutzenstein/Issue3003
Always provide the list of speakers (closes #3003)
2017-03-03 14:53:55 +01:00
Emanuel Schütze 91cb124918 Merge pull request #3018 from FinnStutzenstein/ErrorMessages
Error messages and global messaging service (closes #2949)
2017-03-03 14:52:00 +01:00
FinnStutzenstein 9c89f4d59c Error messages and global messaging service (fixes #2949, fixes #1774) 2017-03-03 14:36:31 +01:00
FinnStutzenstein 9fbbfe0f50 Always provide the list of speakers (closes #3003) 2017-03-03 14:35:55 +01:00
Norman Jäckel 4744e1ca99 Merge pull request #3034 from FinnStutzenstein/TemplateFixes
Small template improvements
2017-03-03 14:23:05 +01:00
Emanuel Schütze 283e037cdb Merge pull request #3017 from normanjaeckel/FixViewSets
Fixed use of PATCH and PUT. Fixed #1871.
2017-03-03 13:32:11 +01:00
FinnStutzenstein 606c17ef43 Small template improvements 2017-03-03 11:53:33 +01:00
Norman Jäckel ebf90e4217 Merge pull request #3019 from emanuelschuetze/redis-postgres-support
Added requirements for Redis and PostgreSQL support.
2017-03-01 14:24:45 +01:00
Emanuel Schütze 06a1987734 Added requirements for Redis and PostgreSQL support. 2017-02-28 15:57:05 +01:00
Norman Jäckel 5a821ecf49 Fixed use of PATCH and PUT. Fixed #1871. 2017-02-27 17:20:57 +01:00
Norman Jäckel 96cbf17e72 Merge pull request #3015 from emanuelschuetze/fix-topic-form
Fixed forms (added missing operator).
2017-02-27 15:18:49 +01:00
Norman Jäckel 8860025e59 Merge pull request #3014 from emanuelschuetze/issue-2555
Workaround to prevent screen jumps in assignment detail (Fixed #2555).
2017-02-27 15:18:14 +01:00
Emanuel Schütze 65fcd8e9d6 Fixed forms (added missing operator).
Also:
- Move motion state filter to 2nd filter position (as in detail view).
- Open dropdown filter of state and recommendation on left side.
2017-02-27 10:02:43 +01:00
Emanuel Schütze 7630553303 Workaround to prevent screen jumps in assignment detail (Fixed #2555).
Fixed also unexpected ballot creation while uib-tab updates.
Now button instead of tab is used for creating new ballot.
2017-02-24 22:33:23 +01:00
Emanuel Schütze e0391df94a Merge pull request #3013 from emanuelschuetze/translations
Updated EN and DE translations files.
2017-02-24 16:56:27 +01:00
Emanuel Schütze e063ab8fe8 Updated EN and DE translations files. 2017-02-24 16:20:42 +01:00
Emanuel Schütze 2215d7159a Merge pull request #3001 from emanuelschuetze/user-profile
Reduced user profile form
2017-02-24 16:04:39 +01:00
Emanuel Schütze 04223b0107 Merge pull request #3009 from FinnStutzenstein/ClosManagement
Manageview for Current list of speakers(closes #3007)
2017-02-24 16:03:01 +01:00
FinnStutzenstein c093796a17 Manage view for Current list of speakers (closes #3007) 2017-02-24 15:48:08 +01:00
Emanuel Schütze 6b74bf635d Merge pull request #2993 from emanuelschuetze/motion-poll-log
Added motion log entry for creating polls.
2017-02-24 15:44:53 +01:00
Emanuel Schütze e67d67a07f Merge pull request #3006 from FinnStutzenstein/Issue2894
hide 'show as agenda item' for non authorized users (fixes #2894)
2017-02-24 15:44:25 +01:00
Emanuel Schütze 045c65de49 Merge pull request #3008 from FinnStutzenstein/Issue2636
Remove scrolling to a line on projector (closes #2636)
2017-02-24 15:38:18 +01:00
Emanuel Schütze 5d38ca8c68 Merge pull request #3005 from FinnStutzenstein/Issue3004
Fixing create view for amendments (fixing #3004)
2017-02-24 15:37:46 +01:00
Emanuel Schütze 4ebc238ea2 Added motion log entry for creating polls.
Use timezone support for motion log time.
2017-02-24 15:31:26 +01:00
Norman Jäckel 5b4ca84306 Removed restricted fields from PUT request where a users wants to update himself. Fixed #2986 and #2984. 2017-02-24 15:22:55 +01:00
FinnStutzenstein 8a8755f22d Fixing create view for amendments (fixing #3004) 2017-02-24 15:16:12 +01:00
FinnStutzenstein 803f9dba96 Remove scrolling to a line on projector (closes #2636) 2017-02-24 10:31:48 +01:00
FinnStutzenstein 1c1a2bef09 hide 'show as agenda item' for non authorized users (fixes #2894) 2017-02-24 10:15:28 +01:00
Norman Jäckel bebdcaf6b9 Merge pull request #3000 from emanuelschuetze/reject-change-recommendations
Added 'reject all change recommendations' button.
2017-02-24 09:58:03 +01:00
Emanuel Schütze 7de2f5c79c Reduced user profile form 2017-02-22 23:31:50 +01:00
Emanuel Schütze bf0b5d5062 Added 'reject all change recommendations' button. 2017-02-22 23:08:46 +01:00
Emanuel Schütze f69781b88b Merge pull request #2999 from emanuelschuetze/state-recommendation-name
Added extension for state and recommendation names in dropdown.
2017-02-22 21:52:41 +01:00
Emanuel Schütze 4168153ba3 Added extension for state and recommendation names in dropdown. 2017-02-22 21:31:47 +01:00
Emanuel Schütze 7f08a09497 Merge pull request #2992 from FinnStutzenstein/CleanUp
Collection name to CamelCase (fixes #2983)
2017-02-22 19:44:49 +01:00
FinnStutzenstein 5374b2f398 Collection name to CamelCase (fixes #2983) 2017-02-22 19:12:38 +01:00
Emanuel Schütze 60ebac9f8b Merge pull request #2994 from FinnStutzenstein/Improvements
Usability improvements
2017-02-22 19:03:42 +01:00
FinnStutzenstein da89bf5a83 Usability improvements 2017-02-22 16:58:52 +01:00
Emanuel Schütze 7fb7bff7b1 Merge pull request #2989 from emanuelschuetze/users-csv-import
Allowed to export/import initial user password.
2017-02-22 16:57:43 +01:00
Emanuel Schütze 8ff247b555 Allowed to export/import initial user password. 2017-02-22 08:38:14 +01:00
Norman Jäckel cac15db50a Merge pull request #2996 from emanuelschuetze/fixes
Minor fixes from previous pull request reviews.
2017-02-21 17:52:21 +01:00
Emanuel Schütze e1075eb24d Minor fixes from previous pull request reviews. 2017-02-21 15:56:41 +01:00
Norman Jäckel 4d3a45c8fb Merge pull request #2991 from emanuelschuetze/css-fixes
CSS improvements for projector sidebar on small devices.
2017-02-20 20:39:22 +01:00
Norman Jäckel ebf9278b79 Merge pull request #2990 from emanuelschuetze/fixProjection
Fix motion projection.
2017-02-20 20:38:59 +01:00
Emanuel Schütze acf996a720 CSS improvements for projector sidebar on small devices. 2017-02-20 19:46:44 +01:00
Emanuel Schütze d79cea9a8b Fix motion projection. 2017-02-20 18:44:37 +01:00
Norman Jäckel 1e9c7273ae Merge pull request #2987 from emanuelschuetze/issue2963
Fixed placement of 'back' button in motion block view (Fixed #2963).
2017-02-18 00:06:00 +01:00
Emanuel Schütze 0db900dc9f Merge pull request #2988 from emanuelschuetze/translations
Translations
2017-02-17 23:28:10 +01:00
Emanuel Schütze a06d969dc3 Updated translation resources and German translations. 2017-02-17 23:21:54 +01:00
Emanuel Schütze 58f499283f Fixed translation strings. 2017-02-17 23:21:50 +01:00
Emanuel Schütze e4bd44082d Fixed placement of 'back' button in motion block view (Fixed #2963). 2017-02-17 22:32:17 +01:00
Emanuel Schütze 6bad8e8cc6 Merge pull request #2973 from FinnStutzenstein/Dialogs
Dialogs for some views
2017-02-17 22:20:59 +01:00
Emanuel Schütze d478adaf94 Added CHANGELOG entry. 2017-02-17 22:14:11 +01:00
Norman Jäckel e35e65b7d4 Merge pull request #2985 from normanjaeckel/AgendaSortCheck
Added check for hierarchical loops in agenda sort view. See #2972.
2017-02-17 22:08:23 +01:00
Emanuel Schütze 9ae1d7e59a Show allert in sort template if agenda sort request failed. 2017-02-17 21:59:13 +01:00
Norman Jäckel 582915a019 Merge pull request #2981 from emanuelschuetze/fix-motion-block-projector
Send also motion.state.workflow to motion block slide.
2017-02-17 21:44:56 +01:00
Emanuel Schütze 06e9ffc819 Send also motion.state.workflow to motion block slide.
to show recommendation names in slide template
2017-02-17 21:10:46 +01:00
Norman Jäckel aa14ac99b3 Added check for hierarchical loops in agenda sort view. See #2972. 2017-02-17 17:20:30 +01:00
Norman Jäckel 56420aa0f5 Merge pull request #2982 from emanuelschuetze/recommendation-config
Added new config for default change recommendation view.
2017-02-17 16:33:36 +01:00
Norman Jäckel 935a2a7245 Merge pull request #2980 from emanuelschuetze/pdf-worker-fix
Fixed placeholder replacement in pdf worker.
2017-02-17 16:29:09 +01:00
Norman Jäckel ee66ee3d72 Merge pull request #2979 from FinnStutzenstein/Issue2951
fixing #2951
2017-02-17 16:28:26 +01:00
Norman Jäckel 8adbb1218f Merge pull request #2978 from FinnStutzenstein/MotionBlockAutoupdate
Fixing MotionBlock autoupdate and added projector button (fixes #2958)
2017-02-17 16:27:22 +01:00
Emanuel Schütze 768ee9236a Added new config for default change recommendation view.
Use this default view for motion catalog pdf and motion detail view.
2017-02-17 16:03:00 +01:00
Emanuel Schütze a804362e16 Fixed placeholder replacement in pdf worker.
Make it more dynamic by searching recursively.
2017-02-17 15:11:28 +01:00
FinnStutzenstein 735dbcf109 Better dialog handling. Many fixes. 2017-02-17 14:58:35 +01:00
FinnStutzenstein a5398a491c fixing #2951 2017-02-17 14:54:32 +01:00
Emanuel Schütze 9a1e45682c Merge pull request #2976 from FinnStutzenstein/templateFixes
Update mediafile form
2017-02-17 13:58:49 +01:00
FinnStutzenstein 0e401e7223 Fixing MotionBlock autoupdate and added projector button (fixes #2958) 2017-02-17 13:49:55 +01:00
Emanuel Schütze 0075c23225 Merge pull request #2977 from emanuelschuetze/issue2967
Fixed margin-top of motion change recommendation line tooltip.
2017-02-17 13:21:54 +01:00
Emanuel Schütze 09ae3c3425 Fixed margin-top of motion change recommendation tooltip (Fixed #2967). 2017-02-17 13:17:24 +01:00
Norman Jäckel 28a5c9ecaf Merge pull request #2974 from emanuelschuetze/pdf-layout
Motion PDF improvements
2017-02-17 13:11:15 +01:00
Norman Jäckel 21920fc11d Merge pull request #2975 from emanuelschuetze/fix-2960
Fixed IntegrityError while creating groups with postgres (Fixed #2960).
2017-02-17 13:10:28 +01:00
FinnStutzenstein a765f5cb0e Update mediafile form 2017-02-17 12:43:50 +01:00
Emanuel Schütze 75949cb01c Fixed IntegrityError while creating groups with postgres (Fixed #2960).
Use ng-submit for group form template.
2017-02-17 12:06:07 +01:00
Emanuel Schütze 46f6bbb907 Motion PDF improvements
* Use consistent lineheight (1.25) in PDF (also for lists).
* set default value of motions_line_length config to 90.
* Reduce footer height.
* Use identifier in filename only if available.

Added missing translation string.
2017-02-17 10:48:27 +01:00
Norman Jäckel 0319799aff Merge pull request #2891 from normanjaeckel/CamelCase
Added support for CamelCase to RESTModelMixin. See #2480.
2017-02-16 21:09:13 +01:00
Emanuel Schütze d595e28d09 Merge pull request #2969 from CatoTH/Issue2961-bugfix
Solving two bugs in the diff - for #2961
2017-02-16 14:59:51 +01:00
Norman Jäckel 89192236fc Added support for CamelCase to RESTModelMixin. See #2480. 2017-02-16 13:31:57 +01:00
Emanuel Schütze 0da7765dc0 Merge pull request #2968 from normanjaeckel/StaticDir
Fixed write settings command for Windows portable version. Fixed #2947.
2017-02-15 22:57:05 +01:00
Emanuel Schütze 7a73b30189 More layout fixes for motion diff view slide.
- Fixed wrong text order.
- Improved change summary box.
2017-02-15 22:40:18 +01:00
Tobias Hößl 8029492d91 Bugfix: layout of diff view on the projector 2017-02-15 21:36:30 +01:00
Tobias Hößl afff1f35f8 Solving two bugs in the diff 2017-02-15 20:23:29 +01:00
Emanuel Schütze be342f752f Merge pull request #2966 from emanuelschuetze/issue2956
Send only data to client which user is allowed to see (Fixed #2956).
2017-02-15 20:18:45 +01:00
Emanuel Schütze ae6496852e Merge pull request #2959 from emanuelschuetze/issue2954
Added missing topic text to agenda csv export (Fixed #2954).
2017-02-15 20:18:01 +01:00
Emanuel Schütze b881c071ce Merge pull request #2953 from matakuka/ckeditor
set ckeditor to fixed Version (fixes #2921)
2017-02-15 20:16:49 +01:00
Norman Jäckel 1a53c7c3cc Fixed write settings command for Windows portable version. Fixed #2947. 2017-02-15 17:07:59 +01:00
Emanuel Schütze 3e92799838 Send only data to client which user is allowed to see (Fixed #2956).
Fixed get_restricted_data functions for motion and mediafiles.
2017-02-15 16:51:44 +01:00
Norman Jäckel d3ba49d040 Merge pull request #2964 from tsiegleauq/issue2962-pdf-for-diff
pdf w.o linen numbers and change rec. (fixes #2962)
2017-02-15 16:41:07 +01:00
Emanuel Schütze aa0791fc34 Added missing topic text to agenda csv export (Fixed #2954). 2017-02-15 14:46:25 +01:00
Sean Engelhardt 4eefde839b pdf w.o linen numbers and change rec. (fixes #2962) 2017-02-15 14:23:28 +01:00
Maximilian Krambach c5aedc977a set ckeditor to fixed Version (fixes #2921) 2017-02-13 16:34:34 +01:00
Emanuel Schütze 802e253621 Merge pull request #2950 from ostcar/fix_2835
Let CollectionElement fail early
2017-02-13 13:45:14 +01:00
Oskar Hahn 26b7f2879c Let CollectionElement fail early
Fixes #2835
Fixes #2904
2017-02-12 14:15:58 +01:00
Emanuel Schütze 0a1f4ffc1d Merge pull request #2946 from emanuelschuetze/release-2.1b3
Release 2.1b3
2017-02-10 23:58:55 +01:00
Emanuel Schütze 1c79e2c8ee Update version to 2.1b4-dev 2017-02-10 23:40:18 +01:00
Emanuel Schütze 2aae6d43eb Release 2.1b3 2017-02-10 23:39:52 +01:00
Emanuel Schütze 75fa1fdb7b Merge pull request #2945 from emanuelschuetze/assignment-projector-fix
Fixed outdated assignment phases variable in projetor.js.
2017-02-10 23:36:15 +01:00
Emanuel Schütze 5a5cba1422 Merge pull request #2944 from emanuelschuetze/translations
Updated German translations.
2017-02-10 23:34:37 +01:00
Emanuel Schütze 67b5b4ca32 Updated German translations. 2017-02-10 23:28:38 +01:00
Emanuel Schütze 41b30d70b6 Fixed outdated assignment phases variable in projetor.js.
Removed wrong translation string.
2017-02-10 23:26:38 +01:00
Emanuel Schütze da61aac89a Merge pull request #2943 from emanuelschuetze/issue2865
New full text search on client-side (Fixed #2865).
2017-02-10 23:05:15 +01:00
Emanuel Schütze 1230f4a29a New full text search on client-side (Fixed #2865).
Removed server-side search by whoosh.
2017-02-10 22:52:08 +01:00
Emanuel Schütze 09c152cff8 Merge pull request #2940 from emanuelschuetze/requirements
Updated requirements.
2017-02-10 21:24:00 +01:00
Emanuel Schütze 311b134d81 Merge pull request #2939 from FinnStutzenstein/Encoding
Added UTF-8 byte order mark for csv export
2017-02-10 21:23:09 +01:00
Emanuel Schütze a9af6512b9 Updated requirements.
Channel uses now latest twisted 16.6.0 which requires MS Visual C++
2015 build tools on Windows.
2017-02-10 21:17:56 +01:00
FinnStutzenstein 30a3382bd1 Added UTF-8 byte order mark for csv export and global csv separator config 2017-02-10 20:47:57 +01:00
Norman Jäckel 97de8cf785 Merge pull request #2942 from FinnStutzenstein/Issue2864
check if startup promise is resolved
2017-02-10 14:25:19 +01:00
Norman Jäckel cfdaabd18a Merge pull request #2941 from FinnStutzenstein/CsvImport
Fixed missing <p> tags for motion import and some improvements.
2017-02-10 14:24:36 +01:00
FinnStutzenstein 8f613177cb check if startup promise is resolved 2017-02-10 10:23:46 +01:00
FinnStutzenstein b73c50a4f9 Fixed missing <p> tags for motion import and some improvements. 2017-02-10 09:11:45 +01:00
Norman Jäckel 160333beea Merge pull request #2931 from FinnStutzenstein/Issue2669
Reorganize the current list of speakers. Fixes #2669 and find()-calls
2017-02-09 20:06:43 +01:00
FinnStutzenstein 3c36cd5757 Reorganize the current list of speakers. Fixes #2669 and find()-calls. 2017-02-07 12:24:54 +01:00
Emanuel Schütze eb0d34d212 Merge pull request #2937 from FinnStutzenstein/Issue2560
Inline edit the ballot description (closes #2560)
2017-02-07 12:00:56 +01:00
FinnStutzenstein 38279f4895 Inline edit the ballot description (closes #2560) 2017-02-07 11:53:09 +01:00
Emanuel Schütze a1ff04b862 Merge pull request #2938 from emanuelschuetze/translations
Updated German translations.
2017-02-07 09:23:32 +01:00
Emanuel Schütze b4eff0ea1a Updated German translations. 2017-02-07 09:16:12 +01:00
Emanuel Schütze f66e551eaa Merge pull request #2936 from FinnStutzenstein/MotionReason
Set resaon on save with CKEditor (fixes #2934)
2017-02-06 17:29:09 +01:00
FinnStutzenstein bacadd6931 Set resaon on save with CKEditor (fixes #2934) 2017-02-06 14:50:51 +01:00
Emanuel Schütze 12b50a0d68 Merge pull request #2935 from emanuelschuetze/motion-pdf-subtitle
PDF Layout improvements
2017-02-06 14:44:06 +01:00
Norman Jäckel 2e410599bb Merge pull request #2932 from emanuelschuetze/fix-category-numbering
Fixed motion numbering in category sort view.
2017-02-06 14:29:19 +01:00
Emanuel Schütze 80b9ce138f PDF Layout improvements
- Added parent motion into subtitle of motion pdf.
  (for amendments only).
- Adapted page margin and footer.
- Use same line height also for outside line numbering.
- Add more margin-top for motion reason heading.
2017-02-06 14:22:13 +01:00
Norman Jäckel 04fd7c1816 Merge pull request #2930 from emanuelschuetze/fix-wordwrap
Fix word-wrap for long motion identifier in Firefox.
2017-02-06 14:11:54 +01:00
Emanuel Schütze f238125a23 Fixed motion numbering in category sort view.
Removed blanks if MOTION_IDENTIFIER_WITHOUT_BLANK is True.
2017-02-06 12:11:50 +01:00
Emanuel Schütze 341916123c Fix word-wrap for long motion identifier in Firefox. 2017-02-03 14:02:36 +01:00
Norman Jäckel 45c3da22f9 Merge pull request #2928 from emanuelschuetze/template-style
Template style improvements and motion block fix
2017-02-03 13:09:32 +01:00
Emanuel Schütze 3ca254c88e Show/hide internal items in agenda sort view. 2017-02-03 12:50:57 +01:00
Emanuel Schütze e7ee8fbc07 Fixed some minor template styles.
Use always css class 'btn-sm' for buttons and 'input-sm' for inputs in
list and detail templates for consistent appearance.
2017-02-03 12:50:57 +01:00
Emanuel Schütze bbd8782c4c Fix 'follow recommendation for all motions' function.
in motion block detail view
2017-02-03 12:50:52 +01:00
Norman Jäckel 6f05fc09ce Merge pull request #2929 from FinnStutzenstein/Issue2927
Fixing merge conflicts (fixes #2927)
2017-02-03 11:54:21 +01:00
Norman Jäckel aade91cead Merge pull request #2926 from emanuelschuetze/issue-2923
Fixed dynamic pdf header and footer for worker (Fixed #2923).
2017-02-03 11:53:34 +01:00
Emanuel Schütze 3d60238ce1 Fixed dynamic pdf header/footer and table border (Fixed #2923).
Updated pdfmake to 0.1.25.
Fixed some pdf style issues.
Updated gulp watch task.
2017-02-03 11:33:46 +01:00
FinnStutzenstein 4bc9a26c4c Fixing merge conflicts (fixes #2927) 2017-02-03 08:40:48 +01:00
Emanuel Schütze df6605e759 Merge pull request #2925 from normanjaeckel/AgendaSort
Added server side sort view for agenda items. See #2452.
2017-02-01 17:50:58 +01:00
Norman Jäckel 8c53b53a9d Added server side sort view for agenda items. See #2452. 2017-02-01 14:23:59 +01:00
Emanuel Schütze bcff33330c Merge pull request #2922 from normanjaeckel/Console
Removed console.log call.
2017-02-01 13:36:00 +01:00
Norman Jäckel 9ff9ac92be Removed console.log call. 2017-02-01 12:55:26 +01:00
Norman Jäckel b6db7d481b Merge pull request #2895 from FinnStutzenstein/Issue2885
Possibility to send extra startup data (closes #2885)
2017-02-01 11:45:21 +01:00
Norman Jäckel 7d2a037567 Merge pull request #2918 from FinnStutzenstein/Issue2842
Show config save status (closes #2842)
2017-02-01 11:44:40 +01:00
FinnStutzenstein aed18205c4 showing config save status (closes #2842) 2017-01-31 18:54:02 +01:00
FinnStutzenstein 49e32d8e57 Possibility to send extra startup data (closes #2885) 2017-01-31 13:17:42 +01:00
Emanuel Schütze c8cd1a7210 Merge pull request #2917 from FinnStutzenstein/Worker
Use workers for pdf generation
2017-01-31 12:02:43 +01:00
FinnStutzenstein e1b4c1fc68 Used worker for pdf generation.
Moved pdfmake.createPdf() into a web worker thread to prevent
blocking UI and max_script_runtime error in browser.

Used gulp to manage separate worker files (pdf-worker and pdf-worker-lib).
2017-01-30 23:03:29 +01:00
Emanuel Schütze f5fab05388 Merge pull request #2920 from emanuelschuetze/fixAssignmentVoteOrder
Fixed wrong order of assignment votes caused by redis cache.
2017-01-30 22:57:45 +01:00
Emanuel Schütze 83e16b0b09 Fixed wrong order of assignment votes caused by redis cache. 2017-01-30 21:33:41 +01:00
Emanuel Schütze 39037af662 Merge pull request #2896 from FinnStutzenstein/Issue2871
Prevent XSS-attacks (fixes #2871)
2017-01-30 21:11:46 +01:00
FinnStutzenstein d55d374211 Prevent XSS-attacks (fixes #2871) 2017-01-30 21:04:41 +01:00
Norman Jäckel d338002592 Merge pull request #2916 from ostcar/fix_group_migration
Fix the migration of the groups.
2017-01-30 16:26:37 +01:00
Oskar Hahn 6b5c329605 Fix the migration of the groups.
Fixes #2915
2017-01-27 11:59:31 +01:00
Norman Jäckel 872f05ec31 Merge pull request #2914 from emanuelschuetze/Release2.1b2
Release 2.1b2
2017-01-26 22:22:59 +01:00
Emanuel Schütze 1d969838f2 Update version to 2.1b3-dev 2017-01-26 21:47:11 +01:00
Emanuel Schütze e2fb1a60a1 Release 2.1b2 2017-01-26 21:46:21 +01:00
Emanuel Schütze f10a3ffcb3 Merge pull request #2913 from emanuelschuetze/translations
Updated translations (CS, ES, PT, FR).
2017-01-26 21:42:57 +01:00
Emanuel Schütze 8234340a0c Merge pull request #2909 from ostcar/rework_auth
Created a function to convert anything possible to a user-collection-element or None
2017-01-26 21:42:40 +01:00
Emanuel Schütze b3800ad873 Updated translations (CS, ES, PT, FR). 2017-01-26 21:37:29 +01:00
Norman Jäckel ad937aecb3 Typos and small changes. 2017-01-26 21:35:26 +01:00
Emanuel Schütze c36835a40e Merge pull request #2910 from emanuelschuetze/redis-prefix
Use custom redis prefix for asgi and cache entries.
2017-01-26 21:24:05 +01:00
Emanuel Schütze 1d55e2b92b Merge pull request #2912 from normanjaeckel/SetIdentifierFix
Fixed bug in motion set_identifier method. Fixed #2911.
2017-01-26 21:23:32 +01:00
Oskar Hahn 5dcfc69ff8 Update settings.py.tpl
Also the last line of a dict should end with a ',' or with the closing }
2017-01-26 21:17:36 +01:00
Emanuel Schütze 98e6f703e1 Use custom redis prefix for asgi and cache entries.
Note: These prefix have to be unique for each OpenSlides instance!
2017-01-26 21:17:32 +01:00
Norman Jäckel 2872cd437c Fixed bug in motion set_identifier method. Fixed #2911. 2017-01-26 21:03:10 +01:00
Oskar Hahn 2daafa8db9 Created a function to convert anything possible to a user-collectoin-element or None
Changed user.has_perm(...) to has_perm(user, ...) at any place.

Removed old code
2017-01-26 18:57:10 +01:00
Emanuel Schütze 8897e22df0 Merge pull request #2907 from emanuelschuetze/pagination
Used better pagination for agenda, motions and users.
2017-01-25 21:23:45 +01:00
Emanuel Schütze 32ccddfa71 Merge pull request #2902 from FinnStutzenstein/ClientPermissions
Watch perms in client (closes #1855)
2017-01-25 21:21:27 +01:00
FinnStutzenstein 35903cbe97 Watch perms in client (closes #1855) 2017-01-25 20:19:25 +01:00
Emanuel Schütze df3e691734 Used better pagination for agenda, motions and users.
to increase the browser performance while switching between apps.
2017-01-25 19:51:51 +01:00
Norman Jäckel df60700612 Merge pull request #2882 from normanjaeckel/ChannelSendWait
Let channels' send method wait and retry if channel layer is full.
2017-01-25 16:40:43 +01:00
Norman Jäckel 70f5a95be1 Merge pull request #2906 from emanuelschuetze/fixMotionImport
Added trim function for get_full_name/get_short_name.
2017-01-25 15:12:11 +01:00
Emanuel Schütze 0d30c72270 Added trim function for get_full_name/get_short_name.
Required by submitter comparison for motion import.
2017-01-25 14:38:51 +01:00
Norman Jäckel e0d5f6d92f Merge pull request #2881 from ostcar/has_perm_with_id
Changed the function has_perm to support an user id or None as the fi…
2017-01-24 22:17:12 +01:00
Norman Jäckel 4e47fa7634 Merge pull request #2905 from FinnStutzenstein/ResolveFix
Fixing missing ballot resolver
2017-01-24 16:00:11 +01:00
Oskar Hahn 44474049c3 Added docstrings 2017-01-24 15:16:29 +01:00
Oskar Hahn fccde8de11 Changed the function has_perm to support an user id or None as the first argument.
Also fixt the case, where an anonymous user connects to the websocket connection.

Also added a function anonymous_is_enabled() to see, if the anyonmous user is enabled.

Added pip freeze to travis to see installed versions.
2017-01-24 15:16:29 +01:00
FinnStutzenstein 40c2cdbe50 Fixing missing ballot resolver 2017-01-24 12:40:44 +01:00
Norman Jäckel fb047fc5b9 Merge pull request #2899 from FinnStutzenstein/IssueCsvIE
Csv export for IE (closes #2898)
2017-01-23 16:59:07 +01:00
FinnStutzenstein 9247009f1c Csv export for IE (closes #2898) 2017-01-23 16:24:25 +01:00
Emanuel Schütze 29907c83b7 Merge pull request #2886 from FinnStutzenstein/Resolver
Removing unnecessary resolvers (closes #2869)
2017-01-20 12:00:39 +01:00
FinnStutzenstein 2b8a1168e0 Removing unnecessary resolvers (closes #2869, closes #2892) 2017-01-20 11:52:27 +01:00
Norman Jäckel a724898ba3 Merge pull request #2875 from matakuka/removespeakers
delete list of speaker error messages (closes #2237)
2017-01-19 13:22:28 +01:00
Emanuel Schütze 776c7b55fe Merge pull request #2893 from emanuelschuetze/translations201701
Translation update
2017-01-19 10:51:55 +01:00
Emanuel Schütze 8daaebbcd0 Updated translation resource and German translation file. 2017-01-19 10:43:04 +01:00
Emanuel Schütze b2dfc9b44e Fixed translation strings. 2017-01-19 10:42:26 +01:00
Emanuel Schütze 52602d8330 Merge pull request #2884 from FinnStutzenstein/MotionProject
Reorder projection of motions (fixes #2883)
2017-01-18 19:07:01 +01:00
Emanuel Schütze 601edfcce7 Merge pull request #2890 from normanjaeckel/CollectStatic
Fixed error when running manage.py collectstatic. Fixed #2861.
2017-01-18 19:01:07 +01:00
Norman Jäckel f271d8bb47 Fixed error when running manage.py collectstatic. Fixed #2861. 2017-01-18 15:33:45 +01:00
Maximilian Krambach 929a7e5e89 delete list of speaker error messages (closes #2237) 2017-01-16 18:37:59 +01:00
Norman Jäckel 3b58c76287 Merge pull request #2874 from FinnStutzenstein/StateBuild
StartUp improvements
2017-01-16 15:29:44 +01:00
FinnStutzenstein 2ac7df2ee6 Reorder projection of motions (fixes #2883) 2017-01-16 15:15:29 +01:00
FinnStutzenstein bd0073d2f7 StartUp improvements 2017-01-16 14:32:10 +01:00
Norman Jäckel bb8748a506 Let channels' send method wait and retry if channel layer is full. Fixed #2353. 2017-01-15 22:01:09 +01:00
Emanuel Schütze e9e0280a13 Merge pull request #2878 from FinnStutzenstein/MotionProjectFix
Hotfix for motion projection
2017-01-15 13:42:06 +01:00
Norman Jäckel 0546639934 Merge pull request #2866 from FinnStutzenstein/Issue2843
smoothly scroll projector
2017-01-15 13:34:51 +01:00
Norman Jäckel 26a4f7ad0c Merge pull request #2880 from emanuelschuetze/issue2787
Moved CKEDITOR_BASEPATH into openslides-libs.js (Fixed #2787)
2017-01-15 13:34:10 +01:00
Emanuel Schütze 4a7ffe9da9 Moved CKEDITOR_BASEPATH into openslides-libs.js (Fixed #2787) 2017-01-15 13:04:31 +01:00
Emanuel Schütze befff17969 Merge pull request #2873 from normanjaeckel/MotionCommentProtection
Fixed bug in relation for motion comment. Fixed #2568.
2017-01-15 12:27:17 +01:00
Emanuel Schütze 1672c2de66 Merge pull request #2872 from normanjaeckel/AgendaComment
Fixed security issue #2850: Comments were shown for unprivileged users.
2017-01-15 12:23:22 +01:00
Norman Jäckel 9250055e35 Merge pull request #2876 from emanuelschuetze/issue2763
Adapted motion DOCX template.
2017-01-15 12:21:27 +01:00
Norman Jäckel 0461238831 Merge pull request #2879 from emanuelschuetze/projector-url
Use always '/' at the end of projector url.
2017-01-15 12:20:55 +01:00
Emanuel Schütze 0eb4f67a48 Use always '/' at the end of projector url.
e.g. '/projector/1/' or '/real-projetor/1/'
2017-01-15 12:13:46 +01:00
FinnStutzenstein b419818b20 Hotfix for motion projection 2017-01-15 12:04:16 +01:00
Emanuel Schütze 986e8cc4f6 Adapted motion DOCX template (Fixed #2763). 2017-01-15 10:59:09 +01:00
FinnStutzenstein a3b7b92239 smoothly scroll projector 2017-01-15 10:56:26 +01:00
Norman Jäckel c6b1df9e24 Fixed security issue #2850: Comments were shown for unprivileged users. 2017-01-15 10:26:37 +01:00
Norman Jäckel f086d055b6 Fixed bug in relation for motion comment. Fixed #2568. 2017-01-15 10:20:45 +01:00
Emanuel Schütze 2a42368157 Merge pull request #2870 from normanjaeckel/GulpFix
Fixed gulp.
2017-01-15 09:36:06 +01:00
Norman Jäckel 7ec128a0ec Fixed gulp. 2017-01-15 00:39:07 +01:00
Emanuel Schütze 624fcc663b Merge pull request #2863 from FinnStutzenstein/StartUp
Start up
2017-01-14 21:46:16 +01:00
FinnStutzenstein a6d1eeb9c3 Worked on startup process.
- fix group view on reload
2017-01-14 21:23:05 +01:00
Norman Jäckel 481a36501f Refactored WhoAmI view and startup process. 2017-01-14 21:22:40 +01:00
Norman Jäckel 8bb0918372 Merge pull request #2825 from FinnStutzenstein/CsvImports
New csv import for users and topics
2017-01-14 20:52:09 +01:00
Oskar Hahn ebf686ef34 Send all data to the client at startup 2017-01-14 20:42:38 +01:00
FinnStutzenstein 397d659f0b New csv import for users and topics 2017-01-14 18:29:05 +01:00
Norman Jäckel 1bc35faa55 Merge pull request #2867 from boehlke/dockerfile_change
Updated production deployment dependencies
2017-01-14 18:15:21 +01:00
André Böhlke 57a3f9b786 Updated production deployment dependencies 2017-01-14 18:11:19 +01:00
Norman Jäckel 4b03a7ad5b Merge pull request #2831 from normanjaeckel/UserLoginTimestamp
Skipped autoupdate for user during login. See #2804.
2017-01-14 17:48:32 +01:00
Norman Jäckel acab868c79 Quickfix for #2865. The problem is not completely solved. 2017-01-14 17:15:30 +01:00
Norman Jäckel aefd5073a7 Skipped autoupdate for user during login. See #2804. 2017-01-14 16:45:14 +01:00
Norman Jäckel 560b820b57 Merge pull request #2855 from emanuelschuetze/issue2623
Validates open posts field of assignment form (Fixes #2623)
2017-01-14 16:16:35 +01:00
Emanuel Schütze 4faf580239 Validates open posts field of assignment form (Fixes #2623) 2017-01-14 15:30:02 +01:00
Norman Jäckel 286119108c Merge pull request #2860 from FinnStutzenstein/Issue2852
adding permission checks
2017-01-14 15:12:19 +01:00
Norman Jäckel 3600dd58f0 Merge pull request #2858 from emanuelschuetze/issue2142
Assignment list: Used number of candidates, removed number of needed …
2017-01-14 15:11:21 +01:00
Norman Jäckel a8fd42f26b Merge pull request #2857 from emanuelschuetze/issue2828
Increased the cache option MAX_ENTRIES from 1000 to 10000 (Fixes #2828).
2017-01-14 15:10:50 +01:00
Emanuel Schütze 527f949968 Assignment list: Used number of candidates, removed number of needed candidates (Fixes #2142) 2017-01-14 12:55:51 +01:00
Emanuel Schütze d76162e3b0 Increased the cache option MAX_ENTRIES from 1000 to 10000 (Fixes #2828). 2017-01-14 12:46:23 +01:00
FinnStutzenstein 794db79511 adding permission checks 2017-01-14 12:13:38 +01:00
Emanuel Schütze 458a7cf7c4 Merge pull request #2846 from normanjaeckel/MotionBlockSecu
Fixed motion create view. Fixed #2506.
2017-01-14 12:10:51 +01:00
Emanuel Schütze 8c4b38f018 Merge pull request #2847 from FinnStutzenstein/Issue2844
Group order and hide internal items filter
2017-01-14 11:39:51 +01:00
Emanuel Schütze 8c9bde27fb Merge pull request #2853 from normanjaeckel/ManagePy
Added error message for unknown args. Fixed #2200.
2017-01-14 11:39:17 +01:00
Norman Jäckel a918361ec5 Fixed motion create view. Fixed #2506. 2017-01-14 11:38:20 +01:00
FinnStutzenstein f092d6670d Group order, hide internal items filter, hide comment in agenda list view 2017-01-14 10:51:07 +01:00
Norman Jäckel aa47ecbf8a Added error message for unknown args. Fixed #2200. 2017-01-14 10:48:41 +01:00
Emanuel Schütze 99a771ac6c Merge pull request #2845 from FinnStutzenstein/Issue2833
Fixing user list view with restricted permissions (closes #2833)
2017-01-14 10:47:12 +01:00
Norman Jäckel 663feff806 Merge pull request #2848 from emanuelschuetze/issue2421
Added text to empty assignment poll result slide (Fixed #2421)
2017-01-14 10:41:24 +01:00
Emanuel Schütze 35a5d4fe3b Merge pull request #2839 from FinnStutzenstein/Issue2838
Fixing #2838
2017-01-14 10:40:57 +01:00
Emanuel Schütze 113aac59b3 Added text to empty assignment poll result slide (Fixed #2421) 2017-01-14 10:21:19 +01:00
FinnStutzenstein 76e6bac422 Fixing #2838 2017-01-14 10:21:14 +01:00
FinnStutzenstein c0f092d811 Fixing user list view with restricted permissions (closes #2833) 2017-01-14 09:57:45 +01:00
Norman Jäckel d22dff2743 Merge pull request #2841 from flanagan/remove-summary
Removed recommendation motion summary on slide.
2017-01-13 21:32:50 +01:00
Norman Jäckel 6d82208fb0 Merge pull request #2840 from ostcar/fix_channels
Fix channels
2017-01-13 21:31:58 +01:00
Meinert Leinigen d133199a73 Removed Recommendation motion summary 2017-01-13 21:28:03 +01:00
Oskar Hahn 1dc671430a Fix channels 2017-01-13 20:53:06 +01:00
Norman Jäckel 717d346321 Merge pull request #2794 from ostcar/group_cache
Group cache
2017-01-13 13:58:40 +01:00
Oskar Hahn 728576d514 Performance improvements
* Add caching support to users/group
* Add a function has_perm that works with the cache.
* Removed our session backend so other session backends (without the database) can be used
2017-01-13 13:37:18 +01:00
Norman Jäckel 299811b4a5 Merge pull request #2834 from emanuelschuetze/channels
Upgrade to channels 1.x (Fixes #2829).
2017-01-13 12:18:44 +01:00
Emanuel Schütze aca97da9c6 Merge pull request #2837 from emanuelschuetze/dockerfile
Use gulp production mode in docker images.
2017-01-12 15:56:27 +01:00
Emanuel Schütze c15ae4bbf9 Use gulp production mode in docker images. 2017-01-12 15:45:15 +01:00
Emanuel Schütze fb24ca0aba Merge pull request #2813 from FinnStutzenstein/MotionCommentInline
Motion comments inline editing
2017-01-11 21:48:02 +01:00
FinnStutzenstein b44b58393d Motion comments inline editing 2017-01-11 20:59:50 +01:00
Norman Jäckel 4a935bb641 Merge pull request #2836 from emanuelschuetze/createusercommand
Added groups_id to createopenslides user command.
2017-01-11 14:49:33 +01:00
Emanuel Schütze a6807d77bf Added groups_id to management command 'createopenslidesuser'. 2017-01-11 13:46:56 +01:00
Emanuel Schütze e436981ef4 Upgrade to channels 1.x (Fixes #2829). 2017-01-11 13:34:21 +01:00
Emanuel Schütze 962c06c85f Merge pull request #2820 from FinnStutzenstein/Issue2667
Change user import table
2017-01-10 21:22:39 +01:00
Norman Jäckel 8e385199d5 Merge pull request #2826 from FinnStutzenstein/Issue2805
Do not enable inline editing for non privileged users
2017-01-10 21:13:52 +01:00
Norman Jäckel c5ec87612c Merge pull request #2830 from ostcar/missing_ids
Change the way that missing cache ids are found.
2017-01-10 21:10:59 +01:00
Oskar Hahn 97b21427aa Change the way that missing cache ids are found.
This is probalby faster but in any way it maks debugging a lot easier. To go though
a big list in a for-loop is no fun at all.
2017-01-10 20:50:44 +01:00
FinnStutzenstein cf7033e033 Do not enable inline editing for non privileged users 2017-01-09 16:03:09 +01:00
Norman Jäckel 1eb9236a76 Merge pull request #2824 from emanuelschuetze/pdfmake0.1.23
Set pdfmake to 0.1.23 (0.1.24 does not work for custom fonts).
2017-01-09 15:04:54 +01:00
Emanuel Schütze 17b951058b Merge pull request #2821 from emanuelschuetze/no-amendments
Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
2017-01-09 14:33:57 +01:00
Emanuel Schütze bd090d3aaf Set pdfmake to 0.1.23 (0.1.24 does not work for custom fonts). 2017-01-09 14:30:53 +01:00
Emanuel Schütze 41124a53ca Add new personal settings MOTIONS_ALLOW_AMENDMENTS_OF_AMENDMENTS.
Set settings value to False to disable new amendment button in motion detail
template. Default: True.
2017-01-09 14:25:28 +01:00
FinnStutzenstein a9fbbb522e Change user import table 2017-01-09 14:22:32 +01:00
Norman Jäckel 58d8f68cc5 Merge pull request #2814 from FinnStutzenstein/ConfigEditor
Use ckeditor in config
2017-01-09 14:19:32 +01:00
Emanuel Schütze 6502f36a90 Merge pull request #2796 from FinnStutzenstein/Issue2548
Project change recommendations
2017-01-09 09:27:46 +01:00
Norman Jäckel 1a88f0985a Merge pull request #2818 from emanuelschuetze/motion-identifier-without-blanks
Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
2017-01-08 13:43:20 +01:00
Norman Jäckel 726dbc2ec6 Merge pull request #2822 from emanuelschuetze/changelog-2415
Added missing CHANGELOG entries (Fixes #2415).
2017-01-08 10:46:44 +01:00
Norman Jäckel 6c7d53e852 Merge pull request #2823 from ostcar/test_python_3.6
Test openslides with python 3.6 with travis
2017-01-08 10:45:58 +01:00
Oskar Hahn 66f7cba313 Test openslides with python 3.6 with travis 2017-01-07 16:36:27 +01:00
FinnStutzenstein e8fa488d60 Project change recommendations 2017-01-07 14:48:11 +01:00
FinnStutzenstein 4530a5faed Use ckeditor in config 2017-01-07 14:45:58 +01:00
Emanuel Schütze 206a624f04 Added missing CHANGELOG entries (Fixes #2415). 2017-01-06 22:23:24 +01:00
Emanuel Schütze f4d468a6f6 Add new personal settings MOTION_IDENTIFIER_WITHOUT_BLANKS.
Allow to remove all whitespaces from motion identifier if settings
value is True. Default: False.
Example: "B 1 - Ä 1" -> "B1-Ä1"
2017-01-06 21:38:08 +01:00
Emanuel Schütze 11c0b0cc3f Merge pull request #2816 from FinnStutzenstein/Issue2127
Use ckeditor to edit projector messages
2017-01-06 21:28:48 +01:00
FinnStutzenstein c3fc7d0f1b Do not project more than one message 2017-01-06 19:48:37 +01:00
Norman Jäckel da66db7bec Merge pull request #2819 from FinnStutzenstein/Issue2661
disable edit button if it is not possible to edit
2017-01-06 16:55:55 +01:00
Norman Jäckel 2b5f490a0f Merge pull request #2817 from emanuelschuetze/license
Updated license to 2017
2017-01-06 16:53:03 +01:00
FinnStutzenstein 6e7321d2a3 disable edit button if it is not possible to edit 2017-01-06 14:51:27 +01:00
FinnStutzenstein f37ad0f6c3 Use ckeditor to edit projector messages 2017-01-06 12:45:30 +01:00
Emanuel Schütze 01f3cf903a Updated license to 2017 2017-01-06 12:06:27 +01:00
Emanuel Schütze f146e11354 Merge pull request #2808 from matakuka/ballot_count
print correct number of ballots (closes #2504)
2017-01-06 11:56:29 +01:00
Maximilian Krambach a31ffd1009 print correct number of ballots (closes #2504) 2017-01-06 11:39:55 +01:00
Emanuel Schütze f865ba91b5 Merge pull request #2815 from emanuelschuetze/missing-ckeditor-plugins
Install missing plugins for ckeditor.
2017-01-06 11:36:29 +01:00
Emanuel Schütze cc0c0bf0d4 Merge pull request #2783 from FinnStutzenstein/PapaParse
New csv import using PapaParse
2017-01-06 11:33:06 +01:00
Emanuel Schütze df4aeb4518 Install missing plugins for ckeditor. 2017-01-06 11:08:32 +01:00
Norman Jäckel c12d985ab6 Merge pull request #2810 from tsiegleauq/issue2665-qr-code-pdf
Add QR code in user access list pdf (fixes #2665)
2017-01-06 11:08:22 +01:00
Norman Jäckel 85298554a3 Merge pull request #2807 from matakuka/mediafile_project_2706
Bind mediafile to projector scope (fixes #2706)
2017-01-06 11:05:33 +01:00
FinnStutzenstein f5fa3575df New csv import using PapaParse 2017-01-06 10:50:03 +01:00
Emanuel Schütze 388e6353cc Show qr codes in access data pdf only if config fields are set.
Disable footer with page numbers.
2017-01-04 22:43:17 +01:00
Sean Engelhardt 9abf9d5d57 Add QR codes to access data list (fixes #2665) 2017-01-04 15:50:20 +01:00
Emanuel Schütze 85c70b27f5 Merge pull request #2809 from tsiegleauq/pdfmake-0.1.23
use pdfmake release 0.1.23
2017-01-04 15:38:21 +01:00
Sean Engelhardt c16a533da7 use pdfmake release 0.1.23 2017-01-04 12:01:29 +01:00
Maximilian Krambach 912dc1af8f Bind mediafile to projector scope (fixes #2706) 2016-12-29 11:37:56 +01:00
Norman Jäckel 5fe902afed Merge pull request #2806 from fwolfst/README-IMPROVEMENTS
Minor README improvements / typo fixes.
2016-12-27 13:04:21 +01:00
Felix Wolfsteller 41a9424966 Minor README improvements / typo fixes. 2016-12-27 11:18:23 +01:00
Norman Jäckel 900ddaabb3 Merge pull request #2803 from emanuelschuetze/participant-number2
Added "No." for participant number in get_full_name().
2016-12-21 12:33:12 +01:00
Emanuel Schütze c79e779934 Added "No." for participant number in get_full_name(). 2016-12-21 12:08:37 +01:00
Norman Jäckel 7b0dca84d2 Merge pull request #2801 from FinnStutzenstein/Issue2754
More select mode options for users
2016-12-21 11:57:20 +01:00
Norman Jäckel 286643ddd2 Merge pull request #2797 from FinnStutzenstein/Issue2653
projector language (closes #2653)
2016-12-21 11:55:49 +01:00
Norman Jäckel bfa0b4b3fe Merge pull request #2800 from FinnStutzenstein/Issue2748
Consistent time handling and generic time converter code
2016-12-21 11:52:47 +01:00
FinnStutzenstein 365c122edd More select mode options for users 2016-12-21 10:42:34 +01:00
FinnStutzenstein f9f64b3e31 projector language (closes #2653) 2016-12-21 10:41:06 +01:00
Norman Jäckel 7d64ad98a4 Merge pull request #2802 from emanuelschuetze/participant-number
Move participant number to the end of get_full_name().
2016-12-21 10:33:45 +01:00
FinnStutzenstein 6454853bf6 Consistent time handling and generic time converter code 2016-12-21 10:09:27 +01:00
Emanuel Schütze be66a26353 Move participant number to the end of get_full_name(). 2016-12-21 08:59:50 +01:00
Emanuel Schütze c6fb710fb9 Merge pull request #2799 from normanjaeckel/ChangeChangelog
Updated CHANGELOG.
2016-12-20 08:48:42 +01:00
Norman Jäckel 3abb6aaaa0 Updated CHANGELOG. 2016-12-19 23:35:00 +01:00
Emanuel Schütze 16ff9200a9 Merge pull request #2782 from FinnStutzenstein/AssignmentSort
Sort candidates in assignments
2016-12-19 19:47:38 +01:00
Emanuel Schütze ff444eaa5d Merge pull request #2795 from CatoTH/Issue2777-pdf-problems
Bugfix for PDF-export - fixes #2777
2016-12-19 19:46:44 +01:00
Tobias Hößl 159720b983 Bugfix for PDF-export - fixes #2777 2016-12-19 16:17:36 +01:00
FinnStutzenstein 3b1ab265eb Sort candidates in assignments 2016-12-19 16:03:45 +01:00
Norman Jäckel 447fd35f53 Merge pull request #2798 from FinnStutzenstein/Issue2654
Cookie handling on login
2016-12-19 15:52:41 +01:00
FinnStutzenstein a24b4aed99 cookie handling on login 2016-12-19 14:14:46 +01:00
Norman Jäckel 8e4bf47169 Merge pull request #2791 from normanjaeckel/Release2.1b1
Release2.1b1
2016-12-17 00:12:13 +01:00
Norman Jäckel 655a1b8f71 Update version to 2.1b2-dev 2016-12-16 23:54:23 +01:00
Norman Jäckel 789a3c308b Release 2.1b1 2016-12-16 23:54:23 +01:00
Norman Jäckel 2d34fda1e5 Merge pull request #2793 from emanuelschuetze/pdfmake.min
Fix JS error by using pdfmake.js instead of pdfmake.min.js.
2016-12-16 23:54:03 +01:00
Emanuel Schütze de6676f74f Fix JS error by using pdfmake.js instead of pdfmake.min.js. 2016-12-16 23:47:53 +01:00
Norman Jäckel b871742584 Merge pull request #2792 from emanuelschuetze/twisted
Use twisted<16.4 for easier install (without compiling).
2016-12-16 23:09:53 +01:00
Norman Jäckel 709e2ada4b Merge pull request #2790 from emanuelschuetze/changelog-update
Updated CHANGELOG for 2.1b1.
2016-12-16 23:05:26 +01:00
Emanuel Schütze 6002c3806a Use twisted<16.4 for easier install (without compiling).
see also #2398
2016-12-16 23:03:45 +01:00
Emanuel Schütze 5b02c03266 Updated CHANGELOG for 2.1b1. 2016-12-16 22:51:15 +01:00
Norman Jäckel f74cba98e1 Merge pull request #2789 from normanjaeckel/Metadata
Updated deps.
2016-12-16 22:42:42 +01:00
Norman Jäckel 87e386afc4 Updated deps. 2016-12-16 22:24:59 +01:00
Norman Jäckel affc6997f4 Merge pull request #2788 from emanuelschuetze/font-fixes
Use Roboto Medium font for some more 'bold' classes.
2016-12-16 22:17:00 +01:00
Emanuel Schütze 01ab52a637 Use Roboto Medium font for some more 'bold' classes. 2016-12-16 22:10:56 +01:00
Norman Jäckel 27c93690c0 Merge pull request #2720 from matakuka/ckeditor
Going back from tinymce to ckeditor
2016-12-16 22:08:52 +01:00
Emanuel Schütze 82396a784d Fixing some remarks for CKEditor PR#2770 2016-12-16 21:43:19 +01:00
Tobias Hößl 08cb6a3d1b Bugfix for line numbering with CKeditor 2016-12-16 21:43:19 +01:00
Maximilian Krambach 58b8066249 Going back from TinyMCE to CKEditor
- Update CKEditor toolbar
- CKEditor: new formating options and stripping empty paragraphs from imports
- fix for other clipboard html cases not beginning with 'p' tag
- Added RemoveFormat button to ckditor toolbar.
- Reorder bower.json
- inline editor and working on line numbers and language setting
- line numbering in inline edit
- changed allowed content, line number display, editor toggling
- included "justify" in ckeditor
- reload original text after ckeditor is disabled
- Reorder and extend ckeditor toolbar.
- fixed save button trigger and inserted a revert button
- set language on editor load (works for inline case only)
2016-12-16 21:43:19 +01:00
Norman Jäckel 4ebb8023e3 Merge pull request #2776 from CatoTH/Issue2770-pdfmake-bugfix
Bugfix for #2770
2016-12-16 20:32:54 +01:00
Emanuel Schütze abe6c0f589 Merge pull request #2786 from normanjaeckel/PatchInMediafile
Changed PATCH to PUT for mediafile update. See #1871.
2016-12-16 19:15:25 +01:00
Emanuel Schütze cd89f72a17 Merge pull request #2778 from emanuelschuetze/inject-improvement
Speed up autoupdates
2016-12-16 19:12:45 +01:00
Emanuel Schütze 4a4f5622f4 Merge pull request #2785 from normanjaeckel/RemoveDjangoUrlPatternsView
Removed viewpoint for Django url patterns. Fixed #1453.
2016-12-16 19:12:25 +01:00
Emanuel Schütze 4b9be816b3 Speed up autoupdates
Use 'bulk mode' for DS.inject by calling inject
only once per each collection.
2016-12-16 18:55:24 +01:00
Norman Jäckel 75f4c55181 Removed viewpoint for Django url patterns. Fixed #1453. 2016-12-16 17:01:34 +01:00
Norman Jäckel 11e39e4ed8 Changed PATCH to PUT for mediafile update. See #1871. 2016-12-16 16:58:31 +01:00
Norman Jäckel 3fa42f0661 Merge pull request #2781 from emanuelschuetze/pdfmake-speedup
Update pdfmake to speeed up pdf generation.
2016-12-16 12:19:36 +01:00
Emanuel Schütze b7ed2f4ff0 Update pdfmake to speeed up pdf generation. 2016-12-16 09:38:52 +01:00
Emanuel Schütze c9d36db1aa Merge pull request #2611 from normanjaeckel/MediafileRework
Rearrange JavaScript files for mediafile app.
2016-12-15 16:26:17 +01:00
Tobias Hößl 46cf26481e Bugfix for #2770 2016-12-14 22:28:44 +01:00
Norman Jäckel 1221ef4f02 Rearrange client mediafile app. 2016-12-14 17:16:42 +01:00
Norman Jäckel deb5c5f4b3 Merge pull request #2774 from matakuka/language
Change the language selector to the languages' own names
2016-12-14 16:38:24 +01:00
Norman Jäckel 82b68f4387 Merge pull request #2773 from tsiegleauq/issue2709-special-values-election-pdf
add special voting values for missed options (fixes #2709)
2016-12-14 16:37:19 +01:00
Norman Jäckel 1e23999925 Merge pull request #2772 from emanuelschuetze/gulp
Readded woff2 to gulp's font filter.
2016-12-14 16:36:44 +01:00
Maximilian Krambach 0e6324b252 Change the language selector to the languages' own names 2016-12-14 15:25:38 +01:00
Sean Engelhardt 41ceb4ef9d add special voting values for missed options (fixes #2709) 2016-12-14 14:05:03 +01:00
Emanuel Schütze e38203d751 Readded woff2 to gulp's font filter.
Chrome and Firefox loads woff2 of fontawesome.
2016-12-14 12:32:02 +01:00
Emanuel Schütze 7cbc0d4bfe Merge pull request #2771 from tsiegleauq/issue2769-new-pdfmake-source
return to original pdfmake (fixes #2769)
2016-12-14 12:28:01 +01:00
Sean Engelhardt 5e3b52661e return to original pdfmake (fixes #2769) 2016-12-14 11:50:15 +01:00
Norman Jäckel cebfbf5b8d Merge pull request #2633 from normanjaeckel/SquishMigrations
Prepare migrations for 2.1b1.
2016-12-13 23:28:56 +01:00
Emanuel Schütze 218b4bc7f4 Remove old countdowns and messages in core migrations. 2016-12-13 17:04:25 +01:00
Emanuel Schütze ac00278f0f Merge pull request #2767 from emanuelschuetze/new-translations
Updated EN+DE translations.
2016-12-13 13:13:42 +01:00
Emanuel Schütze 78361308aa Updated EN+DE translations. 2016-12-13 12:20:14 +01:00
Norman Jäckel 3096958ba9 Prepare migrations for 2.1b1.
Agenda, Assignments, Core, Mediafiles, Motions, Users.

Topics are already done.
2016-12-13 11:58:36 +01:00
Norman Jäckel c1d4927a9b Merge pull request #2764 from FinnStutzenstein/Issue2754
More motion select mode options and layout changes for guests
2016-12-13 11:57:51 +01:00
FinnStutzenstein dbdaa9748c More motion select mode options and layout changes for guests 2016-12-13 11:27:44 +01:00
Norman Jäckel 6a58174e25 Merge pull request #2765 from FinnStutzenstein/Issue2451
rename mediafiles private flag to hidden
2016-12-13 11:15:53 +01:00
Norman Jäckel 4aba663540 Merge pull request #2766 from emanuelschuetze/template-fixes
Some template style and translation fixes.
2016-12-13 11:09:04 +01:00
Emanuel Schütze a9cc8fcb37 Some template style and translation fixes. 2016-12-12 20:30:50 +01:00
FinnStutzenstein 6bbbf30d94 rename mediafiles private flag to hidden 2016-12-12 16:23:31 +01:00
Norman Jäckel 99db9b71b7 Merge pull request #2760 from normanjaeckel/MotionTextIntro
Added global config for motion preamble.
2016-12-12 16:23:18 +01:00
Emanuel Schütze 32b7ddedce Template fixes for motion preamble (#2760). 2016-12-12 16:14:32 +01:00
Emanuel Schütze 2bf1b3d827 Merge pull request #2755 from normanjaeckel/StatePermission
Fixed state flag required permission to see.
2016-12-12 13:49:07 +01:00
Norman Jäckel 3853797011 Merge pull request #2761 from emanuelschuetze/minorfixes
Minor fixes (Fixes #2750)
2016-12-12 13:08:28 +01:00
Emanuel Schütze 8780c47fc1 Minor fixes (Fixes #2750)
- Use <ul> instead of <ol> for candidate lists.
- Fix sorting by assignment_related_users.length in list view (Fixes #2750).
- Apply category and motion block for new amendments.
2016-12-12 12:58:58 +01:00
Norman Jäckel 7772f60bd4 Added global config for motion preamble. 2016-12-12 12:51:27 +01:00
Norman Jäckel 6dc598800d Fixed state flag required permission to see. 2016-12-11 22:02:16 +01:00
Emanuel Schütze 5cc820d6d2 Merge pull request #2759 from emanuelschuetze/de-translation
Updated German translations.
2016-12-11 13:48:15 +01:00
Emanuel Schütze 116c3702f2 Updated German translations.
Added missing translation filter.
2016-12-11 13:37:26 +01:00
Emanuel Schütze 8ca2a836f3 Merge pull request #2757 from emanuelschuetze/translations
Updated EN translation file.
2016-12-10 11:31:38 +01:00
Emanuel Schütze cd08f02949 Updated EN translation file. 2016-12-10 11:14:08 +01:00
Emanuel Schütze 43cdfd3836 Merge pull request #2752 from FinnStutzenstein/MotionState
Adding 'done' option in motion state filter
2016-12-09 22:36:32 +01:00
Emanuel Schütze 8289306569 Merge pull request #2746 from emanuelschuetze/fonts
Use Roboto font in all templates.
2016-12-09 22:26:38 +01:00
Emanuel Schütze 12b21e2ebb Merge pull request #2756 from normanjaeckel/UpdateTravis
Updated .travis file.
2016-12-09 22:20:56 +01:00
Norman Jäckel bb3bc0b8ae Updated .travis file. 2016-12-09 18:38:40 +01:00
Emanuel Schütze 0bef3d751e Merge pull request #2742 from emanuelschuetze/missing-translations
Mark missing translation strings in table headers.
2016-12-09 15:22:03 +01:00
FinnStutzenstein efaa00483c Adding 'done' option in motion state filter 2016-12-09 15:18:35 +01:00
Norman Jäckel c2edf134e2 Merge pull request #2751 from FinnStutzenstein/Issue2747
Some stylistic changes and new motion filter option
2016-12-09 15:16:50 +01:00
Emanuel Schütze 358fd59d3c Merge pull request #2749 from FinnStutzenstein/Issue2666
changing user import (closes #2666)
2016-12-09 15:14:42 +01:00
Emanuel Schütze f6d01c1d17 Mark missing translation strings in table headers. 2016-12-09 15:13:35 +01:00
Emanuel Schütze fb7b265826 Use Roboto font in all templates.
- Only install needed font files for Roboto and Roboto Condensed
  which strongly reduced the directory size of 'static/font'.
- Make it easier to adjust custom font by using global css font definition
  in app.css and projector.css.
- Remove Open Sans font.
2016-12-09 15:10:31 +01:00
FinnStutzenstein acba95f8a4 changing user import (closes #2666) 2016-12-09 15:02:32 +01:00
FinnStutzenstein f7fcb69cc2 Some stylistic changes and new motion filter option 2016-12-09 14:58:15 +01:00
Norman Jäckel bec91b87f0 Merge pull request #2753 from FinnStutzenstein/NoUnderline
no nav underline glitch
2016-12-09 14:32:25 +01:00
FinnStutzenstein 36c8477c7f no nav underline glitch 2016-12-09 13:51:23 +01:00
Emanuel Schütze fe0801c671 Merge pull request #2738 from FinnStutzenstein/Issue2728
Moving csv exports in seperate files (closes #2728)
2016-12-09 10:49:29 +01:00
FinnStutzenstein eca93594d7 Moving csv exports in seperate files (closes #2728) 2016-12-09 08:08:38 +01:00
Norman Jäckel 787805efa6 Merge pull request #2744 from tsiegleauq/issue2576-parsing-does-not-end
add precise text decoration (fixes #2576)
2016-12-07 22:14:49 +01:00
sean b1f4def743 add precise text decoration (fixes #2576) 2016-12-07 21:41:55 +01:00
Norman Jäckel 264f342076 Merge pull request #2745 from emanuelschuetze/assignment-slide
Remove sidebox from assignment slide
2016-12-07 21:14:21 +01:00
Emanuel Schütze c363fff3ba Remove sidebox from assignment slide
Feedback from serveral users: open posts and state are not very
useful on slide and should be removed.
2016-12-07 21:00:13 +01:00
Norman Jäckel 77fdfd558f Merge pull request #2743 from emanuelschuetze/issue2564
Rename first/last name to given name/surname (Fixes #2564).
2016-12-07 20:26:06 +01:00
Emanuel Schütze 8bd03bafdb Rename first/last name to given name/surname (Fixes #2564). 2016-12-07 19:49:25 +01:00
Norman Jäckel 4e5adb74e3 Merge pull request #2739 from CatoTH/Issue2561-pdf-line-numbering-in-lists
Attempt to mitigate the list / line number problem
2016-12-07 11:34:50 +01:00
Norman Jäckel b27a975075 Merge pull request #2737 from FinnStutzenstein/Issue2730
Use session cookies and store filter settings in sessionStorage
2016-12-07 11:25:06 +01:00
FinnStutzenstein acb5a6dcf9 Use session cookies and store filter settings in sessionStorage 2016-12-07 08:01:33 +01:00
Tobias Hößl 2cb1429c8d First attempt to mitigate the list / line number problem 2016-12-06 22:12:29 +01:00
Emanuel Schütze 29d7c55dd9 Merge pull request #2692 from FinnStutzenstein/OSTitle
dynamic webpage title
2016-12-06 20:48:32 +01:00
FinnStutzenstein 29ae600194 Dynamic webpage title 2016-12-05 18:00:52 +01:00
Emanuel Schütze a716910b63 Merge pull request #2734 from emanuelschuetze/issue2727
Hot fix for cache update while user import (Fixes #2727).
2016-12-05 13:25:11 +01:00
Emanuel Schütze 405fb1b9d1 Merge pull request #2733 from normanjaeckel/CategorySort
Category sort
2016-12-05 13:24:45 +01:00
Emanuel Schütze b36560bffb Hot fix for cache update while user import (Fixes #2727). 2016-12-05 13:17:35 +01:00
Emanuel Schütze 3888632e14 Merge pull request #2735 from normanjaeckel/FixStatus
Fixed typo.
2016-12-05 13:09:25 +01:00
Norman Jäckel e180b1df29 Fixed sorting of motions in a category. Changed identifiers of amendments during sorting. Fixed #2701. 2016-12-05 12:59:46 +01:00
Norman Jäckel 8b6844675e Merge pull request #2732 from CatoTH/bugfix-typo-in-variable-name
Typo in variable name
2016-12-05 12:58:56 +01:00
Norman Jäckel d8c7eda587 Fixed typo. 2016-12-05 12:40:28 +01:00
Emanuel Schütze 224ba797a2 Merge pull request #2731 from normanjaeckel/MotionNumberingSpeed
Improved speed of motion numbering.
2016-12-04 19:56:44 +01:00
Norman Jäckel d0ed0cea23 Improved speed of motion numbering. 2016-12-03 20:57:00 +01:00
Tobias Hößl 940fb14ad6 Typo in variable name 2016-12-03 14:50:39 +01:00
Emanuel Schütze dbfa470ee0 Merge pull request #2729 from emanuelschuetze/translation-update
Updated translations for EN/DE. Fix translation string.
2016-12-02 16:41:45 +01:00
Emanuel Schütze 9009c9e2e9 Updated translations for EN/DE. Fix translation string. 2016-12-02 16:30:03 +01:00
Emanuel Schütze 486f0601eb Merge pull request #2721 from FinnStutzenstein/AgendaTable
Agenda table
2016-12-02 15:59:57 +01:00
Emanuel Schütze 0698327427 Fix minor remarks for #2271. 2016-12-02 15:49:21 +01:00
Emanuel Schütze 4c37fd8e62 Merge pull request #2726 from normanjaeckel/FollowRecommendationButton
Added button to motion detail view to follow recommendation. Closed #…
2016-12-02 15:40:33 +01:00
FinnStutzenstein ee5adb8fd2 New AgendaTable 2016-12-02 15:18:32 +01:00
Norman Jäckel 49dca65640 Added button to motion detail view to follow recommendation. Closed #2700. 2016-12-02 14:57:45 +01:00
Norman Jäckel 4d288ec9b2 Merge pull request #2724 from emanuelschuetze/posts
Rename 'posts' to 'persons' in assigment templates.
2016-12-02 14:47:11 +01:00
Norman Jäckel 926d04f610 Merge pull request #2723 from FinnStutzenstein/Clock
Fixing the clock
2016-12-02 14:46:43 +01:00
Emanuel Schütze 65337ae2d2 Rename 'posts' to 'persons' in assigment templates. 2016-12-02 14:41:34 +01:00
Norman Jäckel dc0559ef38 Merge pull request #2722 from FinnStutzenstein/Issue2126
Show countdown above messageoverlay (closes #2126)
2016-12-02 14:26:15 +01:00
Norman Jäckel 1ca0b7f291 Merge pull request #2719 from FinnStutzenstein/Issue2693
Translate legal notice
2016-12-02 14:25:51 +01:00
FinnStutzenstein 7e18061e53 Fixing the clock 2016-12-02 14:17:37 +01:00
FinnStutzenstein cc8cf1ef7a Show countdown above messageoverlay (closes #2126) 2016-12-02 12:31:10 +01:00
Emanuel Schütze 7fa5d3b9bb Merge pull request #2713 from normanjaeckel/SettingsForClient
Added settings for client to basic JavaScript code on client startup.…
2016-12-02 10:38:18 +01:00
Emanuel Schütze a1e33b99d4 Merge pull request #2718 from normanjaeckel/ApplyMotionText
Changed config to apply motion text for new amendmend. Closed #2714.
2016-12-02 08:51:46 +01:00
FinnStutzenstein 0f89205038 Translate legal notice 2016-12-02 08:10:06 +01:00
Norman Jäckel 81a01156c1 Changed config to apply motion text for new amendmend. Closed #2714. 2016-12-02 00:12:37 +01:00
Norman Jäckel a245236392 Merge pull request #2716 from emanuelschuetze/fix-motion-pdf
Fixed motion pdf layout
2016-12-01 23:57:24 +01:00
Emanuel Schütze 52b9c651bb Fixed motion pdf layout
for voting result and summary change recommendations
2016-12-01 22:56:42 +01:00
Norman Jäckel 526a5478f7 Added settings for client to basic JavaScript code on client startup. Closed #2697. 2016-12-01 15:21:11 +01:00
Norman Jäckel cdc37b4dd5 Merge pull request #2703 from normanjaeckel/LeadingZero
Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696.
2016-12-01 14:46:15 +01:00
Norman Jäckel 59599bfba0 Merge pull request #2712 from emanuelschuetze/fixes
Minor fixes (Fixes #2710)
2016-12-01 14:42:56 +01:00
Norman Jäckel e81eeb4af9 Merge pull request #2557 from matakuka/majority_assignment
Majority calculation for assignments
2016-12-01 14:41:41 +01:00
Norman Jäckel ad651300d9 Added settings value MOTION_IDENTIFIER_MIN_DIGITS. Solved #2696. 2016-12-01 14:41:12 +01:00
Norman Jäckel 639978a5dc Refactor motion ans assignment percent and majority calculation. 2016-12-01 14:35:35 +01:00
Maximilian Krambach 32aaaf5b9e Majority calculation for assignments.
Majorities when config YN(A) and simple voting method.
2016-12-01 14:35:35 +01:00
Emanuel Schütze 670251fba9 Minor fixes (Fixes #2710)
- motion form: show supporters field
- motion block slide: show motion identifiers in columns
- item list: show open link for motion blocks
- use right pdfmake-dist name in bower.json
2016-12-01 14:29:31 +01:00
Emanuel Schütze 9440842e6a Merge pull request #2708 from emanuelschuetze/issue2626
Improved wording for recommendation config (Fixes #2626)
2016-12-01 11:29:29 +01:00
Emanuel Schütze 80f4cf8f2d Improved wording for recommendation config (Fixes #2626)
- updated config label and helptext
- added recommendation also to motion slide
2016-12-01 11:05:11 +01:00
Emanuel Schütze 9dd44edb9e Merge pull request #2698 from FinnStutzenstein/Issue2531
Translate default projector (closes #2531)
2016-12-01 11:02:02 +01:00
Norman Jäckel 510d60ef0f Merge pull request #2702 from tsiegleauq/assignmentImprove2559
improves the assignments (fixes #2559)
2016-12-01 10:25:57 +01:00
Norman Jäckel de00e35064 Merge pull request #2704 from tsiegleauq/motionDiffBox
Adds the diff-summary box for motions
2016-12-01 10:25:05 +01:00
Norman Jäckel 6aa3ea0d63 Merge pull request #2627 from CatoTH/change-recommendations-inline-diff
Showing Diff inline
2016-12-01 10:24:18 +01:00
Norman Jäckel 4604d687f1 Merge pull request #2707 from emanuelschuetze/fix-js-error
Fix JS error after project pdf file.
2016-12-01 10:22:08 +01:00
FinnStutzenstein b0c94888ce Translate default projector (closes #2531) 2016-12-01 07:48:26 +01:00
Emanuel Schütze bc312efbb9 Fix JS error after project pdf file. 2016-11-30 22:26:11 +01:00
Emanuel Schütze 5ab8b3172b Merge pull request #2699 from normanjaeckel/TrivialChange
Fixed trivial change (disable versioning) checkboxes.
2016-11-30 21:39:50 +01:00
Emanuel Schütze c466af760c Motion PDF: Fix line numbers and style in summary box. 2016-11-30 21:13:12 +01:00
Emanuel Schütze 17c464bafa Merge pull request #2688 from FinnStutzenstein/AssignmentsTable
New assignment and mediafile tables and table generics
2016-11-30 14:29:13 +01:00
Sean Engelhardt 8f0c419c3e Adds the diff-summary box for motions 2016-11-30 14:29:09 +01:00
Sean Engelhardt 2bb440b2aa improves the assignments (fixes #2559) 2016-11-30 10:57:51 +01:00
Norman Jäckel e601ee8e24 Fixed trivial change (disable versioning) checkboxes. 2016-11-29 16:39:54 +01:00
FinnStutzenstein 4f717b6610 New assignment and mediafile tables and table generics 2016-11-29 16:29:29 +01:00
Norman Jäckel 0605395da2 Merge pull request #2687 from FinnStutzenstein/Issue2341
Use plugin verbose name in permission matrix (fixes #2341)
2016-11-29 12:52:30 +01:00
FinnStutzenstein 0446855920 Use pugin verbose name in permission matrix (fixes #2341) 2016-11-29 11:17:50 +01:00
Emanuel Schütze 5312d44235 Merge pull request #2651 from CatoTH/editing-change-recommendations
Editing change recommendations
2016-11-28 21:31:22 +01:00
Emanuel Schütze b11463fc60 Merge pull request #2690 from CatoTH/bugfix-incorrectly-merging-words
Bugfix for merging change recommendations
2016-11-28 21:28:38 +01:00
Emanuel Schütze a30085f756 Merge pull request #2632 from CatoTH/explicitly-enter-change-recommendation-type
Allow to explicitly set the type of a change recommendation
2016-11-28 20:57:21 +01:00
Emanuel Schütze ddfafd327b Merge pull request #2655 from CatoTH/Issue2615-line-selection-improvements
A small tooltip after selecting the first line when creating a change recommendation
2016-11-28 20:45:07 +01:00
Emanuel Schütze b971c8db54 Merge pull request #2691 from emanuelschuetze/dialog-improvements
Improved forms in ng-dialogs.
2016-11-28 20:41:20 +01:00
Norman Jäckel 7e45e8a9a5 Merge pull request #2689 from FinnStutzenstein/lineNumberFix
Missing changes from PR 2678
2016-11-28 20:37:05 +01:00
Emanuel Schütze e865cfe105 Improved forms in ng-dialogs.
- users: use form field in grid layout and add more option
  to reduce scrolling of long dialog.
- agenda/motions/assignment: show parent agenda item field for create
  dialog only (to prevent corrupt agenda by action 'set my child item as my new
  parent item')
- refactor ng dialog and formly code.
2016-11-27 22:57:56 +01:00
Tobias Hößl bce74cac2f Bugfix for merging change recommendations 2016-11-26 21:48:56 +01:00
Tobias Hößl 2958a401ad Showing Diff inline 2016-11-26 16:50:32 +01:00
Tobias Hößl f380f63851 A proposition so mitigate #2615 2016-11-26 12:34:26 +01:00
Emanuel Schütze fb646df1fd Merge pull request #2680 from FinnStutzenstein/MultiprojectorThings
Some improvements for Multiprojector
2016-11-25 15:45:40 +01:00
FinnStutzenstein 51cab5a8c9 Missing changes from PR 2678 2016-11-25 13:23:07 +01:00
Norman Jäckel d068765db9 Merge pull request #2678 from CatoTH/goto-line-numbers-always-available
Make line highlighting and 'Goto'-Feature available on all modes
2016-11-24 00:09:22 +01:00
Norman Jäckel 36dc957f19 Changed tooltips. 2016-11-24 00:07:50 +01:00
Norman Jäckel d9236c1920 Merge pull request #2681 from FinnStutzenstein/Issue2671
fixing duration in topic import (fixes #2671)
2016-11-24 00:03:52 +01:00
Tobias Hößl fd82ae348e Editing change recommendations 2016-11-23 23:42:24 +01:00
Emanuel Schütze 14d00cc404 Merge pull request #2649 from CatoTH/bugfix-disabling-inline-editing
Bugfix disabling inline editing
2016-11-23 22:03:31 +01:00
FinnStutzenstein 219204087a fixing duration in topic import (fixes #2671) 2016-11-21 15:24:11 +01:00
FinnStutzenstein 88537cf67e Some improvements for Multiprojector 2016-11-21 15:01:54 +01:00
Emanuel Schütze 829acce22d Merge pull request #2648 from normanjaeckel/FixBroadcastOnDelete
Fixed projector broadcast if projector is deleted. Fixed #2646.
2016-11-20 22:43:47 +01:00
Emanuel Schütze 701387984b Merge pull request #2529 from FinnStutzenstein/Issue2464
countdown and message models (closes #2464)
2016-11-20 22:39:12 +01:00
Tobias Hößl c888419527 Make line highlighting and 'Goto'-Feature available on all modes 2016-11-20 21:55:03 +01:00
Tobias Hößl ec635d97ee Bugfix: Affected lines were selectable right after creating a change recommendation 2016-11-19 13:33:06 +01:00
Tobias Hößl f9325069cf Bugfix: Calling editing dialog during inline editing 2016-11-19 13:19:08 +01:00
Norman Jäckel 28059698c7 Fixed projector broadcast if projector is deleted. Fixed #2646. 2016-11-19 13:04:24 +01:00
FinnStutzenstein 0cc8a81320 countdown and message models (closes #2464) 2016-11-19 12:37:33 +01:00
Tobias Hößl 771f087ade Allow to explicitly set the type of a change recommendation 2016-11-19 11:57:54 +01:00
Emanuel Schütze 577d0bf3cc Merge pull request #2643 from emanuelschuetze/translations
Updated translation files
2016-11-18 11:32:57 +01:00
Emanuel Schütze 707029c1c3 Updated translation files
- EN resources for django and angular-gettext
- DE translations
- PT translations
2016-11-18 11:24:09 +01:00
Norman Jäckel a6ec032590 Merge pull request #2642 from emanuelschuetze/cleanup-pdf
Remove unused serverside pdf file from users app.
2016-11-18 11:03:23 +01:00
Emanuel Schütze 9c58efbdae Remove unused serverside pdf file from users app. 2016-11-18 10:50:56 +01:00
Norman Jäckel 9375727f1f Merge pull request #2631 from CatoTH/change-change-recommendation-views
Overhaul change recommendation statuses
2016-11-18 10:49:38 +01:00
Norman Jäckel 9b6fe6e3a2 Merge pull request #2641 from FinnStutzenstein/Issue2609
check if pdf is encrypted (closes #2609)
2016-11-18 10:33:46 +01:00
Emanuel Schütze 7ad81274d0 Merge pull request #2592 from FinnStutzenstein/UserTable
New table design for users
2016-11-18 09:49:23 +01:00
FinnStutzenstein e0f78b16a0 New table design for users 2016-11-18 09:42:29 +01:00
FinnStutzenstein 975a76daf4 check if pdf is encrypted 2016-11-18 09:40:36 +01:00
Norman Jäckel f84c381f38 Merge pull request #2640 from emanuelschuetze/issue2639
Fixed missplaced comma in pdf header (Fixed #2639)
2016-11-16 23:28:38 +01:00
Tobias Hößl 32d3d804b1 Overhaul change recommendation statuses 2016-11-16 22:42:22 +01:00
Emanuel Schütze f9f9934722 Fixed missplaced comma in pdf header (Fixed #2639) 2016-11-16 21:05:04 +01:00
Norman Jäckel e8bf67b185 Merge pull request #2637 from emanuelschuetze/fix-translations
Fixed missing translations (Fixed #2616, fixed #2625)
2016-11-15 23:27:02 +01:00
Norman Jäckel 35e54eecbd Merge pull request #2629 from CatoTH/Issue2617-switch-back-to-original-view
Switch back to original view after deleting last change recommendation (Closes #2617)
2016-11-15 23:14:03 +01:00
Norman Jäckel 5899c41840 Merge pull request #2628 from CatoTH/bugfix-wrong-caching-of-extracted-lines
Bugfix: Caching of extracted line numbers was invalid…
2016-11-15 23:13:13 +01:00
Emanuel Schütze f8958e36a6 Fixed missing translations (Fixed #2616, fixed #2625) 2016-11-15 21:18:06 +01:00
Emanuel Schütze 2399a8121a Merge pull request #2634 from normanjaeckel/FixMotionComment
Fixed motion projector if comment field is None. Fixed #2614.
2016-11-15 21:01:24 +01:00
Emanuel Schütze bbdb273a01 Merge pull request #2630 from CatoTH/translation-bugfix
Translation Bugfix - Missing line number in german translation
2016-11-15 20:35:20 +01:00
Emanuel Schütze 4d54a2b575 Merge pull request #2622 from FinnStutzenstein/Issue2566
Hotfix for Issue #2566
2016-11-15 20:24:47 +01:00
Emanuel Schütze b9a325ba5d Merge pull request #2620 from FinnStutzenstein/Issue2590
Highlighting motions for multiprojector and move httpProvider (fixes …
2016-11-15 20:21:19 +01:00
FinnStutzenstein 4b8fc5fa19 Highlighting motions for multiprojector and move httpProvider (fixes #2590) 2016-11-15 13:09:56 +01:00
Emanuel Schütze 55267a70f8 Merge pull request #2635 from emanuelschuetze/motion-pdf
Updated PDF layout
2016-11-15 11:42:34 +01:00
FinnStutzenstein 1ca390876b Hotfix for Issue #2566 2016-11-15 11:40:59 +01:00
Emanuel Schütze 4e1fdc6b22 Updated PDF layout
- use default font for pdf from vfs_font.js
  remove base64 encoding function on server side
- use recommendation config value in motion detail template
2016-11-14 18:52:50 +01:00
Emanuel Schütze 18accc58ae Merge pull request #2610 from tsiegleauq/electionListPdfMake
ElectionList over PdfMake
2016-11-14 18:05:03 +01:00
Emanuel Schütze ff359ea629 Improved assignments and motions pdf.
Load all users in pdfmake function - not in state resolver of
assignment list.
2016-11-14 17:55:50 +01:00
Norman Jäckel 5a78f1c510 Fixed motion projector if comment field is None. Fixed #2614. 2016-11-14 13:16:34 +01:00
Tobias Hößl 2fe1940802 Translation Bugfix 2016-11-13 11:51:27 +01:00
Tobias Hößl fca2605a2b Switch back to original view after deleting last change recommendation 2016-11-13 11:45:22 +01:00
Tobias Hößl 4ac7f48bec Bugfix: Caching of extracted line numbers was invalid when a fragment was passed as an argument 2016-11-13 10:20:00 +01:00
Emanuel Schütze e49411250a Merge pull request #2558 from FinnStutzenstein/Issue2462
change all isProjected functions (closes #2462)
2016-11-11 15:57:56 +01:00
Norman Jäckel 67aa92a7ac Merge pull request #2619 from FinnStutzenstein/Issue2573
No overrun of identifier col in motion table (closes #2573)
2016-11-11 13:21:25 +01:00
Norman Jäckel a6870eec3d Merge pull request #2621 from FinnStutzenstein/motionBlockLayout
fixing motion block list layout
2016-11-11 13:21:10 +01:00
FinnStutzenstein 133d0c3a0f fixing motion block list layout 2016-11-11 10:59:38 +01:00
FinnStutzenstein fbeacd97f8 No overrun of identifier col in motion table (closes #2573) 2016-11-11 09:40:30 +01:00
FinnStutzenstein af9755cb9a changed all project functions 2016-11-11 09:37:37 +01:00
Emanuel Schütze 22ab7a15a3 Merge pull request #2608 from emanuelschuetze/issue-2339
Load angular-gettext language files from plugin (Fixed #2339)
2016-11-10 13:00:53 +01:00
Emanuel Schütze 3b41f99a6f Load angular-gettext language files from plugin (Fixed #2339)
Add new OpenSlidesPlugins provider where plugins can be registered.
2016-11-10 12:51:16 +01:00
Emanuel Schütze 31f29bdfc9 Merge pull request #2601 from boehlke/master
Add new command for adding users.
2016-11-10 12:50:08 +01:00
Norman Jäckel 9a51bbe663 Update createopenslidesuser.py 2016-11-10 11:11:27 +01:00
André Böhlke 01e27c5713 add command for creating an openslides user 2016-11-10 09:15:21 +01:00
Sean Engelhardt 7069326655 ElectionList over PdfMake 2016-11-09 20:23:01 +01:00
André Böhlke 161ce5a509 cleanup build dependencies (wget, pip and apt package cache) 2016-11-09 19:10:40 +01:00
Norman Jäckel bc321bd714 Merge pull request #2605 from ostcar/fix_permission
Fixes user permissions
2016-11-08 23:50:39 +01:00
Oskar Hahn a47e30c8f1 Fixes user permissions
Fix #2597
2016-11-08 23:13:15 +01:00
Emanuel Schütze fbc4344ab9 Merge pull request #2604 from normanjaeckel/FixGroupUpdate
Fixed group update method. Fixed #2541.
2016-11-08 22:45:38 +01:00
Norman Jäckel 7aa110aca6 Merge pull request #2599 from FinnStutzenstein/Issue2118
check for cookies (closes #2118)
2016-11-08 22:39:40 +01:00
Norman Jäckel 5ea5f86aba Merge pull request #2603 from emanuelschuetze/angular-csv-import
Freeze angular-csv-import version to 0.0.36.
2016-11-08 22:38:59 +01:00
Norman Jäckel 2fae952edd Fixed group update method. Fixed #2541. 2016-11-08 22:36:57 +01:00
Emanuel Schütze 7de5892ba3 Freeze angular-csv-import version to 0.0.36.
0.0.37 breaks button in template.
2016-11-08 22:14:12 +01:00
Emanuel Schütze 3b2b267e0f Merge pull request #2602 from normanjaeckel/FixFQueryProblem
Fixed zoom and scroll, fixed #2547.
2016-11-08 21:50:15 +01:00
Norman Jäckel 4d80914b8a Fixed zoom and scroll, fixed #2547. 2016-11-08 21:29:26 +01:00
Norman Jäckel db38e5e075 Merge pull request #2476 from ostcar/remove_serverside_pdf
Removed old code needed be the server to serve pdf
2016-11-08 15:12:45 +01:00
Norman Jäckel 8f099114bb Merge pull request #2587 from FinnStutzenstein/Issue2544
Block deleting of the last group with user manage permissions
2016-11-08 15:04:24 +01:00
Norman Jäckel 30fd55409b Merge pull request #2598 from emanuelschuetze/template-fixes
Template fixes.
2016-11-08 14:45:28 +01:00
Emanuel Schütze 3c34f9feea Merge pull request #2600 from emanuelschuetze/update-translations-3
Updated German translations.
2016-11-08 14:42:59 +01:00
Emanuel Schütze 4eecd59e52 Updated German translations. 2016-11-08 14:37:12 +01:00
FinnStutzenstein 43d9733881 fixing current list of speakers 2016-11-08 13:00:50 +01:00
FinnStutzenstein 410ac00a44 check for cookies (closes #2118) 2016-11-08 12:46:19 +01:00
FinnStutzenstein 8d4742ed29 Style fix in current list of speakers template 2016-11-08 12:21:53 +01:00
Emanuel Schütze 92a9a36188 Template fixes.
- Improved motion majority calculation form.
- Show special values without percentage.
- Fix JS errors.
2016-11-08 12:14:24 +01:00
Emanuel Schütze 55a8c4e33a Removed unused python user functions (Fixed #2594).
Now get_short_name() and get_full_name() are used on client side only.
2016-11-07 15:58:20 +01:00
Oskar Hahn 7281aa57b8 Removed old code needed be the server to serve pdf 2016-11-07 15:54:29 +01:00
Emanuel Schütze 2824a6b3d2 Merge pull request #2591 from emanuelschuetze/users-import
Improve importing and sorting of users
2016-11-07 15:17:30 +01:00
Emanuel Schütze 5b544ceed2 Improve importing and sorting of users
* Add is_present field for csv import of users.
* Refactor JS functions get_full_name and get_short_name (Fixes #2136).
  - Show participant number in get_full_name() output.
  - Sort users by first or last name.
  - Extend config option to sort users.
  - Mark unused Python methods get_short_name and get_full_name.
2016-11-07 15:04:30 +01:00
Emanuel Schütze 8c07884746 Merge pull request #2586 from FinnStutzenstein/Issue2543
Just protect default group (fixes #2543)
2016-11-04 15:51:40 +01:00
Emanuel Schütze 3225cdd1a9 Merge pull request #2589 from normanjaeckel/ConfigLabelHelpText
Changed label and help text of assignment config for 100-%-base.
2016-11-04 15:45:19 +01:00
Norman Jäckel 4c08bca34a Merge pull request #2582 from emanuelschuetze/fix-mergeconflict
Fix merge conflict in core/base.js
2016-11-04 12:11:09 +01:00
Norman Jäckel 19a76f5d3d Changed label and help text of assignment config for 100-%-base. 2016-11-04 12:02:16 +01:00
FinnStutzenstein 4a1df35a50 Block deleting of the last group with user manage permissions (closes #2544) 2016-11-04 10:04:21 +01:00
FinnStutzenstein 67f3a1294d Just protect default group (fixes #2543) 2016-11-04 08:30:58 +01:00
Emanuel Schütze b297bab5b5 Fix merge conflict in core/base.js 2016-11-02 22:05:07 +01:00
Emanuel Schütze ef36962221 Merge pull request #2580 from tsiegleauq/accessDataListPdfMake
Creates the access data list with PdfMake
2016-11-02 14:53:50 +01:00
Norman Jäckel 8c4a69dfb2 Merge pull request #2570 from emanuelschuetze/fix-inmemory-cache
Fix updating of motion comments for inmemory cache.
2016-11-02 14:24:30 +01:00
Sean Engelhardt 34f74da58d Creates the access data list with PdfMake 2016-11-02 14:19:57 +01:00
Emanuel Schütze 2966fa91ff Merge pull request #2579 from emanuelschuetze/fix-projector
Fix regression with projector loading.
2016-11-02 14:18:49 +01:00
Emanuel Schütze e315cbad89 Fix regression with projector loading.
Projector requires Editor provider in core/base.js instead of site.js
because MotionComments (in motions/base.js) uses now Editor factory.
2016-11-02 14:10:59 +01:00
Emanuel Schütze 2c09b409d7 Fix updating of motion comments for inmemory cache.
get_restricted_data() has to use deepcopy(full_data) instead of
full_data.copy().
2016-11-02 14:07:24 +01:00
Norman Jäckel 8ec6681e81 Merge pull request #2578 from emanuelschuetze/fix-2115
Allow to resize tinymce editor (Fixes #2115)
2016-11-02 13:30:49 +01:00
Emanuel Schütze caf52094a4 Allow to resize tinymce editor (Fixes #2115) 2016-11-02 10:35:18 +01:00
Emanuel Schütze 9e5b0f270d Merge pull request #2577 from emanuelschuetze/de-translation-update
Updated German translations.
2016-11-02 09:19:06 +01:00
Emanuel Schütze c5ffa13436 Updated German translations. 2016-11-02 09:06:55 +01:00
Emanuel Schütze 842ff93ffb Merge pull request #2572 from emanuelschuetze/translation-resources-3
Updated template-en.po resource.
2016-11-02 00:29:32 +01:00
Emanuel Schütze 259189c280 Updated template-en.po resource. 2016-11-02 00:22:13 +01:00
Emanuel Schütze 7ce479a511 Merge pull request #2535 from emanuelschuetze/state-recommendation-extra-fields
Added new motion state flags to show an additional fields
2016-11-02 00:19:32 +01:00
Norman Jäckel 50868d1432 Merge pull request #2567 from emanuelschuetze/fix-translation-strings
Fixed translation issues.
2016-11-01 23:58:43 +01:00
Emanuel Schütze befb8083bf Merge pull request #2537 from CatoTH/line-number-and-diff-caching
Caching results of insertLineNumbers and extractRangeByLineNumbers
2016-11-01 23:41:29 +01:00
Emanuel Schütze b08ca4be02 Merge pull request #2534 from tsiegleauq/electionsListPdfMake
Creates the Election documents using PdfMake
2016-11-01 23:40:42 +01:00
Emanuel Schütze 78765ae9ed Added new motion state flags to show an additional fields
... to extend state name and recommendation label.
Hide forState and forRecommendation fields in motion form and detail
view (comment section).
2016-11-01 23:37:39 +01:00
Emanuel Schütze 4b124a629b Fixed translation issues. 2016-11-01 23:32:39 +01:00
Tobias Hößl 36e519a798 Caching results of insertLineNumbers and extractRangeByLineNumbers 2016-11-01 23:29:32 +01:00
Sean Engelhardt 14ca655aa2 Creates the Election documents using PdfMake 2016-11-01 23:18:19 +01:00
Norman Jäckel b0ff8375a8 Merge pull request #2539 from CatoTH/bugfix-open-motions-in-original-view
Bugfix: Always open motions in original view
2016-11-01 22:56:33 +01:00
Norman Jäckel 3c48df1245 Merge pull request #2540 from CatoTH/diff-formattings-in-pdf
Colors / text-Decorations for insered / deleted text
2016-11-01 22:55:25 +01:00
Norman Jäckel 378fb46fb2 Merge pull request #2562 from emanuelschuetze/comments-editor
Use tinymce editor for motion comment fields.
2016-11-01 22:54:58 +01:00
Emanuel Schütze 41a4e35592 Use tinymce editor for motion comment fields. 2016-11-01 17:37:32 +01:00
FinnStutzenstein 58dd2f2b30 change all isProjected functions (closes #2462) 2016-11-01 10:31:28 +01:00
Tobias Hößl 03ef217c4e Colors / text-Decorations for insered / deleted text; hide line numbers in inserted text 2016-10-29 16:23:16 +02:00
Tobias Hößl efe90c4e4d Always open motions in original view 2016-10-29 14:30:25 +02:00
Norman Jäckel 047697d0ae Merge pull request #2536 from emanuelschuetze/2.1-dev
Use version 2.1-dev.
2016-10-27 23:07:34 +02:00
Emanuel Schütze 2a36a0e84e Use version 2.1-dev. 2016-10-27 14:10:20 +02:00
Emanuel Schütze 4d48f2d8a5 Merge pull request #2533 from normanjaeckel/FixHelpText
Fixed error in README and help texts of start script. Fixed #2532.
2016-10-26 15:08:29 +02:00
Norman Jäckel 632fd68564 Fixed error in README and help texts of start script. Fixed #2532. 2016-10-26 14:58:46 +02:00
Norman Jäckel ee235309ed Merge pull request #2523 from FinnStutzenstein/Issue2517
change dropdown for project agenda (closes #2517)
2016-10-26 14:56:18 +02:00
Norman Jäckel f5b37c1b84 Merge pull request #2530 from emanuelschuetze/pagination
Fix pagination and indentation of lists in import views.
2016-10-26 14:55:44 +02:00
Emanuel Schütze 4646cebe55 Merge pull request #2526 from FinnStutzenstein/Issue2448
Adding sortingoptions for creation date and last modified (closes #2448)
2016-10-25 14:53:58 +02:00
Emanuel Schütze 147e4ab219 Merge pull request #2527 from FinnStutzenstein/Issue2522
fixing topics import (closes #2522)
2016-10-25 14:46:12 +02:00
Emanuel Schütze 435e333bbb Fix pagination and indentation of lists in import views. 2016-10-25 13:45:54 +02:00
Norman Jäckel 12f7f20d8c Merge pull request #2528 from emanuelschuetze/fix-assignment-detail
Fix to show election results without ng-init.
2016-10-25 11:21:07 +02:00
Emanuel Schütze 21e6903368 Fix to show election results without ng-init.
ng-init does not watch for autoupdates.
2016-10-25 10:44:17 +02:00
FinnStutzenstein fc21713bb4 Adding sortingoptions for creationdate and last modified (closes #2448) 2016-10-25 10:03:01 +02:00
Emanuel Schütze 6a1fc01a38 Merge pull request #2524 from normanjaeckel/FixMigrations
Fixed migrations by skipping autoupdate.
2016-10-24 19:22:49 +02:00
FinnStutzenstein e267784173 fixing topics import (closes #2522) 2016-10-24 16:38:43 +02:00
Norman Jäckel 9ca15fd0b8 Fixed migrations by skipping autoupdate. 2016-10-24 10:42:34 +02:00
FinnStutzenstein 2f03777d56 change dropdown for project agenda (closes #2517) 2016-10-21 13:11:25 +02:00
Emanuel Schütze f8be521bf5 Merge pull request #2513 from FinnStutzenstein/Issue2471
use check icon and no post request on deselect (fixes #2471)
2016-10-21 10:06:39 +02:00
FinnStutzenstein 111b9e3fd7 use check icon and no post request on deselect (fixes #2471) 2016-10-21 09:39:04 +02:00
Emanuel Schütze dc1c958e0f Merge pull request #2514 from FinnStutzenstein/Issue2494
Round corners for projectorbuttons (fixes #2494)
2016-10-18 13:01:49 +02:00
FinnStutzenstein 6ca3c07e1f Round corners for projectorbuttons (fixes #2494) 2016-10-18 12:48:19 +02:00
Emanuel Schütze 578f458191 Merge pull request #2519 from emanuelschuetze/de-translation
Updated translation resource. Updated German translations.
2016-10-17 23:54:24 +02:00
Emanuel Schütze 8172984a4d Updated translation resource. Updated German translations.
Fixed translation strings.
2016-10-17 23:30:18 +02:00
Emanuel Schütze 7fb65df086 Merge pull request #2518 from emanuelschuetze/translation-en-update
Updated EN translation resources.
2016-10-17 22:43:17 +02:00
Emanuel Schütze 35a69254af Updated EN translation resources. 2016-10-17 22:07:25 +02:00
Emanuel Schütze 68139ff5be Merge pull request #2512 from FinnStutzenstein/Issue2470
key value switched in angular foreach (fixes #2470)
2016-10-17 22:05:55 +02:00
Norman Jäckel 676e783039 Merge pull request #2516 from FinnStutzenstein/Issue2502
Remove chat history
2016-10-17 21:48:34 +02:00
Norman Jäckel f2fa8de7be Merge pull request #2495 from normanjaeckel/MotionBlock
Motion block
2016-10-17 21:29:31 +02:00
Emanuel Schütze 29638cc702 Recreated migrations file for motionBlock.
Minor template fixes for motionBlock.
2016-10-17 21:18:31 +02:00
Norman Jäckel 20f8875dcd Added view to follow recommendations.
for all motions of a motion block
2016-10-17 21:02:50 +02:00
Emanuel Schuetze 0270c31b32 Template improvements for motion blocks.
Fixed $stateProvider to allow camelCase in state name (Fixed #2479)
- Refactor generic templateUrl function.
- Rename MotionBlock templates.
- Rename MotionBlock controller.
2016-10-17 20:58:10 +02:00
Norman Jäckel 700c86a24c New feature blocks for motions.
- Added ListView, DetailView, UpdateForm and connection to
  agenda item for MotionBlock.
- Added slide and projection default.
- Added custom manager for motion blocks.
- Enabled current list of speakers slide and overlay for motion block.
2016-10-17 20:54:26 +02:00
Norman Jäckel 8d494ddef9 Merge pull request #2511 from FinnStutzenstein/Issue2465
Rename AdditionalId to arg (closes #2465)
2016-10-17 20:45:23 +02:00
Emanuel Schütze 34b074faec Merge pull request #2501 from CatoTH/change-recommendations-pr
Change recommendations (WIP)
2016-10-17 20:06:01 +02:00
Tobias Hößl 228abf5cee Change recommendations 2016-10-17 19:37:32 +02:00
Norman Jäckel e944f6368b Merge pull request #2509 from matakuka/majorities
Majorities (issue #2258)
2016-10-17 17:15:15 +02:00
Emanuel Schütze 7ada65a628 Optimized template and translation for majority feature. 2016-10-17 17:03:42 +02:00
Norman Jäckel 45aa4146da Refactored majority calculation. Added cache for MotionPollDetailCtrl. 2016-10-17 17:03:42 +02:00
Maximilian Krambach e5e1e3e8ba Majority test for motions 2016-10-17 17:03:31 +02:00
Norman Jäckel 639748bb3b Added view to clear the chatbox. 2016-10-17 16:56:19 +02:00
FinnStutzenstein 7965fd3fce Button for deleting chat history 2016-10-17 15:04:06 +02:00
Norman Jäckel d2ee235293 Merge pull request #2510 from emanuelschuetze/protocol
Support https as websocket protocol (wss).
2016-10-17 11:52:02 +02:00
Emanuel Schütze 208d94a91b Support https as websocket protocol (wss). 2016-10-17 11:31:27 +02:00
FinnStutzenstein 5272a3c1bb key value switched in angular foreach (fixes #2470) 2016-10-17 08:58:43 +02:00
FinnStutzenstein 7fcbed051c Rename AdditionalId to arg (closes #2465) 2016-10-17 08:10:52 +02:00
Emanuel Schütze c2a1675e37 Merge pull request #2507 from boehlke/master
password change command
2016-10-14 16:41:22 +02:00
André Böhlke cced97d9fb password change command 2016-10-14 16:01:46 +02:00
Norman Jäckel 447339ec33 Merge pull request #2508 from tsiegleauq/userListPdfMake
Create the user list over pdfmake
2016-10-14 11:50:31 +02:00
Emanuel Schütze ac60fb53da Merge pull request #2489 from matakuka/issue2211-multiprojector
list-of-speakers overlay (issue #2211, Version 4)
2016-10-13 09:34:40 +02:00
Sean Engelhardt 54fc500d04 Create the user list over pdfmake 2016-10-12 16:52:24 +02:00
Maximilian Krambach 88674da36a list-of-speakers overlay (fixes #2211) 2016-10-12 15:45:21 +02:00
Norman Jäckel 1a54d1f4c6 Merge pull request #2505 from emanuelschuetze/fix-autoupdate-for-polls
Fixed autoupdate for motion and assigment polls.
2016-10-12 11:34:09 +02:00
Emanuel Schuetze d2acbdda70 Fixed autoupdate for motion and assigment polls.
Send autoupdate once only after all votes are saved. Disable
autoupdate for saving incompleted vote results.
2016-10-12 11:23:53 +02:00
Emanuel Schütze 6f70fb630c Merge pull request #2498 from tsiegleauq/agendaPDFmake
Generate agendas using pdfmake
2016-10-12 10:27:46 +02:00
Emanuel Schütze d06f1c5c83 Merge pull request #2503 from boehlke/master
remove run.sh from Dockerfile
2016-10-12 10:17:20 +02:00
André Böhlke 3622b62246 remove run.sh from Dockerfile 2016-10-12 09:58:06 +02:00
Sean Engelhardt 345328357f Generate agendas using pdfmake 2016-10-11 18:10:33 +02:00
Norman Jäckel 49a811d81e Merge pull request #2499 from ThomasJunk/authors
authors edited
2016-10-10 21:05:17 +02:00
Thomas Junk 0031530d1e authors edited 2016-10-10 16:31:13 +02:00
Norman Jäckel 1b218843ef Merge pull request #2491 from emanuelschuetze/template-fixes
Template fixes
2016-10-07 20:07:11 +02:00
Norman Jäckel 35106cda3b Merge pull request #2493 from emanuelschuetze/fix-2492
Fixed typo in projector autoupdate (Fixes #2492)
2016-10-07 18:30:37 +02:00
Emanuel Schuetze af10c5aa3d Fixed typo in projector autoupdate (Fixes #2492) 2016-10-07 17:02:55 +02:00
Emanuel Schuetze f7d10b417e Template fixes
- motion list: show category and tags dropdown for manager only
- manage projector: fix submenu buttons and css classes
2016-10-07 11:42:33 +02:00
Norman Jäckel e644d1f14c Merge pull request #2445 from FinnStutzenstein/Issue2413
Using a datetimepicker for agenda start time
2016-10-06 22:30:22 +02:00
FinnStutzenstein f1c58f98e8 Using a datetimepicker for agenda start time (closes #2413 and fixes #2440) 2016-10-06 22:12:51 +02:00
Emanuel Schütze ef7db04cdc Merge pull request #2490 from emanuelschuetze/update-de-translations-2
Updated missing German translations.
2016-10-06 22:02:18 +02:00
Emanuel Schuetze 0a2759c3ce Updated missing German translations. 2016-10-06 21:12:31 +02:00
Norman Jäckel 74b80bdb50 Merge pull request #2488 from tsiegleauq/evacuatePDF
moves pdfmake related code in own files (fixes #2307)
2016-10-05 15:38:08 +02:00
Sean Engelhardt 5040caba5c moves pdfmake related code in own files (fixes #2307) 2016-10-05 11:27:22 +02:00
Oskar Hahn 8f4b2511f0 Merge pull request #2477 from ostcar/send_many
Support to send many objects through the autoupdate system
2016-10-04 18:19:41 +02:00
Oskar Hahn e209dd6dfe Support to send many objects through the autoupdate system 2016-10-04 18:10:04 +02:00
Norman Jäckel a78cd7a9a1 Merge pull request #2485 from emanuelschuetze/minorFixes
Minor changes
2016-10-04 16:12:25 +02:00
Norman Jäckel b743d8542f Merge pull request #2484 from emanuelschuetze/gulp-production-fix
Does not use gulp 'production' flag for openslides.js.
2016-10-04 16:11:03 +02:00
Emanuel Schuetze 8c9f50e737 Does not use gulp 'production' flag for openslides.js.
Comment out uglify function for openslides.js.
Added TODO that all OpenSlides js files needed rework before uglified code works correctly.
2016-10-04 15:11:57 +02:00
Emanuel Schuetze d7a22c371e Minor changes
- Show workflow field in motion form only if more than one workflows
  exists.
- Reorder the fields category, tags and origin in motion detail.
- Fix translation string 'Line numbering'.
- Fix padding in motion list.
2016-10-04 15:06:50 +02:00
Emanuel Schütze d0f4b59413 Merge pull request #2483 from emanuelschuetze/update-de-translations
Updated German tranlsations.
2016-10-04 13:28:46 +02:00
Emanuel Schuetze 2b206a9e72 Updated German tranlsations. 2016-10-04 13:22:39 +02:00
Emanuel Schütze 80cd22f780 Merge pull request #2482 from emanuelschuetze/translation-resources-2
Fixed translation strings. Updated template-en.pot.
2016-10-04 12:13:51 +02:00
Emanuel Schuetze 4075c1aa3f Fixed translations strings. Updated template-en.pot. 2016-10-04 12:04:55 +02:00
Emanuel Schütze 0c42f0b972 Merge pull request #2481 from emanuelschuetze/translation-resources
Updated translation resource files.
2016-10-04 11:24:57 +02:00
Emanuel Schuetze 72651f5bbc Updated translation resource files. 2016-10-04 11:16:03 +02:00
Emanuel Schütze e64a1bf19c Merge pull request #2478 from emanuelschuetze/ui-improvements
UI improvements
2016-10-04 10:59:21 +02:00
Emanuel Schuetze bc72089973 UI improvements
- item list: reorder buttons
- motion list:
  * move hover menu for edit/delete below submitters
  * limit submitters to one
- motion detail:
  * show ol flush left
  * use 2 or 3 columns in meta box
  * use small buttons for line numbering controls
  * group line number controls in grey tool bar.
  * Show motion comments div only if user is allowed.
- motion config:
  * Deativate comments by default.
  * Deactivate recommendations for motions by default.
- item detail: Show needed buttons only.
- assignment detail: Improve ballot tabs.
- general:
  * move pdf button to right
  * move 'back to overview' button to left
  * update label vor countdown option
2016-10-04 10:51:19 +02:00
Oskar Hahn c4f6477a4d Merge pull request #2475 from normanjaeckel/FixBroadcast
Fixed broadcast. Fixed #2467.
2016-10-01 15:49:07 +02:00
Oskar Hahn 45df53ab45 Merge pull request #2474 from ostcar/send_full_data_through_channel
Send full_data through the channel.
2016-10-01 15:44:34 +02:00
Norman Jäckel 2e7555e720 Fixed broadcast. Fixed #2467. 2016-10-01 14:37:04 +02:00
Oskar Hahn 962deca506 Send full_data through the channel.
Saves db queries.
2016-10-01 13:57:53 +02:00
Norman Jäckel 5879702354 Merge pull request #2473 from ostcar/fix_config_cache_key
Fix config cache key.
2016-10-01 13:02:48 +02:00
Oskar Hahn 97bd526dd7 Fix config cache key 2016-10-01 12:37:43 +02:00
Norman Jäckel ab164e4e88 Merge pull request #2404 from ostcar/cache2
Added caching system.
2016-10-01 09:44:57 +02:00
Oskar Hahn 98bab9b358 Fix tests and remove old code. 2016-10-01 01:49:27 +02:00
Norman Jäckel 039795beb7 Refactored projector requirements system for autoupdate. 2016-10-01 01:49:17 +02:00
Oskar Hahn ac9c9f4ec3 More tests, development instructions and small changes. 2016-10-01 01:48:30 +02:00
Norman Jäckel 7cd70a568c Added docstrings. Small changes. 2016-10-01 01:48:18 +02:00
Oskar Hahn 368873e738 Adds a cache system to the CollectionElement and add
a Collection class that can be used to call a collection
used this for the list and receive rest api.
2016-09-30 21:37:52 +02:00
Norman Jäckel 2a5bd6d94b Merge pull request #2379 from FinnStutzenstein/Multiprojector
Multiprojector
2016-09-30 21:26:43 +02:00
Emanuel Schuetze 720c7e76a5 Hot fix for broadcast (will improved later). 2016-09-30 21:20:30 +02:00
Emanuel Schuetze 6f2a509ebf Fix mediafile control buttons for fullscreen and play. 2016-09-30 19:59:53 +02:00
Norman Jäckel 8427ffd816 Small changes for multiple projector feature. 2016-09-30 19:11:33 +02:00
Finn Stutzenstein e6b9b21d41 Added support for multiple projectors. 2016-09-30 18:58:59 +02:00
Emanuel Schütze 447d475321 Merge pull request #2461 from FinnStutzenstein/minorFixes
some minor fixes
2016-09-30 17:37:27 +02:00
Norman Jäckel 188f605973 Merge pull request #2446 from tsiegleauq/issue2441-LineNumberBlankText
PDF line numbers for new linenumbering.js (fixes #2441)
2016-09-30 17:35:53 +02:00
Emanuel Schuetze 8f24039493 Remark for PR#2446: Check if 'highlight' is undefined. 2016-09-29 14:46:32 +02:00
FinnStutzenstein 84cd3dbc77 little fixes 2016-09-28 19:27:40 +02:00
Norman Jäckel f4c6c35584 Merge pull request #2449 from emanuelschuetze/fixTranslations
Minor fixes
2016-09-28 13:17:59 +02:00
Emanuel Schuetze 4732c64617 Minor fixes
- Fix translation strings.
- Fix dropdown style in motion table.
2016-09-27 15:21:52 +02:00
sean 7ea1a7e481 PDF line numbers for new linenumbering.js (fixes #2441) 2016-09-27 12:59:21 +02:00
Emanuel Schütze 4a5aea0b81 Merge pull request #2444 from FinnStutzenstein/Issue2442
Hotfix for issue #2442
2016-09-27 12:03:32 +02:00
Norman Jäckel 6595e838ed Merge pull request #2443 from FinnStutzenstein/lodashfix
renamed contains to includes
2016-09-27 11:58:13 +02:00
Norman Jäckel 420090552b Merge pull request #2439 from emanuelschuetze/fix-tinymce-gulp-task
Fixed tinymce gulp task
2016-09-27 11:57:36 +02:00
FinnStutzenstein 673ee1da18 hotfix 2016-09-27 11:47:57 +02:00
FinnStutzenstein 54989601a1 renamed contains to includes 2016-09-27 11:39:13 +02:00
Emanuel Schuetze 0cb2c659d8 Fixed tinymce gulp task 2016-09-27 10:50:00 +02:00
Norman Jäckel a02a39e7ae Merge pull request #2438 from emanuelschuetze/fixAssignmentPollSlide
Fix to show invalid/valid/casted votes on assignment slide.
2016-09-26 20:51:47 +02:00
Norman Jäckel 8398e3abf0 Merge pull request #2436 from tsiegleauq/issue2433-PdfInvalidHTML
Repairs invalid HTML during PDF generation (fixes #2433)
2016-09-26 20:51:04 +02:00
Norman Jäckel 4a1cad2988 Merge pull request #2437 from emanuelschuetze/fix2435
Fixed AttributeError in MotionAccessPermissions (Fixed #2435)
2016-09-26 20:49:48 +02:00
Emanuel Schuetze 841ec00b22 Fix to show invalid/valid/casted votes on assignment slide. 2016-09-26 20:41:42 +02:00
Emanuel Schuetze 31361f9f54 Fixed AttributeError in MotionAccessPermissions (Fixed #2435) 2016-09-26 20:26:59 +02:00
sean d1addf4df6 Repairs invalid HTML during PDF generation (fixes #2433) 2016-09-26 18:53:59 +02:00
Emanuel Schütze 223b168441 Merge pull request #2434 from emanuelschuetze/update-translations
Updated German translations. Fixed some translation strings.
2016-09-26 15:46:38 +02:00
Emanuel Schuetze 148e7f6a9b Updated German translations. Fixed some translation strings. 2016-09-26 15:33:40 +02:00
Emanuel Schütze f305d19856 Merge pull request #2430 from tsiegleauq/issue2299-motion-katalog
Add motion catalog over pdfmake (fixes #2299)
2016-09-26 14:20:46 +02:00
Sean Engelhardt d4c4f944fe Add motion catalog over pdfmake (fixes #2299) 2016-09-26 13:25:58 +02:00
Norman Jäckel ebd8e2680f Merge pull request #2432 from emanuelschuetze/update-translation-resources
Updated translation resources.
2016-09-26 13:10:25 +02:00
Emanuel Schuetze 05326cf706 Updated translation resources.
Fixed some translation strings.
2016-09-26 12:44:23 +02:00
Emanuel Schütze fb2593b5a7 Merge pull request #2429 from normanjaeckel/CheckAssignmentPollSlide
Updated server logic for assignment detail and poll slide. Fixed #2422.
2016-09-24 13:40:59 +02:00
Emanuel Schütze 4363c3498a Merge pull request #2428 from FinnStutzenstein/Issue2425
Removing PDF paragraph numbering (fixes #2425)
2016-09-24 13:39:06 +02:00
Emanuel Schütze 50f5d0a33a Merge pull request #2380 from FinnStutzenstein/Issue2348
New ui element for comments in config (closes #2348)
2016-09-24 13:34:08 +02:00
Norman Jäckel 495ddb7d2d Updated server logic for assignment detail and poll slide. Fixed #2422. 2016-09-23 22:09:38 +02:00
Norman Jäckel e340d83777 Merge pull request #2319 from matakuka/assignment_withoutabstains
Calculate assignment without abstains (if one candidate) (issue #2182)
2016-09-23 16:01:04 +02:00
Norman Jäckel 117489c57e Merge pull request #2427 from FinnStutzenstein/Issue2424
Adding TypeError(fixes #2424)
2016-09-23 15:55:56 +02:00
Norman Jäckel 256a8d9203 Small style changes. 2016-09-23 15:53:04 +02:00
FinnStutzenstein 0966ad82e1 Removing PDF paragraph numbering (fixes #2425) 2016-09-23 15:06:47 +02:00
Emanuel Schütze 5a70125922 Merge pull request #2423 from normanjaeckel/NeedFullUpdate
Implemented need_full_update check. Fixed #2396.
2016-09-23 15:00:17 +02:00
FinnStutzenstein 956cd05119 Adding TypeError(fixes #2424) 2016-09-23 14:50:21 +02:00
Maximilian Krambach e8fa0eca5a New calculate percentage options (fixes issue #2182) 2016-09-23 14:45:49 +02:00
Norman Jäckel 26f615fed4 Merge pull request #2426 from FinnStutzenstein/Issue2420
Fixing the projector sidebar on firefox (closes #2420)
2016-09-23 14:45:25 +02:00
Finn Stutzenstein d13e11beb1 New ui element for comments in config (closes #2348) 2016-09-23 14:37:13 +02:00
Norman Jäckel dc404d21f6 Implemented need_full_update check. Fixed #2396. 2016-09-23 14:36:26 +02:00
Norman Jäckel 66aa42021a Merge pull request #2381 from FinnStutzenstein/Issue2346
Motions docx export with docxtemplater
2016-09-23 14:34:59 +02:00
FinnStutzenstein 8a73ce1be5 Fixing the projector sidebar on firefox (closes #2420) 2016-09-23 14:34:31 +02:00
FinnStutzenstein 448756f17a Docx export with docxtemplater 2016-09-23 14:20:07 +02:00
Norman Jäckel 53ac7c2348 Merge pull request #2117 from lesteenman/extendedMediaFileSupport
Initial attempt at support for image and video files.
2016-09-22 23:28:00 +02:00
Norman Jäckel 7ee80074c8 Merge pull request #2128 from lesteenman/privateMediafiles
Add a 'private' flag to mediafiles.
2016-09-22 23:16:50 +02:00
Emanuel Schütze 2495d7dd7f Merge pull request #2412 from FinnStutzenstein/Issue2109
Agenda duration and estimated time (closes #2109)
2016-09-22 22:40:23 +02:00
Norman Jäckel 17ddef67f7 Merge pull request #2410 from FinnStutzenstein/projectorScale
Allow to scale the projector in the projectorcontainer greater than 100%
2016-09-22 22:01:28 +02:00
Norman Jäckel 349a078f20 Merge pull request #2411 from FinnStutzenstein/Issue2293
Updating lodash (fixes #2293)
2016-09-22 22:00:50 +02:00
Norman Jäckel 926516ac65 Small style changes. 2016-09-22 21:59:36 +02:00
FinnStutzenstein 970f42cacb Agenda duration and estimated time (closes #2109) 2016-09-22 21:59:35 +02:00
Norman Jäckel a4226f5965 Merge pull request #2414 from boehlke/master
Add Dockerfile
2016-09-22 21:34:23 +02:00
Erik Steenman 514eea2105 Add support for image and video files. 2016-09-22 19:03:27 +02:00
André Böhlke 093054222e Add Dockerfile 2016-09-22 17:53:27 +02:00
FinnStutzenstein ceb9e70f6e Updating lodash (fixes #2293) 2016-09-22 12:34:53 +02:00
FinnStutzenstein 457f8735d0 Allow to scale the projector in the projectorcontainer greater than 100% 2016-09-22 11:26:42 +02:00
Emanuel Schütze 8770395274 Merge pull request #2406 from normanjaeckel/MoveCustomSlides
Moved custom slides to own app topics. Renamed them to Topic. Fixed #…
2016-09-21 20:19:59 +02:00
Norman Jäckel cab53f0434 Moved custom slides to own app topics for better app structure.
Renamed model to Topic. Added migrations file. Fixed #2402.
2016-09-21 15:00:23 +02:00
Norman Jäckel 53c4932171 Merge pull request #2360 from FinnStutzenstein/Issue2347
Highlighting and jumping to lines
2016-09-21 14:58:08 +02:00
Norman Jäckel ed7c9926b5 Merge pull request #2409 from FinnStutzenstein/Issue2399
Confirm multiple deletions (fixes #2399)
2016-09-21 14:56:19 +02:00
FinnStutzenstein c3e511628f Confirm multiple deletions (fixes #2399) 2016-09-21 14:43:46 +02:00
Finn Stutzenstein a06806c33b Highlighting and jumping to lines in motions (closes #2347) 2016-09-21 13:58:39 +02:00
Norman Jäckel 2d15bd54a1 Merge pull request #2386 from FinnStutzenstein/sidebarScroll
First attempt to scroll the projector sidebar
2016-09-21 12:40:13 +02:00
Norman Jäckel 96b4fb9fd9 Merge pull request #2376 from tsiegleauq/issue2300-pdf-line-numbers
Add line numbers to pdf (fixes #2300)
2016-09-20 21:15:25 +02:00
Emanuel Schuetze 875b7b2ddd Reduced font-size of outline numbers. 2016-09-20 16:57:57 +02:00
Sean Engelhardt cc5ff21005 Add line numbers to pdf (fixes #2300) 2016-09-20 11:34:19 +02:00
FinnStutzenstein 9347a78d56 Make the sidebar scroll and one typofix 2016-09-19 09:05:55 +02:00
Norman Jäckel 858f4a2b43 Merge pull request #2405 from emanuelschuetze/fixAlerts
Fixed syntax of all uib-alerts.
2016-09-18 22:54:29 +02:00
Norman Jäckel 916857d735 Merge pull request #2407 from emanuelschuetze/disableProjectorReload
Disable projector auto reload after 5 minutes.
2016-09-18 22:53:50 +02:00
Emanuel Schuetze 2a825adde4 Disable projector auto reload after 5 minutes.
Auto reload no longer used because client gets all required data
after reconnection via websocket.
2016-09-18 22:34:54 +02:00
Emanuel Schuetze a7f5d4dd3c Fixed syntax of all uib-alerts.
Required after ui-bootstrap upgrade.
2016-09-18 21:09:37 +02:00
Erik Steenman b48a99f21b Add a 'private' flag to mediafiles.
Only users with the 'mediafiles.can_see_private' permission can create
and view these private mediafiles.
2016-09-18 15:45:54 +02:00
Emanuel Schütze 346dfd6b57 Merge pull request #2401 from normanjaeckel/ChangeConfigManagementCommand
Added management command to change config values. Fixed #2400.
2016-09-18 15:42:07 +02:00
Norman Jäckel 00913a6333 Added management command to change config values. Fixed #2400. 2016-09-18 13:17:21 +02:00
Emanuel Schütze 3bfa055aed Merge pull request #2385 from FinnStutzenstein/Issue2384
Confirm multiple deletions (fixes #2384)
2016-09-18 12:26:45 +02:00
Emanuel Schütze f288cb4967 Merge pull request #2374 from normanjaeckel/LoadJavaScript
Changed loading of JavaScript files.
2016-09-18 12:24:40 +02:00
Norman Jäckel 3d8d7bb695 Merge pull request #2398 from emanuelschuetze/upgrade-requirements
Upgraded requirements.
2016-09-18 12:15:49 +02:00
Norman Jäckel 76250c5851 Changed loading of JavaScript files. 2016-09-18 11:23:51 +02:00
Emanuel Schütze cdf6b79a36 Updated confirm message. 2016-09-18 11:03:30 +02:00
Emanuel Schuetze b936976f37 Upgraded requirements.
Use twisted<16.4 for easier install (without compiling).
Use lowercase name 'openslides' in bower.jspon and packages.json to
prevent warning.
2016-09-18 10:51:47 +02:00
Norman Jäckel edf997524e Merge pull request #2397 from emanuelschuetze/upgrade-js-libs
Upgraded a lot of javascript libs.
2016-09-18 10:41:11 +02:00
Emanuel Schuetze 852b175f3e Upgraded a lot of javascript libs.
Some template fixes required for upgrading ui-bootstrap.
2016-09-18 00:45:00 +02:00
Oskar Hahn 6abb0976c2 Change system for autoupdate on the projector (#2394)
* Second websocket channel for the projector

* Removed use of projector requirements for REST API requests.

Refactored data serializing for projector websocket connection.

* Refactor the way that the projector autoupdate get its data.

* Fixed missing assignment slide title for hidden items.

* Release all items for item list slide and list of speakers slide. Fixed error with motion workflow.

* Created CollectionElement class which helps to handle autoupdate.
2016-09-17 22:26:23 +02:00
Norman Jäckel 6ade5630ff Merge pull request #2395 from emanuelschuetze/fix2069
Fixed motion form to save form with default text (Fixes #2069).
2016-09-17 17:00:59 +02:00
Emanuel Schuetze d1458dcca1 Fixed motion form to save form with default text (Fixes #2069).
Use workaround: Added 'novalidate' to motion form. Otherwise user
can't save form if text editor field contains default value.
2016-09-17 15:45:59 +02:00
Emanuel Schütze 4b0594a83b Merge pull request #2393 from normanjaeckel/FixAutoupdateConnction
Reconnect autoupdate after some migrations. Fixed #2377.
2016-09-17 13:42:51 +02:00
Norman Jäckel 5f65830d47 Reconnect autoupdate after some migrations. Fixed #2377. 2016-09-17 13:36:32 +02:00
Norman Jäckel 27223c35d9 Merge pull request #2364 from CatoTH/motion-detail-behaviour-services
Move inline editing methods into a separate service
2016-09-17 12:17:31 +02:00
Norman Jäckel 7998df03a3 Merge pull request #2382 from FinnStutzenstein/2350
Option to generate multiple new passwords (closes #2350)
2016-09-17 12:05:30 +02:00
Norman Jäckel e0f8dd9e29 Merge pull request #2392 from emanuelschuetze/ui-sref
Use ui-sref instead of ng-click (with $state.go).
2016-09-17 12:02:15 +02:00
Emanuel Schuetze 8e3463b1df Use ui-sref instead of ng-click (with $state.go).
For agenda item list and detail template.
2016-09-17 11:44:33 +02:00
Norman Jäckel 1e87bdca4b Merge pull request #2391 from emanuelschuetze/issue2238
Upgraded to tinymce 4.4.x and tinymce-ui 0.0.17 (Fixes #2238).
2016-09-17 11:19:24 +02:00
Norman Jäckel ca9c946b6f Merge pull request #2390 from emanuelschuetze/agend-item-check
Template checks if user has no permission to see agenda items.
2016-09-17 11:00:53 +02:00
Norman Jäckel f8610dad96 Merge pull request #2389 from emanuelschuetze/motionCommentFixes2
Motion comment permission fixes on server and client.
2016-09-17 10:58:36 +02:00
Norman Jäckel 429fdb31fa Merge pull request #2383 from FinnStutzenstein/Issue2335
Unprivileged users don't see ban icon (fixes #2335)
2016-09-17 10:57:04 +02:00
Emanuel Schuetze 028dd71608 Upgraded to tinymce 4.4.x and tinymce-ui 0.0.17 (Fixes #2238). 2016-09-17 10:47:11 +02:00
Emanuel Schuetze c55e55e91b Template checks if user has no permission to see agenda items. 2016-09-17 10:17:40 +02:00
Emanuel Schuetze 485c6ece87 Motion comment permission fixes on server and client.
- Show motion comment fields in form also for users without can_manage but with
  can_see_and_manage_comments permission.
- Ignore comments data if user is not allowed to send comments (in create view).
2016-09-16 23:35:37 +02:00
Norman Jäckel c66396df80 Merge pull request #2373 from normanjaeckel/CleanupSettings
Updated settings files. Fixed timezone support.
2016-09-16 21:54:33 +02:00
Norman Jäckel d7936c53e3 Updated settings files. Fixed timezone support. 2016-09-16 21:17:00 +02:00
FinnStutzenstein bdeeb53f9b Confirm multiple deletions (fixes #2384) 2016-09-15 14:48:03 +02:00
FinnStutzenstein 3720fd1b0d Right test for false (fixes #2335) 2016-09-13 13:19:51 +02:00
FinnStutzenstein 42f723f3cb Option to generate multiple new passwords (closes #2350) 2016-09-13 12:52:50 +02:00
Tobias Hößl 2605239244 Move inline editing methods into a separate service 2016-09-08 19:22:09 +02:00
Emanuel Schütze 2753af3585 Merge pull request #2277 from FinnStutzenstein/FeatureCSV
Improved motions table with CSV export
2016-09-08 14:47:54 +02:00
Finn Stutzenstein a05a29c99a A new motions table with csv export 2016-09-08 14:38:32 +02:00
Norman Jäckel ddc1f5d0b9 Merge pull request #2367 from emanuelschuetze/motionCommentFixes
Fixes and template improvements for motion comments.
2016-09-08 13:24:08 +02:00
Norman Jäckel b661a6e215 Merge pull request #2370 from normanjaeckel/Issue2315
Migration for new permission matrix
2016-09-08 13:20:49 +02:00
Norman Jäckel 25d3b6d552 Merge pull request #2368 from matakuka/motionComment
Moved MotionComment factory to base.js.
2016-09-08 12:00:10 +02:00
Norman Jäckel cd3c470919 Changed migration coding style. 2016-09-08 11:40:58 +02:00
Maximilian Krambach bcd15d2691 moved MotionComment factory to base.js 2016-09-08 11:25:03 +02:00
Emanuel Schuetze 9ed37c00af Fixes and template improvements for motion comments.
Fixed erros while creating motion as anonymous user.
2016-09-08 11:18:56 +02:00
Emanuel Schütze a0acf75f08 Merge pull request #2366 from normanjaeckel/FixTemplateHooks
Fixed bug in templateHook directive. Fixed #2362.
2016-09-08 10:26:15 +02:00
Finn Stutzenstein 4ffe2b5a80 Migration for new permission matrix 2016-09-08 08:38:17 +02:00
Norman Jäckel 1cdcad7d47 Fixed bug in templateHook directive. Fixed #2362. 2016-09-08 00:58:02 +02:00
Norman Jäckel f6ece5f6b3 Merge pull request #2365 from normanjaeckel/FixSettings
Added password hasher settings. Fixed #2354.
2016-09-08 00:25:01 +02:00
Norman Jäckel f2c17f1787 Added password hasher settings. Fixed #2354. 2016-09-08 00:13:01 +02:00
Norman Jäckel f2c3e535a5 Merge pull request #2344 from normanjaeckel/MotionRecommendation
Added recommendations for motions.
2016-09-07 23:58:14 +02:00
Norman Jäckel 4bed8f6c11 Added recommendations for motions.
Also changed label of former state 'commited a bill' to 'refered to committee'. Fixed #2342.
2016-09-07 23:46:38 +02:00
Norman Jäckel 41cb8b37cd Merge pull request #2283 from normanjaeckel/MotionComments
Added generic fields for comments for motions.
2016-09-07 22:11:59 +02:00
Norman Jäckel ab845b4137 Added generic fields for comments for motions. 2016-09-07 20:43:00 +02:00
Emanuel Schütze 34f85da1d8 Merge pull request #2352 from FinnStutzenstein/Issue2349
Fixing resolving of Config for projector resolution (fixes #2349)
2016-09-07 20:10:53 +02:00
Norman Jäckel 261b23affa Merge pull request #2326 from tsiegleauq/issue2301
Limit image scale in pdf documents (fixes #2301)
2016-09-06 16:41:58 +02:00
Norman Jäckel b880217357 Merge pull request #2325 from tsiegleauq/issue2298
create ballot papers with pdfmake (fixes #2298)
2016-09-06 16:16:48 +02:00
sean 23b7d74890 create ballot papers with pdfmake (fixes #2298) 2016-09-06 16:08:25 +02:00
Finn Stutzenstein fd78ccdb01 Fixing resolving of Config for projector resolution (fixes #2349) 2016-09-06 12:09:50 +02:00
Norman Jäckel 0fddfdd25a Merge pull request #2356 from emanuelschuetze/fix
Fixed missing translation and form errors.
2016-09-06 00:33:40 +02:00
Emanuel Schütze 2c8ab64e9b Merge pull request #2355 from CatoTH/line-break-bugfixes
Bugfixes: line numbering
2016-09-05 23:15:26 +02:00
Emanuel Schuetze d7b092300d Fixed missing translation and form errors. 2016-09-05 23:13:07 +02:00
Tobias Hößl a341071e91 Line-Breaking Bugfix: break before an inline element if the first word of the element exceeds the current line 2016-09-05 20:31:43 +02:00
Tobias Hößl b701127f04 Fix a styling problem 2016-09-05 20:03:41 +02:00
Norman Jäckel 54dd21dce0 Merge pull request #2336 from normanjaeckel/SerializerRefactoring
Refactored user serializers for different client permissions. See #1871.
2016-09-05 15:31:17 +02:00
Norman Jäckel b4d4026316 Refactored user serializers for different client permissions. See #1871. 2016-09-05 13:48:06 +02:00
Norman Jäckel 29f9203377 Merge pull request #2314 from FinnStutzenstein/Issue2137
new change password view (fixes #2137)
2016-09-05 13:46:15 +02:00
Norman Jäckel d383aec23a Merge pull request #2345 from matakuka/fullscreenicon
New fullscreen icon (fixes #2316)
2016-09-05 13:37:07 +02:00
Maximilian Krambach 8ec5cd3ccd new fullscreen icon (fixes #2316) 2016-09-05 09:25:39 +02:00
Finn Stutzenstein 9d3b06c0a6 new change password view (fixes #2137) 2016-09-05 07:56:28 +02:00
Norman Jäckel 8974ce60a8 Merge pull request #2340 from emanuelschuetze/event-name
Increase the allowed characters for event name config to 100.
2016-09-01 23:50:26 +02:00
Emanuel Schuetze 7abdc2e615 Increase the allowed characters for event name config to 100.
Same limit as event_description.
2016-09-01 15:32:59 +02:00
Norman Jäckel c87111e81d Merge pull request #2318 from FinnStutzenstein/projectorSize
Control the resolution of the projector
2016-09-01 14:59:53 +02:00
Finn Stutzenstein a8dcc2abdc Control the resolution of the projector 2016-08-31 14:18:29 +02:00
Norman Jäckel 31e47e0ac5 Merge pull request #2308 from FinnStutzenstein/Issue1213
Handle duplicates during user import (fixes #1213)
2016-08-31 13:05:03 +02:00
Norman Jäckel 08c6fa11b4 Merge pull request #2291 from normanjaeckel/MotionAmendment
Reimplemented amendments for motions.
2016-08-31 12:39:48 +02:00
Norman Jäckel 2488b8788b Fixed tests. 2016-08-31 12:35:10 +02:00
Finn Stutzenstein 78ec30d6b2 Handle duplicates during user import 2016-08-31 12:23:38 +02:00
Emanuel Schuetze e87eb930df Use neutral (untranslated) prefix for amendments.
Reason: Server cannot use the on client-side translated prefix string.
2016-08-31 12:05:33 +02:00
Emanuel Schuetze 24b95e5fbc Scale image size also in detail and projector view. 2016-08-31 09:58:26 +02:00
sean 33f463599a limit image scale in pdf documents (fixes #2301) 2016-08-30 12:54:55 +02:00
Norman Jäckel 30c4c893a8 Merge pull request #2328 from FinnStutzenstein/Issue1717
Update angular-ui-tree (fixes #1717)
2016-08-29 20:30:07 +02:00
Emanuel Schütze 2a436720f7 Merge pull request #2333 from normanjaeckel/FixGroupOptions
Fixed groups metadata view. Upgraded to djangorestframework 3.4.x. Fi…
2016-08-29 18:36:15 +02:00
Norman Jäckel 09aa2dea72 Review. 2016-08-29 17:15:44 +02:00
Norman Jäckel 6fba75c78b Reimplemented amendments for motions. 2016-08-29 17:14:40 +02:00
Norman Jäckel ac6d78b0ee Fixed groups metadata view. Upgraded to djangorestframework 3.4.x. Fixed #2275. 2016-08-29 17:06:33 +02:00
Norman Jäckel 9fdc050048 Merge pull request #2330 from normanjaeckel/FixAutoupdate
Fixed autoupdate for deleted instances. Fixed #2329.
2016-08-29 16:59:28 +02:00
Norman Jäckel 70dfe8f525 Merge pull request #2331 from emanuelschuetze/issue2182b
Motion config: 'calculate % without abstains' (Fixes #2182)
2016-08-29 16:59:12 +02:00
Emanuel Schütze ad9181182f Merge pull request #2332 from emanuelschuetze/assignmentDetailHook
Added template hook for each poll in assignment detail.
2016-08-29 16:41:35 +02:00
Emanuel Schuetze 65b0772556 Some clean up and styling work for motion config 'without abstains'.
Manage all config strings in site.js of each app.
2016-08-29 16:40:27 +02:00
Norman Jäckel 3ea46e9dc7 Fixed autoupdate for deleted instances. Fixed #2329. 2016-08-29 16:37:53 +02:00
Emanuel Schuetze 344d9329f9 Added template hook for each poll in assignment detail. 2016-08-29 16:26:13 +02:00
Maximilian Krambach fc1ce3d90d added option to calculate % based on Yes/No (for motions) (fixes #2182) 2016-08-29 13:07:57 +02:00
Finn Stutzenstein ee8481768a Update angular-ui-tree (fixes #1717) 2016-08-29 09:26:13 +02:00
Norman Jäckel 67c6262c0f Merge pull request #2317 from emanuelschuetze/templateHook-assignment
Added template hook for assignment poll form.
2016-08-26 16:13:49 +02:00
Emanuel Schuetze f0ca4a0d98 Added template hook for assignment poll form. 2016-08-26 06:33:27 +02:00
Emanuel Schütze 6efbe7b210 Merge pull request #2255 from matakuka/search_filter
Added search filtering by category (fixes #2019, fixes #2239)
2016-08-25 17:53:55 +02:00
Emanuel Schütze d23324bf2a Merge pull request #2235 from matakuka/issue2212
Current list of speakers view (fixes #2212)
2016-08-25 17:53:14 +02:00
Maximilian Krambach e06b4db664 Added search filtering by category (fixes #2019, fixes #2239) 2016-08-25 17:49:36 +02:00
Maximilian Krambach 3221ce18f6 new view for current list of speakers (fixes #2212) 2016-08-25 17:35:57 +02:00
Emanuel Schütze acf24a26ee Merge pull request #2313 from emanuelschuetze/update-translations
Updated translations for DE, ES, PT (used by JS, Django).
2016-08-25 17:29:43 +02:00
Emanuel Schuetze 53d5946116 Remove old test for checking translation string on server-side.
(Config translations are moved to client-side.)
2016-08-25 17:24:07 +02:00
Emanuel Schütze d4870db662 Merge pull request #2268 from matakuka/issue2213
Parent items for Agenda items (fixes #2213)
2016-08-25 17:22:54 +02:00
Maximilian Krambach 126cfb9000 Parent items for Agenda items (fixes #2213) 2016-08-25 13:51:54 +02:00
Norman Jäckel e63c1438f5 Merge pull request #2312 from tsiegleauq/pdfmake_pdfmake
Migrate to pdfmake/pdfmake
2016-08-25 12:44:33 +02:00
Emanuel Schuetze cfdb90f6a7 Updated translations for DE, ES, PT (used by JS, Django). 2016-08-25 09:34:58 +02:00
Emanuel Schütze 391decc0a3 Merge pull request #2311 from emanuelschuetze/translation-fixes
Fixed and updated EN translations.
2016-08-25 09:16:10 +02:00
Sean Engelhardt 97b8d39d0b Migrate to pdfmake/pdfmake 2016-08-24 17:07:26 +02:00
Emanuel Schuetze 1d0dacbc2d Fixed and updated EN translations. 2016-08-24 16:55:56 +02:00
Emanuel Schütze 5afffaba84 Merge pull request #2309 from emanuelschuetze/en-translation-strings
Updated EN translations for transifex
2016-08-24 16:20:30 +02:00
Emanuel Schuetze 841feaba92 Updated EN translations 2016-08-24 16:04:01 +02:00
Norman Jäckel f193d200d0 Merge pull request #2305 from emanuelschuetze/readme
Fixed typos and formatting in README.
2016-08-24 10:42:27 +02:00
Norman Jäckel 03acd88771 Merge pull request #2304 from FinnStutzenstein/Issue2275
Limit the version of djangorestframework (fixes #2275)
2016-08-24 10:40:28 +02:00
Norman Jäckel e9c5194a17 Merge pull request #2303 from emanuelschuetze/template-hook
Added new template hook for motion detail template.
2016-08-24 09:35:27 +02:00
Emanuel Schuetze 720307e037 Fixed typos and formatting in README. 2016-08-24 08:24:23 +02:00
Finn Stutzenstein 4ad625b239 Limit the version of djangorestframework (fixes #2275) 2016-08-24 08:23:41 +02:00
Emanuel Schütze 5a092710c9 Merge pull request #2286 from FinnStutzenstein/Issue2075
Fixing motion CSV import (fixes #2075, fixes #2165)
2016-08-23 23:17:32 +02:00
Emanuel Schuetze 984282deac Added new template hook for motion detail template. 2016-08-23 23:08:17 +02:00
Finn Stutzenstein 0c5726b5d4 Fixing CSV import (fixes #2075, fixes #2165) 2016-08-22 16:01:57 +02:00
Emanuel Schütze 73095948ca Merge pull request #2260 from FinnStutzenstein/Feature435
New matrix interface for group editing (closes #435)
2016-08-22 15:26:10 +02:00
Finn Stutzenstein bf3a1ce714 New matrix interface for group editing (closes #435) 2016-08-22 15:05:06 +02:00
Norman Jäckel 81570318b2 Merge pull request #2292 from CatoTH/line-numbers-merged
Line numbers and inline editing
2016-08-20 11:36:28 +02:00
Tobias Hößl d986d551e0 Line numbers and inline editing 2016-08-20 11:18:17 +02:00
Norman Jäckel 5ea9cbf4d1 Merge pull request #2289 from emanuelschuetze/motionpdf
Minor motion PDF improvements.
2016-08-19 22:42:56 +02:00
Emanuel Schuetze 8a329a81e6 Minor motion PDF improvements. 2016-08-19 22:13:12 +02:00
Norman Jäckel 70a732bce8 Merge pull request #2280 from normanjaeckel/TemplateHook
Added template hooks for plugins.
2016-08-19 21:13:55 +02:00
Norman Jäckel c38cf562d5 Added template hooks for plugins. 2016-08-19 21:08:54 +02:00
Norman Jäckel fac2b694d0 Merge pull request #2284 from ThomasJunk/pdfmake
Implement Pdfmake
2016-08-19 17:16:24 +02:00
Thomas Junk 92a541215f pdfmake incl. fixes 2016-08-19 16:21:46 +02:00
Thomas Junk 546c4e65f6 PDFMake implemented 2016-08-19 14:10:30 +02:00
Emanuel Schütze 08c734f1a3 Merge pull request #2282 from FinnStutzenstein/Issue2259
fixes an important typo in category sort
2016-08-19 09:41:55 +02:00
Finn Stutzenstein cd1a2735dc fixes an important typo in category sort 2016-08-19 09:17:28 +02:00
Norman Jäckel 21bbd4706c Merge pull request #2276 from FinnStutzenstein/Issue2259
Added a possibility to sort and renumber all motions in a category (closes #2259)
2016-08-18 16:59:12 +02:00
Finn Stutzenstein ee95af9acc Added a possibility to sort and renumber all motions in a category 2016-08-18 14:54:09 +02:00
Emanuel Schütze 71c3aa5d5e Merge pull request #2273 from normanjaeckel/NumberingCategories
Added possibility to sort motions in category numbering view.
2016-08-17 08:55:19 +02:00
Oskar Hahn ff658a59c1 The start command uses only one worker (#2271)
Fixes #2198 after https://github.com/andrewgodwin/channels/pull/298 is
part of the next channels release
2016-08-17 07:48:59 +02:00
Norman Jäckel b0070d13b9 Added possibility to sort motions in category numbering view. 2016-08-16 23:51:12 +02:00
Norman Jäckel 91ebfbac61 Merge pull request #2272 from ostcar/missing_migrations
Added missing migrations for #2269.
2016-08-16 00:22:47 +02:00
Norman Jäckel aea602acb9 Merge pull request #2256 from ostcar/fix_2248
Only do an autoupdate after an ongoing transaction.
2016-08-16 00:14:15 +02:00
Oskar Hahn 8d58368937 Added missing migrations for #2269 2016-08-15 19:15:05 +02:00
Emanuel Schütze 243ef7ae5d Merge pull request #2257 from FinnStutzenstein/Issue2249
No crash without a browser (fixes #2249)
2016-08-15 09:47:17 +02:00
Oskar Hahn ee2f6b500b Only do an autoupdate after an ongoing transaction.
This needs at least django 1.9

Fixes: #2248
2016-08-13 10:08:10 +02:00
Norman Jäckel f34621f483 Merge pull request #2270 from ostcar/update_requirements
Update requirements
2016-08-13 09:22:37 +02:00
Norman Jäckel 9de7723b7a Merge pull request #2266 from FinnStutzenstein/Issue2238
Downgrade tinymce-dist to 4.3.12 to avoid Issue #2238
2016-08-13 09:17:03 +02:00
Oskar Hahn 46146c6745 Update requirements
Also fix min_requirements script

We do not support django 1.10.0 because of this bug:
https://code.djangoproject.com/ticket/26997

This will be fixt with django 1.10.1, see:
https://docs.djangoproject.com/en/1.10/releases/1.10.1/
2016-08-13 09:15:55 +02:00
Norman Jäckel 4e9ff68435 Merge pull request #2269 from ostcar/fix_2262
Removed default permissions for session.
2016-08-13 09:13:43 +02:00
Oskar Hahn fac9e71c29 Remove default permissions for session
fixes #2262
2016-08-13 07:37:27 +02:00
Finn Stutzenstein a22ba2a59d Downgrade tinymce-dist to 4.3.12 to avoid Issue #2238 2016-08-11 11:58:44 +02:00
Emanuel Schütze d2c5646ce4 Merge pull request #2254 from matakuka/mini_issues
Repairs assignment ballots for candidates with structure_level
2016-08-09 20:43:33 +02:00
Emanuel Schütze 320de66783 Merge pull request #2261 from emanuelschuetze/config-translations
Fixed missing translations of config options (Fixes #2193)
2016-08-09 20:18:49 +02:00
Emanuel Schuetze 282bc45790 Fixed missing translations of config options (Fixes #2193, fixes #2245) 2016-08-09 17:06:24 +02:00
Norman Jäckel 9813edf490 Merge pull request #2252 from ThomasJunk/mediafix
Added static media handling (Fixes 2223)
2016-08-09 16:03:22 +02:00
Thomas Junk dec7cb9002 Added static media handling (Fixes #2223)
Now DEBUG compatible

Commit fe64941aab
replaced former use of tornado as webserver with django channels.
During this, the additional routing path for /media/ was forgotten.
This is now fixed.

Due to the routing scheme, the static URLS were added beforehand.
Adding it afterwards does not work.
2016-08-09 14:56:18 +02:00
Finn Stutzenstein 12af0256dd No crash without a browser (fixes #2249) 2016-08-09 08:22:04 +02:00
Emanuel Schütze 54ee068057 Merge pull request #2243 from FinnStutzenstein/master
Fixing issue #2127
2016-08-05 16:13:19 +02:00
Finn Stutzenstein b115691675 Messages now allow HTML tags (Fixes #2127) 2016-08-05 12:38:19 +02:00
Maximilian Krambach 350a60722c repairs ballots for candidates with structure_level 2016-08-05 09:53:10 +02:00
Norman Jäckel 81bcb19847 Merge pull request #2221 from matakuka/issue2214
Added user field "number" (fixes #2214)
2016-08-04 10:21:17 +02:00
Emanuel Schütze 6cec9e9f87 Merge pull request #2251 from normanjaeckel/WooshAsync
Used whoosh.writing.AsyncWriter. See #2198.
2016-08-03 21:42:58 +02:00
Emanuel Schütze c06d05a8e6 Merge pull request #2250 from normanjaeckel/FixAutoupdate
Fixed error in autoupdate. See #2248.
2016-08-03 21:23:28 +02:00
Maximilian Krambach 371945e36e adding user field "number" (fixes #2214) 2016-08-03 16:55:03 +02:00
Norman Jäckel 7f1b894db4 Used whoosh.writing.AsyncWriter. See #2198. 2016-08-03 16:46:52 +02:00
Norman Jäckel f191956dd9 Fixed error in autoupdate. See #2248. 2016-08-03 16:12:52 +02:00
Norman Jäckel e688a345c0 Merge pull request #2230 from emanuelschuetze/remove-assignment-config
Remove unused assignment config to publish winner results only.
2016-08-03 15:58:35 +02:00
Norman Jäckel fdfdd2e2a5 Merge pull request #2204 from joelmacht/is#2110
Add tags for assignments (partly fixes Issue #2110)
2016-08-03 15:54:59 +02:00
joelmacht 19592f1eea Add tags for assingments 2016-08-03 14:48:12 +02:00
Norman Jäckel 51c466f7cf Merge pull request #2242 from matakuka/translations
translations (fixes #2197)
2016-08-02 19:03:59 +02:00
Maximilian Krambach f2f7ddf072 translations issue #2197 2016-08-01 16:23:20 +02:00
Norman Jäckel d3cd2d72dc Merge pull request #2225 from normanjaeckel/NumberCategories
Added viewpoint to number all motions in a category.
2016-07-29 12:30:09 +02:00
Emanuel Schuetze 8d52d4a1c6 Remove unused assignment config to publish winner results only. (Fixes #2145) 2016-07-29 12:29:53 +02:00
Norman Jäckel 646540ee17 Merge pull request #2233 from emanuelschuetze/motionOrigin
Use origin field in motion detail and list view (Fixes #2227)
2016-07-29 12:16:19 +02:00
Norman Jäckel 7e6dc50b39 Added viewpoint to number all motions in a category. 2016-07-29 11:56:12 +02:00
Norman Jäckel b96d7d0514 Merge pull request #2216 from normanjaeckel/IsCommittee
Added new user field is_committee and new default group Committees.
2016-07-29 11:55:00 +02:00
Norman Jäckel 6e241d618e Fixed CHANGELOG. 2016-07-29 11:39:37 +02:00
Emanuel Schuetze 88715646ba Show user fields is_committee and is_active in list view. (Fixes #2217)
New icon for is_committee and is_active.
Check is_committee field for csv import.
2016-07-29 11:37:51 +02:00
Norman Jäckel 4b9767b09e Added new user field is_committee and new default group Committees. 2016-07-29 11:37:51 +02:00
Emanuel Schütze aca01c466c Merge pull request #2222 from matakuka/issue2210
add "delete all speakers" button (feature, issue #2210)
2016-07-28 11:11:31 +02:00
Maximilian Krambach 589137ece7 add "delete all speakers" button (fixes #2210) 2016-07-28 10:51:33 +02:00
Emanuel Schuetze af16733b36 Use origin field in motion detail and list view (Fixes #2227) 2016-07-27 16:16:22 +02:00
Emanuel Schütze 45321b6139 Merge pull request #2226 from normanjaeckel/MotionOrigin
Added motion origin field.
2016-07-27 16:14:31 +02:00
Emanuel Schütze 2d5268609a Merge pull request #2231 from emanuelschuetze/de-translations
Updated German translations.
2016-07-27 14:19:40 +02:00
Emanuel Schuetze 8208f44108 Updated German translations. 2016-07-27 14:10:04 +02:00
Emanuel Schütze 152943fe93 Merge pull request #2232 from emanuelschuetze/fix-travis
Fix travis: upgrade setuptools before install
2016-07-27 14:09:18 +02:00
Emanuel Schuetze e980e20042 Fix travis: Upgrade setuptools before install.
Upgrade setuptools to 18.5+.
Upgrade beautifulsoup4 to 4.5+ to work with latest html5lib.
2016-07-27 14:00:02 +02:00
Norman Jäckel 0b9a64f968 Added motion origin field. 2016-07-13 14:45:40 +02:00
Norman Jäckel 2627724c55 Merge pull request #2199 from matakuka/noBrowserLanguage
sets language to en if no browser language is set
2016-07-11 14:19:14 +02:00
Norman Jäckel 207db4de89 Merge pull request #2186 from tsiegleauq/issue2164
Add translatable entries for QuickEdit (Fixes #2164)
2016-07-10 23:24:36 +02:00
Maximilian Krambach 31df629fc9 sets language to en if no browser language is set 2016-07-06 09:52:32 +02:00
Norman Jäckel 331141c17c Merge pull request #2208 from ostcar/channels-requirement
Set channel requirement to lower 1.0. We have to use the newest development version
2016-06-28 17:07:57 +02:00
Oskar Hahn 315738acef Set channel requirement to lower 1.0. We have to use the newest development version 2016-06-28 15:29:49 +02:00
Sean Engelhardt 520f8362fa Add translatable entries for QuickEdit (Fixes #2164) 2016-06-28 14:06:46 +02:00
Emanuel Schütze 9c1e8a86a4 Merge pull request #2206 from emanuelschuetze/translation-updates
Fixed and update English translation strings.
2016-06-28 14:05:25 +02:00
Emanuel Schuetze 31657d0cf3 Fixed and update English translation strings. 2016-06-28 10:18:43 +02:00
Emanuel Schütze 99306a745b Merge pull request #2203 from emanuelschuetze/translations
Updated EN source translation files.
2016-06-20 21:44:32 +02:00
Emanuel Schuetze 31c509f288 Updated EN source translation files. 2016-06-20 21:03:43 +02:00
Norman Jäckel d4309cbeb3 Merge pull request #2201 from normanjaeckel/Style
Fixed coding style.
2016-06-17 20:02:04 +02:00
Norman Jäckel 8e297e4a9a Silenced flake 8 errors. Fixed #2202. 2016-06-16 11:03:16 +02:00
Norman Jäckel b45e0ea09f Fixed coding style. 2016-06-16 10:28:14 +02:00
Norman Jäckel 5be8499bb4 Merge pull request #2194 from matakuka/issue-2093
Config translations moved to client side (Issue #2093)
2016-06-16 10:25:52 +02:00
Maximilian Krambach a5a00a7eda Config translations moved to client side (Issue #2093) 2016-06-12 11:46:46 +02:00
Emanuel Schütze 7a94b6511b Merge pull request #2189 from matakuka/YesNoVotes
adding option "yes/no for each candidate"
2016-06-12 11:11:10 +02:00
Norman Jäckel 1afe3572e4 Merge pull request #2190 from joelmacht/issue#2147
Fix linebreak on tags (Fixes #2147)
2016-06-11 21:17:56 +02:00
Joel Macht b7d83e786f Fix linebreak on tags, add spacing and remove commas (Fixes #2147) 2016-06-10 18:17:42 +02:00
Maximilian Krambach 3157ac59f2 adding option "yes/no for each candidate" 2016-06-10 14:13:01 +02:00
Oskar Hahn 9a88717dab Merge pull request #2170 from ostcar/channels
Big Mode for OpenSlides
2016-06-09 11:20:25 +02:00
Oskar Hahn fe64941aab Big Mode for OpenSlides
Uses django channels instead of tornado for the autoupdate. Therefore
tornado is nolonger a dependency of OpenSlides (but channels).

This uses websockets instead of SockJS.

Use the flag insecure in the start command to provide static files serving.

Use a new session backend that has a ForeignKey to User.
2016-06-09 11:14:39 +02:00
Norman Jäckel dbbaeb245c Merge pull request #2191 from matakuka/issue2181
typo fixing (issue #2181)
2016-06-08 22:56:29 +02:00
Maximilian Krambach 5061ea1770 typo fixing (issue #2181) 2016-06-08 22:18:35 +02:00
Norman Jäckel c55bf5f524 Merge pull request #2183 from matakuka/issue-2151-b
Add a back button to tag overview (Fixed #2151)
2016-06-08 21:14:51 +02:00
Maximilian Krambach 649300cfb8 Add a back button to tag overview (Fixed #2151) 2016-06-08 16:41:27 +02:00
Norman Jäckel a8595ab234 Merge pull request #2185 from tsiegleauq/issue2156
Fix pagination when agenda got >100 entrys (Fixes #2156)
2016-06-08 10:45:07 +02:00
Norman Jäckel 13e7e1b1e1 Merge pull request #2176 from tsiegleauq/issue2133
Limit selection of files to csv and txt (Fixed #2133)
2016-06-08 10:41:52 +02:00
Sean Engelhardt 235eed1172 Fix pagination when agenda got >100 entrys (Fixes #2156) 2016-06-07 14:17:36 +02:00
Sean Engelhardt 62310c83ae Limit selection of files to csv and txt (Fixed #2133)
agenda, motions, users csv import
2016-06-07 11:34:02 +02:00
Oskar Hahn 28584c62f6 Merge pull request #2178 from normanjaeckel/FixMotionPDF
Fixed motion PDF if motions have no identifier. Fixed #2158.
2016-06-06 20:51:52 +02:00
Norman Jäckel 294fb7ebc5 Fixed motion PDF if motions have no identifier. Fixed #2158. 2016-06-06 14:26:16 +02:00
Norman Jäckel 03ca4a8174 Merge pull request #2179 from normanjaeckel/FixConfig
Fixed bug on config view.
2016-06-06 14:25:31 +02:00
Norman Jäckel 8c5c5dc556 Fixed bug on config view. 2016-06-06 14:19:57 +02:00
Oskar Hahn f2570551a1 Merge pull request #2175 from ostcar/config
Redesign of the config variables.
2016-06-04 01:12:50 +02:00
Oskar Hahn 2221b23447 Redesign of the config variables.
Removed the config cache and created files for each app in which the
config variables are defined.
2016-06-03 13:47:54 +02:00
Emanuel Schütze cab89834ae Merge pull request #2173 from tsiegleauq/issue2132
Updated German translations (Fixes #2132)
2016-05-31 15:45:33 +02:00
Sean Engelhardt d0c9450d02 Updated German translations (Fixes #2132) 2016-05-31 15:00:38 +02:00
Norman Jäckel 6aeba88f09 Merge pull request #2169 from ostcar/fix_2138
Order speaker on projector
2016-05-29 19:56:47 +02:00
Oskar Hahn 416c2646fe Order speaker on projector
fixes #2138
2016-05-28 19:22:49 +02:00
Emanuel Schütze 61976f47f0 Merge pull request #2144 from normanjaeckel/SettingsFix
Fixed example text in settings.
2016-05-28 15:42:17 +02:00
Norman Jäckel 9f22698a23 Merge pull request #2167 from emanuelschuetze/es-translation
Updated Spanish translation. (Fixes #2094)
2016-05-25 13:55:08 +02:00
Emanuel Schuetze 80b6dcc971 Updated Spanish translation.
Thanks to johnfelipe!

Fixed: Define missing Spanish translation in django settings file.
2016-05-25 09:58:55 +02:00
Norman Jäckel 253d615755 Fixed example text in settings. 2016-05-17 14:16:44 +02:00
Norman Jäckel 08bf53b71e Merge pull request #2101 from lesteenman/fullscreenZIndex2096
Change the z-index of `.fullscreen` to 199.
2016-05-17 14:15:49 +02:00
Erik Steenman c473fc22c0 Fix AUTHORS indentation. 2016-05-14 12:37:58 +02:00
Erik Steenman 4b7ba02b7d Change the z-index of `.fullscreen` to 100.
Z-Index 199 places the fullscreen content just below the various
projector overlays, such as messages and timers.
2016-05-10 14:51:30 +02:00
Norman Jäckel f8c186005a Merge pull request #2087 from emanuelschuetze/readme
Fixed README typo in 'libjpeg-dev' package.
2016-04-20 22:37:06 +02:00
Emanuel Schuetze ab894ec8ca Fixed README typo in 'libjpeg-dev' package. 2016-04-20 21:12:32 +02:00
Norman Jäckel 8548a0390d Merge pull request #2084 from normanjaeckel/Release-2.0
Release 2.0
2016-04-17 22:57:18 +02:00
Norman Jäckel e968c88cc1 Update version to 2.0.1-dev 2016-04-17 22:49:17 +02:00
Norman Jäckel 347cf478f8 Release 2.0 2016-04-17 22:49:17 +02:00
Norman Jäckel a8591c9343 Updated metadata files. 2016-04-17 22:49:17 +02:00
Norman Jäckel 5e487d2f16 Merge pull request #2086 from emanuelschuetze/fixGroups
Use group_id instead of group in User form views
2016-04-17 22:48:46 +02:00
Emanuel Schuetze e0b73ff68a Use group_id instead of group in User form views 2016-04-17 22:42:56 +02:00
Norman Jäckel a832c757e7 Merge pull request #2085 from emanuelschuetze/css-fix
Fix z-index of chatbox and projector sidebar.
2016-04-17 22:23:44 +02:00
Emanuel Schuetze e151e7c84c Fix z-index of chatbox and projector sidebar. 2016-04-17 22:18:16 +02:00
Norman Jäckel 65c9c3c693 Merge pull request #2083 from emanuelschuetze/responsive
Template fixes for better smartphone usage.
2016-04-17 20:50:30 +02:00
Emanuel Schuetze 06d333c067 Template fixes for better smartphone usage.
- Remove on-focus-me directive on every list view.
  (Otherwise smartphones/tablets opens always the keyboard on each list view.)
- Make some columns 'optional' in list view to see only the most important columns
  on small devices.
- Add z-index for projector sidebar. Show it in full width on small
  devices.
- Remove padding on small devices.
2016-04-17 19:56:38 +02:00
Norman Jäckel cbb5f7b567 Merge pull request #2073 from normanjaeckel/Readme
Readme
2016-04-15 20:44:04 +02:00
Norman Jäckel 70bcf731b7 Updated README.rst. Added file for DEVELOPMENT instructions. 2016-04-15 19:53:07 +02:00
Emanuel Schütze 6a118eefb2 Merge pull request #2079 from OpenSlides/support-setuptools-20
Support setuptools 20
2016-04-15 10:27:34 +02:00
Norman Jäckel 5959b19af2 Merge pull request #2082 from emanuelschuetze/fix2081
Use always user.groups_id (Fixes #2081)
2016-04-14 22:59:16 +02:00
Emanuel Schuetze 7ebedb1fdd Use always user.groups_id (Fixes #2081)
- Fix rest api: send always groups_id (instead of groups).
- Fix JS-Data-Store: Add hasMany relations for user.groups.
- Fix templates: use field 'groups_id' instead of 'groups'.
2016-04-14 22:13:28 +02:00
Norman Jäckel 21484c7fdb Merge pull request #2080 from emanuelschuetze/logos
Reduce sizes of used logos.
2016-04-13 17:04:58 +02:00
Emanuel Schuetze 9481d037e8 Reduce sizes of used logos. 2016-04-13 11:06:50 +02:00
Oskar Hahn 2ec6bd256c Support setuptools 20
Fixes #2078
2016-04-13 09:54:38 +02:00
Norman Jäckel 8d5e983d29 Merge pull request #2077 from emanuelschuetze/translations
Translations
2016-04-12 23:47:38 +02:00
Norman Jäckel 84eff37bdc Merge pull request #2076 from emanuelschuetze/fixes
Last fixes for 2.0
2016-04-12 23:45:55 +02:00
Emanuel Schuetze b8194a0b54 Updated all translations (angular-gettext). 2016-04-12 22:58:40 +02:00
Emanuel Schuetze 7229c8dc3a Fix translation strings. 2016-04-12 22:47:46 +02:00
Emanuel Schuetze 7e5ea61b34 Hide candidate list if assignment phase is finished (2). 2016-04-12 22:41:15 +02:00
Norman Jäckel d37746286c Merge pull request #2074 from emanuelschuetze/bower
Use angular 1.4.10
2016-04-12 22:35:10 +02:00
Emanuel Schuetze f5125d0d23 Add content object (motion/election) in agenda sort view. 2016-04-12 22:33:53 +02:00
Emanuel Schuetze 07d95fd10a Allow to show vote value '0' in motion poll result view. 2016-04-12 22:26:13 +02:00
Emanuel Schuetze cbfcc6df68 Use angular 1.4.10 2016-04-12 21:57:22 +02:00
Norman Jäckel 8a03c15c35 Merge pull request #2072 from emanuelschuetze/fix2064
Order of jquery and angular in bower.json is important (Fixes #2064).
2016-04-11 17:29:29 +02:00
Emanuel Schuetze 642650781c Order of jquery and angular in bower.json is important (Fixes #2064).
jquery has to load *before* angular! Otherwise ng-model and ng-change doesn't
work with angular-chosen select elements.
2016-04-11 11:19:59 +02:00
Emanuel Schütze 00fe5a165f Merge pull request #2070 from normanjaeckel/SysExit
Used exit method from sys library. Fixed #2065.
2016-04-07 19:51:27 +02:00
Norman Jäckel 27c8d511f0 Used exit method from sys library. Fixed #2065. 2016-04-07 00:43:53 +02:00
Norman Jäckel b116aabac3 Merge pull request #2068 from emanuelschuetze/gulpfile
Fixes for 2.0
2016-04-07 00:38:00 +02:00
Emanuel Schuetze 3c59f1f75c Set angular-ui-tinymce to v0.0.14 (Fixes #2069). 2016-04-06 22:02:09 +02:00
Emanuel Schuetze c2230c0251 Added missing en.js for tinyMCE. (Fixes #2067) 2016-04-05 20:04:36 +02:00
Emanuel Schuetze cb605d619e Mark missing translation string. 2016-04-03 11:53:40 +02:00
Emanuel Schütze 11ea2fdecf Merge pull request #2063 from normanjaeckel/Release_2.0b5
Release 2.0b5
2016-03-21 21:21:16 +01:00
Norman Jäckel 331da7f300 Update version to 2.0-dev. 2016-03-21 21:13:52 +01:00
Norman Jäckel 5842ad86f4 Release 2.0b5 2016-03-21 21:13:28 +01:00
Norman Jäckel b0c1d3f793 Merge pull request #2062 from normanjaeckel/Readme
Updated README and bower
2016-03-21 21:11:55 +01:00
Norman Jäckel afeb746718 Updated README and bower 2016-03-21 21:07:18 +01:00
Norman Jäckel d51652ff72 Merge pull request #2061 from emanuelschuetze/template-Fixes
Template fixes
2016-03-21 20:03:43 +01:00
Norman Jäckel 36ead3685f Merge pull request #2060 from emanuelschuetze/allTranslations
Updated all translations. (Fixes #2043)
2016-03-21 20:03:25 +01:00
Emanuel Schütze bdf4741dd8 Merge pull request #2059 from normanjaeckel/Changelog
Updated CHANGELOG.
2016-03-21 20:01:49 +01:00
Emanuel Schuetze 4b06fa225f Updated all translations. (Fixes #2043)
Thanks to all translators of FR, PT, CS, ES and DE!
2016-03-21 19:57:45 +01:00
Emanuel Schuetze 0565d57789 Template fixes
- Fix config groups. Use group index instead of group names (with blanks).
- Use 100% width for all chosen fields.
2016-03-21 19:56:53 +01:00
Norman Jäckel 4f0d5fd0ea Updated bower and setup file. 2016-03-21 19:52:06 +01:00
Norman Jäckel cb66facde5 Updated CHANGELOG. 2016-03-21 19:37:42 +01:00
Norman Jäckel aa122263e1 Merge pull request #2057 from emanuelschuetze/fix1987
Use specific host and port for 'openslides start' (Fixes #1987)
2016-03-21 00:22:06 +01:00
Emanuel Schuetze 815f03145c Use specific host and port for 'openslides start'. (Fixes #1987) 2016-03-21 00:06:15 +01:00
Emanuel Schütze 681882fb2d Merge pull request #2058 from emanuelschuetze/translationsEN
Updated EN translation resource files.
2016-03-20 23:36:01 +01:00
Emanuel Schuetze fb0fd3fe8c Updated EN translation resource files. 2016-03-20 23:31:13 +01:00
Norman Jäckel 6d62516499 Merge pull request #2056 from ostcar/master
Fix #2050
2016-03-20 21:22:11 +01:00
Norman Jäckel e2383dc770 Merge pull request #2051 from emanuelschuetze/templateFixes2
Template improvements
2016-03-20 21:21:52 +01:00
Oskar Hahn 46ba039cd5 Fix #2050 2016-03-20 21:08:57 +01:00
Emanuel Schuetze 3479a0636e Allow to enter countdown time in seconds or 'mm:ss' format. 2016-03-20 21:07:20 +01:00
Emanuel Schuetze 2af38f75bb Fix edit current slide button. 2016-03-20 21:07:16 +01:00
Norman Jäckel 7cba7c42a4 Merge pull request #2055 from emanuelschuetze/fix2048
Catch JS error "this.getVersion(...) is undefined" (Fixes #2048)
2016-03-20 21:06:39 +01:00
Emanuel Schuetze 85ffe4d8fa Catch JS error "this.getVersion(...) is undefined" (Fixes #2048) 2016-03-20 20:52:34 +01:00
Norman Jäckel 5af25351fa Merge pull request #2049 from emanuelschuetze/fix2028
Catch 404 errors in resolve promise if user has not all required permissions
2016-03-20 20:48:58 +01:00
Emanuel Schuetze 5e08e073f4 Fix translation strings in motions and users forms. 2016-03-19 13:06:36 +01:00
Emanuel Schuetze 0cd6bb272c Projector template improvements
- Vertical centering event title (if no description available)
- Fix sorting of main agenda item list.
- Show countdowns side-by-side. Allow edit if countdown is running.
2016-03-19 07:30:18 +01:00
Emanuel Schuetze 03f08628c7 Catch 404 errors in resolve promise if user has not all required permissions.
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string

Fixes #2028. Fixes #2038.
2016-03-18 21:41:16 +01:00
Norman Jäckel bf8e4fa585 Merge pull request #2046 from emanuelschuetze/translations
Update translation strings
2016-03-18 21:08:16 +01:00
Emanuel Schuetze 9ab182184f Updated EN translation JS resource. 2016-03-18 20:11:56 +01:00
Emanuel Schuetze 140869ebd7 Fix translation strings. 2016-03-18 20:11:04 +01:00
Emanuel Schütze 4fc95e5f19 Merge pull request #2045 from emanuelschuetze/fix2006
Use angular-chosen instead of ui-select for better performance.
2016-03-18 14:41:19 +01:00
Emanuel Schuetze 89446ce4f6 Use angular-chosen instead of ui-select for better performance.
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/

Use input delay on users filter field with 'debounce'.

Fixed #2006.
2016-03-18 14:37:03 +01:00
Norman Jäckel e7cb77c946 Merge pull request #2044 from emanuelschuetze/fixTranslation
Fix translation
2016-03-17 20:40:32 +01:00
Norman Jäckel 5c46a896d3 Merge pull request #2037 from emanuelschuetze/fix1975
Use specific tag of tinymce-18n repo (Fixes #1975).
2016-03-17 20:38:27 +01:00
Emanuel Schuetze 794fa9faf1 Updated EN translation JS resource file. 2016-03-17 12:48:06 +01:00
Emanuel Schuetze ace335f7cc Fix missing translation string. 2016-03-17 12:47:44 +01:00
Norman Jäckel b3582f462e Merge pull request #2042 from emanuelschuetze/spinner
Template improvements
2016-03-15 21:02:04 +01:00
Emanuel Schuetze a8d9581664 Allow html in event name and description. 2016-03-14 17:09:37 +01:00
Emanuel Schuetze 1b25d9c376 Added loading spinner icon.
Only for loading resolve object from server.
2016-03-14 17:09:37 +01:00
Emanuel Schuetze 4ad775869f Use specific tag of tinymce-18n repo (Fixes #1975). 2016-03-14 17:09:22 +01:00
Norman Jäckel 15119ab28b Merge pull request #2041 from emanuelschuetze/fix2020
New configs for font color in header and h1 on projector (Fixes #2020)
2016-03-08 23:16:28 +01:00
Emanuel Schuetze b9fed84732 Updated EN language files. 2016-03-08 23:01:20 +01:00
Emanuel Schuetze 85326d75f2 New configs for font color in header and h1 on projector (Fixes #2020) 2016-03-08 23:01:17 +01:00
Norman Jäckel f29db57ace Merge pull request #2040 from emanuelschuetze/fix2029
Fix 'stop' speech button in Safari (Fixes #2029)
2016-03-08 22:14:06 +01:00
Emanuel Schuetze f47055c13a Fix 'stop' speech button in Safari (Fixes #2029)
Use '{}' instead of empty 'JSON.stringify()'.
2016-03-08 20:23:12 +01:00
Emanuel Schütze 21d9898645 Merge pull request #2039 from normanjaeckel/FixRawSQLQuery
Used bulk_create to create the initial projector during migration. Fi…
2016-03-07 19:52:49 +01:00
Norman Jäckel 56936c86ab Used bulk_create to create the initial projector during migration. Fixed #2035. 2016-03-07 19:09:45 +01:00
Norman Jäckel ce3576f306 Merge pull request #2034 from emanuelschuetze/fix2005
Fix main menu on small devices (Fixes #2005)
2016-03-07 19:00:08 +01:00
Emanuel Schütze 2097121e45 Merge pull request #2030 from normanjaeckel/FixAgendaGetQueryset
Fixed get_queryset method of ItemViewSet. Fixed #2027.
2016-03-06 22:48:50 +01:00
Emanuel Schuetze 876d9408fe Fix main menu on small devices (Fixes #2005)
Use bootstraps navbar-toggle button to bring up a
vertical responsive main menu.
Some additional responsive CSS impmprovements.
2016-03-06 20:14:52 +01:00
Emanuel Schütze 2f168e2945 Merge pull request #2036 from normanjaeckel/UpdateMigrations
Updated migrations.
2016-03-06 18:13:42 +01:00
Norman Jäckel 78565ffd25 Updated migrations. 2016-03-06 14:36:50 +01:00
Norman Jäckel 9440903dfd Merge pull request #2018 from normanjaeckel/optimization
Optimization of autoupdate behavior.
2016-03-06 14:29:43 +01:00
Norman Jäckel 132c6e81ec Forwarding JSON instead of Django model instances to autoupdate loop.
- Used raw SQL for createing default projector during inital migration.
- Removed default_password and hidden agenda items from autoupdate data for some users.
- Removed old get_collection_and_id_from_url() function.
2016-03-06 14:24:53 +01:00
Norman Jäckel 4daa61888f Massive refactoring for autoupdate optimization. 2016-03-06 14:22:40 +01:00
André Böhlke 3db2f2fc16 "durchstich" for autoupdate optimization 2016-03-06 14:22:40 +01:00
Norman Jäckel e598b308f0 Merge pull request #2033 from emanuelschuetze/fix1949
Allow pdf scrolling on projector (Fixes #1949).
2016-03-06 14:19:06 +01:00
Norman Jäckel f4797a7081 Merge pull request #2032 from emanuelschuetze/fix2004
Remove 'can_see_extra_data' permission from registered and anonymous groups
2016-03-06 14:18:20 +01:00
Emanuel Schuetze b78c9bc7bd Allow pdf scrolling on projector (Fixes #1949). 2016-03-05 22:44:00 +01:00
Emanuel Schuetze 921ec3ab72 Remove 'can_see_extra_data' permission from registered and anonymous groups.
Now, only staff users has this permission by default. (Fixed #2004.)

Some more work on users/groups template:
- Added description to permission string to show that only 'present' and
  'comment' fields are affected by this permission.
- Allowed to create groups without permissions.
- Fixed showing group names in users lists view for staff and normal users.
2016-03-05 22:12:29 +01:00
Norman Jäckel bc93b61a02 Fixed get_queryset method of ItemViewSet. Fixed #2027. 2016-03-04 11:48:20 +01:00
Norman Jäckel 66de30f852 Merge pull request #2022 from emanuelschuetze/templateFixes
Template fixes:
2016-03-03 10:50:43 +01:00
Emanuel Schuetze 7029852043 Template fixes
- switch projector live view minimize/maximize buttons
- show agenda/item split buttons (project only main agenda items, project subitem)
  only if subitems are available
2016-03-03 08:46:18 +01:00
Emanuel Schütze f3e59d3d04 Merge pull request #2026 from normanjaeckel/FixAgenda
Fixed TypeError in agenda views. Fixed #2023.
2016-03-03 08:45:33 +01:00
Norman Jäckel 7da48efd4c Fixed TypeError in agenda views. Fixed #2023. 2016-03-03 00:23:41 +01:00
Norman Jäckel 6799cab940 Merge pull request #2024 from normanjaeckel/JSHintFailReporter
Fixed gulp jshint task.
2016-03-02 17:16:47 +01:00
Norman Jäckel 3c6d4d5e30 Fixed gulp jshint task. 2016-03-02 16:51:40 +01:00
Norman Jäckel 7e6ff44696 Merge pull request #2021 from normanjaeckel/SquishMigrations
Squish migrations
2016-03-02 16:11:08 +01:00
Norman Jäckel de871f3f9c Squished migrations files. 2016-03-02 14:26:47 +01:00
Emanuel Schütze bab909713a Merge pull request #2012 from normanjaeckel/DevOption
Changed name of '--development' option and name of the respective dir…
2016-03-02 08:18:37 +01:00
Norman Jäckel ca3cfae8b3 Changed name of '--development' option and name of the respective directory. Fixed #2001 2016-03-01 17:38:14 +01:00
Emanuel Schütze 8d1de6923b Merge pull request #2017 from normanjaeckel/FixMotionPoll
Fixed error in motion poll serializer. Fixed #2014.
2016-02-28 00:21:04 +01:00
Norman Jäckel bc49f00c66 Fixed error in motion poll serializer. Fixed #2014. 2016-02-27 21:34:26 +01:00
Norman Jäckel 872d73b5cf Merge pull request #2016 from normanjaeckel/GetContext
Rename and refactor some ProjectorElement methods. Fixed #1631.
2016-02-27 21:24:18 +01:00
Norman Jäckel ea429adefe Merge pull request #2015 from emanuelschuetze/fix2009
Show special vote values for motion polls on projector.
2016-02-27 20:57:21 +01:00
Norman Jäckel a2a6637c89 Rename and refactor some ProjectorElement methods. Fixed #1631. 2016-02-27 20:56:03 +01:00
Emanuel Schuetze 1d314db487 Show special vote values for motion polls on projector. 2016-02-27 20:10:24 +01:00
Norman Jäckel 452e7f1325 Merge pull request #2011 from ostcar/fix_requirements.txt
Updated requirements_production.txt
2016-02-27 00:20:46 +01:00
Norman Jäckel d00c257ee8 Merge pull request #1998 from normanjaeckel/HelpText
Updated start script help text and custom commands. Fixed #1987.
2016-02-27 00:18:45 +01:00
Oskar Hahn 099ff5a681 Updated requirements_production.txt
reportlab 3.3 can be used
sockjs-tornado 1.0.0 is not usable. We need at least 1.0.1
2016-02-26 09:10:21 +01:00
Norman Jäckel 9fbb12944c Updated start script help text and custom commands. Fixed #1987. 2016-02-25 23:17:04 +01:00
Emanuel Schütze 2b239f2214 Merge pull request #2003 from emanuelschuetze/fix1820
Reload after login and logout (Fixes #1820)
2016-02-25 13:51:44 +01:00
Emanuel Schütze c9cc8e236e Merge pull request #2002 from emanuelschuetze/fixes2
Template improvements
2016-02-25 13:45:28 +01:00
Emanuel Schuetze a6be43809f Agenda list slide improvements
- project summary of selected item
- show full tree OR main agenda items only
- show done items grey (without icon)
2016-02-25 13:37:59 +01:00
Emanuel Schuetze d3d73a019d Fix translations in group detail template. 2016-02-25 13:37:55 +01:00
Emanuel Schuetze 06f7515ca4 Reload after login and logout (Fixes #1820)
Not very nice solution but with DS.clear() we have to do a lot of more
work with high effort. Can improved later.
2016-02-25 10:22:05 +01:00
Emanuel Schütze 88b2e8a73e Merge pull request #2000 from normanjaeckel/VotesQuery
Optimized number of queries for motion serializing. Fixed #1655.
2016-02-24 11:10:11 +01:00
Emanuel Schütze 8b5b53f26e Merge pull request #1999 from normanjaeckel/JSHint
Fixed coding style in some JS files. Fixed #1979.
2016-02-24 11:08:21 +01:00
Norman Jäckel 758180e7cc Optimized number of queries for motion serializing. Fixed #1655. 2016-02-24 10:30:52 +01:00
Norman Jäckel 544b28cacf Fixed coding style in some JS files. Fixed #1979. 2016-02-24 09:56:27 +01:00
Norman Jäckel e57a83f45b Merge pull request #1997 from emanuelschuetze/fix1817
Get success message in user edit form when default password is resetted
2016-02-24 00:45:05 +01:00
Emanuel Schütze 0cbb3fba01 Merge pull request #1996 from normanjaeckel/LanguageHeader
Added language header to internal server requests. Fixed #1981.
2016-02-23 23:54:44 +01:00
Emanuel Schuetze bed96f66b0 Get success message in user edit form when default password is resetted (Fixes #1817). 2016-02-23 23:51:42 +01:00
Norman Jäckel 73cc1a5dfb Merge pull request #1995 from emanuelschuetze/fix1991
Add/Remove a group to selected users (Fixes #1991)
2016-02-23 23:37:57 +01:00
Norman Jäckel 3ea4c507cf Added language header to internal server requests. Fixed #1981. 2016-02-23 23:19:38 +01:00
Emanuel Schuetze e284b79c8e Add/Remove a group to selected users (Fixes #1991) 2016-02-23 23:16:13 +01:00
Emanuel Schütze ca5f707f74 Merge pull request #1994 from normanjaeckel/FileNotFound
Fixed error if a PDF file was deleted from the server. Fixed #1988.
2016-02-23 22:44:35 +01:00
Norman Jäckel 9a94dfc735 Merge pull request #1993 from emanuelschuetze/fix1710
Added motion poll pdf (Fixes #1710).
2016-02-23 22:38:28 +01:00
Norman Jäckel eecfc45dce Merge pull request #1992 from emanuelschuetze/fixes1
Several template fixes
2016-02-23 22:36:50 +01:00
Norman Jäckel e8402f6ffa Fixed error if a PDF file was deleted from the server. Fixed #1988. 2016-02-23 22:35:04 +01:00
Emanuel Schuetze eebb621a98 Added motion poll pdf (Fixes #1710). 2016-02-23 22:27:03 +01:00
Emanuel Schuetze 16fd87cc93 Use a global variable for the limiting number of users in select fields. (Fixed #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze 70dc8443fd Revert one change from #1984 in CHANGLOG. (Fixes #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze 0613304724 Use colorpicker for projector header color config. 2016-02-23 22:24:41 +01:00
Emanuel Schuetze ba49781b39 Show orange countdown in last x seconds of speaking time (add new config) 2016-02-23 22:24:38 +01:00
Emanuel Schuetze 647e62fb0d Set focus for chat input 2016-02-23 22:24:33 +01:00
Emanuel Schuetze 150744e607 Fixed showing users filters. 2016-02-20 11:35:51 +01:00
Emanuel Schuetze b0b858a808 Mediafile PDF controls: set 'page-fit' (100%) by default, disabled previous/next buttons 2016-02-20 11:29:38 +01:00
Emanuel Schütze 4016c1ea4b Merge pull request #1985 from emanuelschuetze/release2.0b4
Release 2.0b4
2016-02-17 21:27:18 +01:00
Emanuel Schuetze de276d951c Update version to 2.0b5-dev 2016-02-17 21:24:14 +01:00
Emanuel Schuetze 51358aba51 Release 2.0b4 2016-02-17 21:24:14 +01:00
Emanuel Schütze 41d9706a35 Merge pull request #1986 from emanuelschuetze/fixCSVimport
Fix motions and users csv import.
2016-02-17 21:23:28 +01:00
Emanuel Schuetze 0e40735931 Fix motions and users csv import. 2016-02-17 21:19:26 +01:00
Emanuel Schütze 7391771316 Merge pull request #1984 from emanuelschuetze/changelog
Updated CHANGELOG
2016-02-17 20:42:28 +01:00
Emanuel Schütze ecb29a1403 Merge pull request #1980 from normanjaeckel/PluginAPI
Updated API for plugins.
2016-02-17 20:40:40 +01:00
Emanuel Schütze fde94c6af1 Merge pull request #1983 from emanuelschuetze/updateTranslations
Updated all lanuages (JS only)
2016-02-17 20:39:37 +01:00
Emanuel Schuetze dcb12e60c7 Updated CHANGELOG 2016-02-17 20:38:29 +01:00
Emanuel Schuetze 8c4d1e24df Updated all lanuages (JS only) 2016-02-17 20:18:45 +01:00
Emanuel Schütze 2dd0013047 Merge pull request #1982 from emanuelschuetze/fixes
Several important fixes for beta4
2016-02-17 19:52:59 +01:00
Emanuel Schuetze 2473a6ef69 Updated angular-gettext EN source. 2016-02-17 17:58:04 +01:00
Emanuel Schuetze 84ea0bf1f5 Several important fixes for beta4
- Fix socket error in autoupdate (Check if socket exists)
- Add missing translation string for core permission
- Fix KeyError in extract_default_password function in users/views.py
- Improve Pagination. Fix users list for users without can_see_extra_data permissions.
- Limit the number of users in ui-select field
- Fix csv header names in users import help text.
- Use config options (enable logo/title) on projector.
- Nicer font style for main and sub items on agenda slide.
- Fix JS error if this.groups is undefined for anonymous.
2016-02-17 17:49:44 +01:00
Norman Jäckel dcc325c716 Fixed test plugin. 2016-02-16 23:04:26 +01:00
Norman Jäckel d181eedeb9 Updated API for plugins. 2016-02-16 22:33:41 +01:00
Emanuel Schütze 956bba9a13 Merge pull request #1978 from normanjaeckel/ChangeProfileFix
Fixed groups attribute of user in the client. Fixed #1974.
2016-02-16 21:02:53 +01:00
Norman Jäckel 3f7a4c68d3 Merge pull request #1977 from normanjaeckel/Gulp
Gulp
2016-02-16 17:37:43 +01:00
Norman Jäckel df06abe70e Fixed groups attribute of user in the client. Fixed #1974. 2016-02-16 14:18:20 +01:00
Norman Jäckel c818a4964f Activate gulp jshint for Travis. 2016-02-16 01:01:26 +01:00
Norman Jäckel 75f4a2e62d Work on JavaScript coding style. 2016-02-16 00:56:56 +01:00
Norman Jäckel 40a3d4534e Merge pull request #1972 from emanuelschuetze/tinymce
Use tinymce instead of CKEditor.
2016-02-16 00:27:58 +01:00
Emanuel Schuetze 16f1ad5731 Use tinymce instead of CKEditor.
- better integration of tinymce in bower and gulp
- Improve support for html tags in reportlab's motion pdf.
- Now paste from word works without problems
  (That was the main reason of switching to tinymce:
   The data loss problem with MS Word is still unfixed in CKEditor,
   see https://dev.ckeditor.com/ticket/13174)
- The editor is now used for customslides (text), motions (text,
  reason) and users (about).
- Use mediafile image list for tinymce.
- Use own repository for tinymce-i18n: OpenSlides/tinymce-i18n
2016-02-16 00:22:01 +01:00
Norman Jäckel 2d5f5c685c Merge pull request #1964 from emanuelschuetze/assignmentpoll
Assignmentpoll slide
2016-02-15 23:50:43 +01:00
Emanuel Schuetze 503325220f Show selected poll on assignment slide. 2016-02-15 23:47:31 +01:00
Norman Jäckel 8436963dce Merge pull request #1969 from emanuelschuetze/templateFixes
Template fixes
2016-02-14 23:01:04 +01:00
Emanuel Schuetze aee8ed2f3b Template fixes
- Show correct last speakers on list of speakers slide.
- Fixes config input type.
- Fixes config style for checkboxes.
- Improved line-height on projector for scaling.
2016-02-14 22:19:14 +01:00
Emanuel Schütze 81c6913ff3 Merge pull request #1971 from normanjaeckel/HideConfig
Added possibility to hide config variables.
2016-02-14 22:00:45 +01:00
Norman Jäckel cc55aff8cc Added possibility to hide config variables. 2016-02-14 21:38:26 +01:00
Norman Jäckel 46c125d0c5 Merge pull request #1970 from ostcar/fix_1954
Fix autoupdate of motion title
2016-02-14 14:16:03 +01:00
Oskar Hahn 481822219a Fix autoupdate of motion title
fix #1954
2016-02-13 07:15:47 +01:00
Emanuel Schütze ea4d3a2d75 Merge pull request #1968 from normanjaeckel/FixDefaultVotesError
Fixed error in poll default_votes_validator. Fixed #1967.
2016-02-11 20:47:35 +01:00
Norman Jäckel 198f09801c Fixed error in poll default_votes_validator. Fixed #1967. 2016-02-11 18:02:57 +01:00
Norman Jäckel ad7653fb76 Merge pull request #1966 from emanuelschuetze/mediafile
Use prune_elements for activate mediafile. (Fixed #1910)
2016-02-09 23:22:42 +01:00
Emanuel Schuetze 322957eb7e Fixed motion edit url. 2016-02-09 23:05:36 +01:00
Emanuel Schuetze b4cad89939 Use btn-group for projector controls. Added reset scaling. 2016-02-09 22:47:54 +01:00
Emanuel Schuetze b1dc73ec4d Use prune_elements for activate mediafile. (Fixed #1910)
Use page-fit to show pdf in full width.
Fix mediafile search result.
2016-02-09 22:38:07 +01:00
Emanuel Schütze 9fda27dfd6 Merge pull request #1965 from normanjaeckel/BadVoteValues
Fixed validation of default votes in assignment and motion poll. Fixe…
2016-02-09 21:43:11 +01:00
Norman Jäckel f627624271 Merge pull request #1963 from emanuelschuetze/updateDE
Update German translations
2016-02-09 21:18:13 +01:00
Norman Jäckel 60b6a7efe1 Fixed validation of default votes in assignment and motion poll. Fixed #1959. 2016-02-09 21:14:01 +01:00
Emanuel Schuetze c383147f7b Updated German translations for django.po 2016-02-09 16:54:08 +01:00
Emanuel Schuetze 0dd3c3158f Updated angular-gettext en source file. 2016-02-09 16:49:55 +01:00
Emanuel Schuetze eae50b46de Fixed closing tag for correct translation string 2016-02-09 16:49:32 +01:00
Norman Jäckel 0fe2b9cd8a Merge pull request #1962 from emanuelschuetze/templateFixes3
Motion state translation strings are still used by motion pdf.
2016-02-09 09:32:21 +01:00
Emanuel Schütze 657d45f268 Merge pull request #1960 from normanjaeckel/Gulp
Fixed gulp-cssnano.
2016-02-09 00:18:50 +01:00
Emanuel Schuetze 7248673b47 Motion state translation strings are still used by motion pdf.
Reverted partly the changes in motion/signmals.py by a8544f016d.
2016-02-09 00:11:48 +01:00
Norman Jäckel 6ccf1f0673 Merge pull request #1961 from emanuelschuetze/templateFixes2
Refactored MotionPoll.
2016-02-09 00:05:08 +01:00
Emanuel Schuetze 31102bd9d7 Refactored MotionPoll.
Use new getVotes function for vote value and percent value.
Remove 'to_representation' function in motion serializer.py to get
special values in numbers (-1,-2) instead of translated strings.
2016-02-08 23:56:44 +01:00
Norman Jäckel 801618d815 Fixed gulp-cssnano. 2016-02-08 23:51:57 +01:00
Emanuel Schütze e6b1695c88 Merge pull request #1958 from normanjaeckel/Gulp
Updated gulp-uglify.
2016-02-08 23:31:59 +01:00
Norman Jäckel 086eb2937a Updated gulp-uglify. 2016-02-08 23:02:09 +01:00
Norman Jäckel 25a7f59b70 Merge pull request #1950 from normanjaeckel/Worker.js
Simplified installing of JS and CSS libs. Fixed #1906.
2016-02-08 22:35:28 +01:00
Norman Jäckel 3be21473a4 Merge pull request #1956 from emanuelschuetze/master
Several template fixes
2016-02-08 22:32:56 +01:00
Emanuel Schütze 6cd3e48e45 Merge pull request #1952 from normanjaeckel/ErrorMessages
Used 'detail' for all ValidationError messages. See #1946.
2016-02-08 22:22:43 +01:00
Emanuel Schuetze 96b4784d52 Show motion poll results on projector. 2016-02-08 22:15:31 +01:00
Norman Jäckel 87a97edd69 Used 'detail' for all ValidationError messages. See #1946. 2016-02-08 21:52:23 +01:00
Emanuel Schuetze 0a4cdb3717 Used copy of motionpoll for MotionPollUpdate dialog. 2016-02-08 21:41:01 +01:00
Emanuel Schuetze 82f2c4f003 Fixed quickEdit mode in agenda, motion, assignment.
Refresh motion object after cancel.
2016-02-08 21:37:20 +01:00
Emanuel Schuetze 6ba47a64d3 Agenda list view: allow to delete also motion and assignment items.
Fixes #1943
2016-02-08 21:07:35 +01:00
Emanuel Schuetze f89f3a9933 Improved motion state dropdown element. 2016-02-08 20:34:12 +01:00
Emanuel Schuetze 4bbb153c42 Use Roboto font in projector header/footer. 2016-02-08 20:27:59 +01:00
Emanuel Schuetze 963bebac29 CKEditor v4.5.7 does not work (Syntax Error).
Go back to last working version 4.5.6.
2016-02-07 19:49:15 +01:00
Emanuel Schütze c40dfb120b Merge pull request #1951 from normanjaeckel/Autoupdate
Fixed problem with some REST requests during autoupdate. Fixed #1935.
2016-02-07 14:17:33 +01:00
Norman Jäckel 0e784cde31 Fixed problem with some REST requests during autoupdate. Fixed #1935. 2016-02-05 23:55:06 +01:00
Norman Jäckel 8cb74c5e7a Simplified installing of JS and CSS libs. Fixed #1906. 2016-02-05 23:27:15 +01:00
Emanuel Schütze 378218e8a5 Merge pull request #1944 from normanjaeckel/README
Updated README.
2016-02-05 22:48:22 +01:00
Emanuel Schütze fc35468faf Merge pull request #1947 from normanjaeckel/AssignmentPDF
Fixed assignment PDF. Fixed #1940.
2016-02-05 22:30:23 +01:00
Norman Jäckel 2ba675c1b6 Fixed assignment PDF. Fixed #1940. 2016-02-05 21:22:47 +01:00
Norman Jäckel 48d8ca9004 Updated README. 2016-02-05 20:57:21 +01:00
Emanuel Schütze 773ce0537d Merge pull request #1945 from normanjaeckel/MinifyCSS
Removed gulp-minify-css. Added gulp-cssnano. Fixed #1890.
2016-02-05 16:32:14 +01:00
Norman Jäckel b25ba01c0f Removed gulp-minify-css. Added gulp-cssnano. Fixed #1890. 2016-02-05 15:33:17 +01:00
Norman Jäckel eaea41564c Merge pull request #1942 from emanuelschuetze/assignmentPolls
Refactored AssignmentPoll (Fixed #1848)
2016-02-05 13:46:22 +01:00
Emanuel Schuetze 494c9aee94 Refactored AssignmentPoll (Fixed #1848)
Add percents and progressbars.
Template fixes and improvements for polls.
2016-02-05 00:32:18 +01:00
Emanuel Schütze af10737388 Merge pull request #1941 from emanuelschuetze/2.0b3
2.0b3
2016-02-03 21:46:56 +01:00
Emanuel Schuetze d92e7e0ecf Update version to 2.0b4-dev 2016-02-03 21:18:59 +01:00
Emanuel Schuetze 7a785b3092 Release 2.0b3 2016-02-03 21:18:45 +01:00
Emanuel Schütze 1090ad695d Merge pull request #1939 from emanuelschuetze/updateTranslations1
Updated languages DE, PT, FR, CS, ES (angular-gettext only) Fixes #1925
2016-02-03 21:12:29 +01:00
Emanuel Schuetze f944efaf76 Show html text in motion and users detail view correctly.
Remove white-space-pre-line css class.
2016-02-03 21:04:46 +01:00
Emanuel Schuetze 6997e49851 Updated languages DE, PT, FR, CS, ES (angular-gettext only) 2016-02-03 20:27:56 +01:00
Emanuel Schütze ac47b9dd64 Merge pull request #1938 from emanuelschuetze/updatedENSource
Updated EN source file for angular-gettext.
2016-02-03 16:56:57 +01:00
Emanuel Schuetze 142ceaaffc Updated EN source file for angular-gettext. 2016-02-03 15:32:35 +01:00
Oskar Hahn eef82d7e72 Merge pull request #1936 from emanuelschuetze/pagination
Add Pagination and improve import.
2016-02-03 15:24:21 +01:00
Oskar Hahn 59294b1fcb Merge pull request #1937 from emanuelschuetze/mediafileImprovements
Mediafile: Improvements for pdf presentaiton and list view.
2016-02-03 15:11:41 +01:00
Emanuel Schuetze af023f30bc Mediafile: Improvements for pdf presentaiton and list view. 2016-02-03 00:46:17 +01:00
Emanuel Schuetze 8ae3e1d468 Add Pagination and improve import.
- Use Pagination for users and item list and users import table.
- Improve agenda import: Allow to define agenda item stuff like
  duration, comment, type.
2016-02-02 22:48:06 +01:00
Norman Jäckel 8b72f6d821 Merge pull request #1933 from emanuelschuetze/agendaTree
Optimize agenda tree save method on client side.
2016-02-01 23:56:20 +01:00
Norman Jäckel 3b7af68da8 Merge pull request #1932 from ostcar/fix_autoupdate
Fix the autoupdate
2016-02-01 23:55:18 +01:00
Oskar Hahn 09cbe8c9e4 Fix the autoupdate 2016-02-01 23:21:50 +01:00
Emanuel Schuetze f30d62a11f Optimize agenda tree save method on client side.
with ui-tree
Fixes #1660
2016-02-01 23:06:13 +01:00
Oskar Hahn a2d8b41d55 Merge pull request #1931 from normanjaeckel/LocalHostVar
Refactored logic in autoupdate.py concerning wsgi network connection …
2016-02-01 21:27:13 +01:00
Oskar Hahn 7d6c202200 Merge pull request #1927 from emanuelschuetze/autoconnect
Refactor reconnect function of autoupdate.
2016-02-01 21:25:58 +01:00
Norman Jäckel 6541d49c99 Merge pull request #1928 from emanuelschuetze/updateTranslations
Show missing translations. Updated de and pt.
2016-01-31 10:19:18 +01:00
Oskar Hahn b6f7836678 Merge pull request #1930 from normanjaeckel/LoginModalText
Fixed login modal info text. Fixed #1924.
2016-01-31 01:36:30 +01:00
Emanuel Schuetze 2e0d57d310 Updated EN translation source files. 2016-01-30 11:34:47 +01:00
Norman Jäckel af0f8fcac6 Refactored logic in autoupdate.py concerning wsgi network connection variables. Fixed #1929." 2016-01-30 10:18:15 +01:00
Norman Jäckel 01aad229fe Fixed login modal info text. Fixed #1924. 2016-01-30 10:04:20 +01:00
Norman Jäckel 15bb62b39a Merge pull request #1926 from ostcar/fix_autoreload_in_django_1.9
Fix the start command not to reload if debug is False
2016-01-30 09:58:13 +01:00
Emanuel Schuetze fb41d0a219 Show missing translations. Updated de and pt. 2016-01-30 09:20:53 +01:00
Norman Jäckel 144037ff57 Merge pull request #1922 from ostcar/fix_tornado_on_windows
fix tornado on windows
2016-01-29 23:30:04 +01:00
Emanuel Schuetze 1216ea99d3 Refactor reconnect function of autoupdate. 2016-01-29 16:30:00 +01:00
Oskar Hahn fbf8b0aa62 Fix the start command not to reload if debug is False 2016-01-29 09:51:12 +01:00
Oskar Hahn 28171ac6ff Merge pull request #1923 from emanuelschuetze/beta3-fixes
Use correct special html character for projector template title.
2016-01-29 09:20:02 +01:00
Emanuel Schuetze 3cd49704fc Use correct special html character for projector template title. 2016-01-29 09:14:26 +01:00
Oskar Hahn 9292558db7 fix tornado on windows 2016-01-28 16:19:14 +01:00
Norman Jäckel 3e2874a9a0 Merge pull request #1918 from normanjaeckel/Release
Release
2016-01-27 23:45:36 +01:00
Norman Jäckel 2aa31bffbf Updated version to 2.0-dev 2016-01-27 23:41:16 +01:00
Norman Jäckel 95ac91893c Release 2.0b2 2016-01-27 23:41:16 +01:00
Norman Jäckel da30be5184 Merge pull request #1919 from emanuelschuetze/fix1904
Fixed TypeError caused by #1904.
2016-01-27 23:40:53 +01:00
Emanuel Schuetze 587f397171 Fixed TypeError caused by #1904.
"Resource.relationList is undefinded" after activating a slide.
2016-01-27 23:35:24 +01:00
Norman Jäckel 95160248ad Merge pull request #1917 from emanuelschuetze/readme
Updated README for 2.0b2
2016-01-27 23:01:26 +01:00
Emanuel Schuetze f0b93370d6 Updated README for 2.0b2 2016-01-27 22:59:43 +01:00
Emanuel Schütze 30e6e1aa13 Merge pull request #1916 from normanjaeckel/Metadata
Updated metadata files.
2016-01-27 22:55:56 +01:00
Norman Jäckel 4c313c05e0 Merge pull request #1915 from normanjaeckel/Languages
Updated angular-gettext language file.
2016-01-27 22:55:00 +01:00
Norman Jäckel d141fd3692 Updated metadata files. 2016-01-27 22:53:12 +01:00
Norman Jäckel 1b1d41b9b8 Updated angular-gettext language file. 2016-01-27 22:33:05 +01:00
Norman Jäckel c4281c6bc7 Merge pull request #1912 from emanuelschuetze/fixAgenda
Check if user is allowed to see detail view link in agenda list.
2016-01-27 22:25:56 +01:00
Norman Jäckel 70d32f1e47 Merge pull request #1914 from emanuelschuetze/fixGulp
Fixed gulp 'pot' task. Fixed typos in translation strings.
2016-01-27 22:23:29 +01:00
Norman Jäckel cdc01c06cd Merge pull request #1913 from normanjaeckel/Translations
Updated translations.
2016-01-27 22:22:03 +01:00
Norman Jäckel fea0287a20 Updated translations. 2016-01-27 22:16:54 +01:00
Emanuel Schuetze 3c7d03547c Set default of item.weigth to 10000.
So new items are placed at the end of agenda.
After sorting weight is updated.
2016-01-27 22:16:46 +01:00
Emanuel Schuetze 0ce0b9cd18 Fixed gulp 'pot' task. Fixed typos in translation strings. 2016-01-27 22:11:24 +01:00
Emanuel Schuetze fc22711a9c Check if user is allowed to see detail view link in agenda list.
Fixes #1886
2016-01-27 21:19:32 +01:00
Norman Jäckel 65cbecb3c2 Merge pull request #1911 from normanjaeckel/Languages
Updated language files.
2016-01-27 20:58:13 +01:00
Norman Jäckel 4aaa474761 Updated language files. 2016-01-27 20:55:27 +01:00
Norman Jäckel bdc5312148 Merge pull request #1905 from emanuelschuetze/requirements
Updated bower requirements (Fixes #1758)
2016-01-27 20:52:03 +01:00
Emanuel Schuetze 10e77136da Updated bower requirements (Fixes #1758) 2016-01-27 20:44:19 +01:00
Norman Jäckel 352e32334e Merge pull request #1901 from emanuelschuetze/fix1895
Translate permission strings. (Fixes #1895)
2016-01-27 20:42:07 +01:00
Norman Jäckel e041656115 Merge pull request #1903 from emanuelschuetze/pdfMediafilePresentation
Mediafile pdf presentation with angular-pdf and pdf.js (Fixes #1664).
2016-01-27 20:40:23 +01:00
André Böhlke d3ed15db29 Mediafile pdf presentation with angular-pdf and pdf.js (Fixes #1664).
Thanks to André Böhlke for contribution core functionality!
Some additional template improvements by Emanuel.
2016-01-27 20:36:21 +01:00
Norman Jäckel f12a1425c0 Merge pull request #1908 from emanuelschuetze/unconnectBar
Show red bar on top if server is offline (Fixes #1853)
2016-01-27 20:25:33 +01:00
Emanuel Schuetze deea222434 Translate permission strings. (Fixes #1895)
Remove unused gettextCatalog content provider.
2016-01-27 20:23:53 +01:00
Norman Jäckel 3ba93c2352 Merge pull request #1904 from ostcar/remove-ds-dependencies
Remove DS dependencies
2016-01-27 20:17:44 +01:00
Emanuel Schuetze 14e2fedd6b Show red bar on top if server is offline (Fixes #1853) 2016-01-27 20:14:10 +01:00
Norman Jäckel b133ef2556 Merge pull request #1909 from emanuelschuetze/remarks1898
Fixed remarks from #1898.
2016-01-27 20:09:01 +01:00
Norman Jäckel 5044aaf7ed Merge pull request #1907 from ostcar/fix_reconnect
Reconnect at once. Do not wait 5 seconds. Add a connected flag to the…
2016-01-27 20:07:46 +01:00
Emanuel Schuetze 09b397f3b1 Fixed remarks from #1898. 2016-01-27 20:03:53 +01:00
Oskar Hahn 3b508303a1 Reconnect at once. Do not wait 5 seconds. Add a connected flag to the root scope
Fixes #1854

See also #1853
2016-01-27 17:55:28 +01:00
Oskar Hahn bd4c8920e9 Remove DS dependencies 2016-01-27 17:28:41 +01:00
Oskar Hahn d37b89a15a Merge pull request #1902 from OpenSlides/revert-1720-master
Revert "Add upload feature to mediafiles module"
2016-01-27 15:29:16 +01:00
Oskar Hahn 6970235f23 Revert "Add upload feature to mediafiles module" 2016-01-27 15:28:59 +01:00
Oskar Hahn 2d1077ddad Merge pull request #1720 from boehlke/master
Add upload feature to mediafiles module
2016-01-27 15:16:03 +01:00
André Böhlke 3c691b9937 work on pdf presenter support 2016-01-27 19:33:30 +07:00
Oskar Hahn 2307bdc188 Merge pull request #1898 from emanuelschuetze/templateFixes
Template fixes
2016-01-27 12:32:47 +01:00
Emanuel Schuetze 23503eb4ba Several template fixes and clean up
- Use ng-cloak for hide template parts while loading.
- Set html lang attribute dynamically (Fixes #1546)
- Clean up: Rename 'dashboard' to 'home'.
- Show duration of speech in minutes. (Fixes #1882)
- Save agenda specific stuff for customslides. (Fixes #1887)
- Remove title from QuickEdit from.
- Checkbox for item.closed is now visible for manager only.
- Agenda list view: Show list of speakers link also for normal users.
- Improve slide templates: Show agenda item number and subtitle.
- Fixed agenda title for motions and assignments.
  (Don't load motions and assignmetn in agenda app.)
- Added missing seach template.
2016-01-27 12:10:40 +01:00
Norman Jäckel 741cae028c Merge pull request #1896 from normanjaeckel/AgendaNumbering
Fixed agenda numbering. Fixed #1892.
2016-01-27 10:39:12 +01:00
Oskar Hahn 8be872eb48 Merge pull request #1899 from emanuelschuetze/search
Full text search (Fixes #1699)
2016-01-27 08:32:24 +01:00
Emanuel Schuetze 2a9e0b4b81 Implement full text search (client side) Fixes #1699 2016-01-27 00:16:30 +01:00
Norman Jäckel fdd62cb342 Fixed agenda numbering. Fixed #1892. 2016-01-26 16:13:33 +01:00
Oskar Hahn 23ad11d232 Merge pull request #1897 from normanjaeckel/PermDisplayName
Changed display name of permissions in GroupViewSet. Fixed #1895.
2016-01-26 10:02:48 +01:00
Norman Jäckel 61a8c31ff5 Changed display name of permissions in GroupViewSet. Fixed #1895. 2016-01-25 22:35:23 +01:00
Norman Jäckel 87ba8fe4a5 Merge pull request #1894 from ostcar/fix_search
Fix Search on server side
2016-01-25 22:10:52 +01:00
Oskar Hahn 41c43a7b31 Merge pull request #1888 from normanjaeckel/DefaultPerms
Deleted Django default permission of some apps. Fixed #1643.
2016-01-25 21:16:35 +01:00
Oskar Hahn bc520a1adf Merge pull request #1889 from normanjaeckel/Requirements
Fixed requirements.
2016-01-25 21:15:07 +01:00
Oskar Hahn 339b3891da Fix Search on server side 2016-01-25 21:12:34 +01:00
Norman Jäckel 676ec23340 Updated package.json. Fixed requirements. 2016-01-25 15:38:30 +01:00
Norman Jäckel 87e3c536da Deleted Django default permission of some apps. Fixed #1643. 2016-01-25 14:48:54 +01:00
Norman Jäckel bb1ae463db Merge pull request #1884 from emanuelschuetze/mediafileTemplate
Refactoring mediafile templates. (Fixes #1839, #1818, #1833)
2016-01-25 11:43:55 +01:00
Emanuel Schuetze f4e4166e24 Refactoring mediafile templates. (Fixes #1839, #1818, #1833)
- uploader not visible/loaded after reload list view
- use same list view style as in other apps
- use dialog for create/edit form
- show error message in form
- edit form: remove file upload form element, add uploader form element
- create form: add uploader form element (only if user has manager permissions)
- Refactor mediafile upload method
- show not-implemented message for project pdf
- use pdf filter in list view
2016-01-25 10:11:16 +01:00
Oskar Hahn cc657b1fee Merge pull request #1885 from normanjaeckel/MediafileFix
Fixed mediaifle app.
2016-01-25 08:21:35 +01:00
Norman Jäckel fecaad844b Fixed mediaifle app. 2016-01-24 22:58:45 +01:00
Norman Jäckel 673a761f6d Merge pull request #1877 from emanuelschuetze/translationFix
Add Translation strings and updated po files
2016-01-24 22:17:56 +01:00
Oskar Hahn 0d1a8aa174 Merge pull request #1878 from emanuelschuetze/fix1783
Add checkbox 'show as agenda item'. (Fixes #1783)
2016-01-24 22:16:43 +01:00
Emanuel Schuetze 4616f38fd5 Updated EN translation files. 2016-01-24 00:37:58 +01:00
Emanuel Schuetze a8544f016d Mark all motion state names as translatable in JS. (Fixes #1864)
Updated README for how to update translations.
2016-01-24 00:37:54 +01:00
Emanuel Schuetze 9ddc558085 Add checkbox 'show as agenda item'. (Fixes #1783)
Used for customslide, motion and assignment forms.
Changed default value of agenda.type to HIDDEN_ITEM (=2) in model.py.
2016-01-23 20:22:56 +01:00
Oskar Hahn 338f4ce0a1 Merge pull request #1879 from emanuelschuetze/templateIssues
Send option request for config page just once (Fixes #1813)
2016-01-23 08:29:16 +01:00
Emanuel Schuetze 4d6aade16a Send option request for config page just once (Fixes #1813)
Add permission check in config template.
2016-01-23 01:02:05 +01:00
Norman Jäckel 48781b95ba Merge pull request #1875 from emanuelschuetze/template-fixes
Template fixes
2016-01-22 15:02:06 +01:00
Emanuel Schuetze 7bc1851a09 Use osFilter for motions, assignments and mediafiles. (Fixes #1784) 2016-01-21 23:20:14 +01:00
Emanuel Schuetze b4482afa38 Show username in UserUpdateForm (Fixes #1781) 2016-01-21 22:34:18 +01:00
Emanuel Schuetze 94366f35ab Use os-perms instead of os-perms-lite. Removed os-perms-lite. (Fixes #1826) 2016-01-21 22:26:11 +01:00
Emanuel Schuetze 646bf52ea7 Show countdown in red if negative (projector and control panel).
Show 00:00 instead of --:--
2016-01-21 21:43:02 +01:00
Emanuel Schuetze b291473c61 Set guest_enabled in rootScope to use it in login form after reload. (Fixes #1849)
- Justified login form elements (same width).
2016-01-21 21:14:55 +01:00
Emanuel Schuetze 42f9cfdf45 List views: show number of filtered AND total rows.
Improve css animation for ng-enter/ng-leave.
2016-01-21 20:43:04 +01:00
Emanuel Schuetze 23e7b3aaf5 Fixed translation string. 2016-01-21 19:58:50 +01:00
Emanuel Schuetze 4125efbfe6 Added agendaSupplement for agenda item title.
Added padding-left for child item cells.
2016-01-18 21:40:50 +01:00
Emanuel Schuetze 76dc29cddf Use uib-alert instead of deprecated alert tag. 2016-01-18 21:09:28 +01:00
Emanuel Schuetze c4468f93ac Format timestamp in mediafile list view. 2016-01-18 21:02:37 +01:00
Emanuel Schuetze 620d0121c8 Do not show group "Registered" in users list/detail view. 2016-01-18 20:51:44 +01:00
Emanuel Schuetze 6986db5e69 Set default of use is_present/is_active to true. 2016-01-18 16:29:15 +01:00
Emanuel Schuetze 8ac3254d04 Show title in participant names. 2016-01-18 16:28:48 +01:00
Emanuel Schuetze d083309a30 Show candidates on assignments slide. 2016-01-18 16:27:50 +01:00
Emanuel Schuetze 59a7a02cfe Added version history (Fixes #1676) 2016-01-18 00:15:28 +01:00
Emanuel Schuetze 7967da0b4e Allow 'trivial changes' in motion update (Fixes #1863) 2016-01-17 22:32:52 +01:00
Emanuel Schuetze 8bf82a0306 Added meta box in assignment detail view (Fixes #1866) 2016-01-17 22:32:52 +01:00
Emanuel Schuetze 851252dfe8 Format all JavaScript functions in same syntax.
Required for use minified js code in production mode.
2016-01-17 22:32:48 +01:00
Emanuel Schuetze 0e24d9b632 Modify motion/assignment/customslide in form dialog without updating list/detail view. 2016-01-17 21:19:32 +01:00
Oskar Hahn 3ed5b2bb1b Merge pull request #1862 from emanuelschuetze/injectUser
Modify user in form dialog without updating list/detail view.
2016-01-15 16:02:53 +01:00
Emanuel Schuetze e6cf28cbeb Modify user in form dialog without updating list/detail view.
Create deep copy of user object before modify user in form dialog.
So list/detail view is not updated while editing.
Before saving inject the changed user (copy) object back into DS
store. Refresh user from DB is save request fails.
2016-01-15 13:50:05 +01:00
Oskar Hahn 8ae35c0cc5 Merge pull request #1873 from emanuelschuetze/motionFixes2
Added missing motionpoll-form template. Fix remark in motion-detail.
2016-01-15 13:38:41 +01:00
Emanuel Schuetze d8aee16fec Added missing motionpoll-form template. Fix remark in motion-detail. 2016-01-15 09:46:55 +01:00
Oskar Hahn ffe80e8da3 Merge pull request #1852 from normanjaeckel/AssignmentFixes
Fixed several things in assignment app. See #1838.
2016-01-15 09:37:18 +01:00
Oskar Hahn bac4e2c21f Merge pull request #1865 from normanjaeckel/MediafileFix
Added possibility for non staff users to upload new files. See #1856.
2016-01-15 09:33:06 +01:00
Oskar Hahn 4ffbd8be29 Merge pull request #1868 from normanjaeckel/TrivialChanges
Enabled the option to disabled version for motion update requests.
2016-01-15 09:31:30 +01:00
Oskar Hahn 00610d9a63 Merge pull request #1870 from normanjaeckel/DelegateMotionEdit
Add quick fix to motion update view.
2016-01-15 09:26:05 +01:00
Oskar Hahn e5c6219f00 Merge pull request #1872 from emanuelschuetze/motionFixes
Motion template fixes
2016-01-15 09:25:46 +01:00
Emanuel Schuetze 694ed6f1cc Motion template fixes
- Add has_votes to motion serializer and add poll.has_votes check in motion detail view.
- Fix motion meta box 3 column layout.
- Added missing intents
- Show motionPoll edit form in dialog. Moved into new template.
- Clean up assignmentpoll form (like motionPoll)
2016-01-15 00:03:29 +01:00
Norman Jäckel 1eeed1fde9 Add quick fix to motion update view. 2016-01-15 00:03:17 +01:00
Norman Jäckel 01ee197eb6 Enabled the option to disabled version for motion update requests. 2016-01-14 23:23:15 +01:00
Norman Jäckel ae6875aa93 Added possibility for non staff users to upload new files. See #1856. 2016-01-14 22:55:43 +01:00
Oskar Hahn 440a38b387 Merge pull request #1843 from emanuelschuetze/motionsTemplate
Motion template fixes
2016-01-14 08:49:48 +01:00
Oskar Hahn 1ab1af1f7e Merge pull request #1850 from emanuelschuetze/templateFixes
Several template improvements
2016-01-14 08:47:28 +01:00
Emanuel Schuetze bc60b7e7ca Several template improvements
- Move Languages services from site.js to base.js
  Now the detected browser language is used as projector language.
- Use verboseName instead of agendaSupplement.
- Show submitters on projector (load Users on Controller).
- Improve list of speakers (slide and item detail).
2016-01-14 00:14:48 +01:00
Oskar Hahn 82f5239b8c Merge pull request #1845 from normanjaeckel/ConfigFix
Fixed server error in config update view. Fixed #1828.
2016-01-13 18:36:34 +01:00
Norman Jäckel 441c297986 Fixed several things in assignment app. See #1838.
Fixed "Add Me" and "Remove Me" button.

Show poll results for normal users.

Reverse ballot tab order.
2016-01-13 16:11:01 +01:00
Norman Jäckel 3fc82a596c Fixed server error in config update view. Fixed #1828. 2016-01-13 15:04:47 +01:00
Norman Jäckel 919425cbb3 Merge pull request #1844 from emanuelschuetze/German
Updated German translations.
2016-01-13 14:57:15 +01:00
Emanuel Schuetze cffed7aa3e Updated German translations. 2016-01-13 14:47:45 +01:00
Emanuel Schuetze 2f8c894104 Motion template fixes
- Fix missing workflows in Motion create form.
- redesign motion meta box
- use table format for motion voting results
2016-01-13 14:32:15 +01:00
Emanuel Schütze e471b84b27 Merge pull request #1842 from emanuelschuetze/pot-files
Updated translation pot files
2016-01-13 11:49:28 +01:00
Emanuel Schuetze a2721f9589 Updated translation pot files 2016-01-13 11:44:53 +01:00
Oskar Hahn 007a92a96b Merge pull request #1841 from emanuelschuetze/ProjectorRedesign
Redesign projector template (Fixes #1787)
2016-01-13 11:28:06 +01:00
Oskar Hahn aa6a099840 Merge pull request #1809 from emanuelschuetze/CustomSlideAttachment
Custom slide attachment
2016-01-13 11:26:46 +01:00
Emanuel Schuetze d0b9b2a492 Added reduced projector logo.
Added openslides blue color value to logo README.
2016-01-13 10:47:27 +01:00
Emanuel Schuetze 09b88fb4a6 Redesign projector template. 2016-01-13 10:28:49 +01:00
Emanuel Schütze bc17baa2b9 Merge pull request #1835 from emanuelschuetze/templateFixes3
A lot of template fixes
2016-01-13 10:24:47 +01:00
Emanuel Schuetze 93e2296bdc A lot of template fixes
- Reset password from current (unsaved) value of default_password.
- MotionForm, AssignmentForm and UserForm factory for open ngDialog.
  Fixes edit url redirect problem.
- Added back-to-detail-view-button to list of speakers view.
- Add translation context.
- Fixed (missing) translation strings.
- Fixed tags and category list views.
- motion detail: Use select box for changing state.
- motion slide updated
2016-01-13 10:22:24 +01:00
Oskar Hahn 4a3cefadb1 Merge pull request #1834 from normanjaeckel/Assignment
Assignment
2016-01-12 14:58:07 +01:00
Emanuel Schuetze f2375008d8 Added attachments for customslide views. (Fixes #1681) 2016-01-10 11:55:37 +01:00
Norman Jäckel 8a6ca904dc Added attachments to custom slides. 2016-01-10 11:51:00 +01:00
Norman Jäckel e2145f9777 Fixed candidate button. 2016-01-10 11:27:17 +01:00
Norman Jäckel 8bdbdd0b07 Merge pull request #1832 from ostcar/fix_agenda_title
Always use item.getTitle() instead of item.title
2016-01-10 11:26:44 +01:00
Oskar Hahn dd120bbf91 Merge pull request #1831 from emanuelschuetze/templateFixes2
Several fixes for 2.0b2
2016-01-10 11:26:37 +01:00
Emanuel Schuetze f9f3af245e Template fixes.
- Use PATCH request for user profile update.
2016-01-10 11:18:13 +01:00
Oskar Hahn b6f4c3cc15 Always use item.getTitle() instead of item.title 2016-01-10 11:10:14 +01:00
Emanuel Schütze 18f6ffbafd Merge pull request #1830 from ostcar/fix_speaker_buttons
Change the speaker management buttons in the speaker page
2016-01-10 10:40:25 +01:00
Oskar Hahn fd6190b7a7 Change the speaker management buttons in the speaker page 2016-01-10 10:26:20 +01:00
Norman Jäckel 896ac28c30 Added number of candidates to assignment list view. 2016-01-10 10:23:55 +01:00
Oskar Hahn 78ec776c3f Merge pull request #1829 from ostcar/fix_python
Fix syntaxerror in python
2016-01-10 09:47:40 +01:00
Oskar Hahn dc80efeee9 Fix syntaxerror in python 2016-01-10 09:47:08 +01:00
Oskar Hahn f3fcb74aec Merge pull request #1827 from ostcar/fix_list_of_speaker_error_message
Remove item id from error message "{user} is already on the list of speakers."
2016-01-10 09:32:48 +01:00
Oskar Hahn 78640a27f1 Remove item id from error message "{user} is already on the list of speakers." 2016-01-10 09:32:06 +01:00
Norman Jäckel 7dd9edec8b Merge pull request #1819 from normanjaeckel/Attachment
Fixed mediafile model. Fixed #1808.
2016-01-10 01:08:24 +01:00
Norman Jäckel ca659351eb Merge pull request #1825 from emanuelschuetze/fixTemplates
Fixed permissions in list views.
2016-01-10 01:07:51 +01:00
Norman Jäckel 2cfa7517a8 Fixed mediafile model. Fixed #1808. 2016-01-10 01:05:57 +01:00
Oskar Hahn 87d647ac4d Merge pull request #1824 from ostcar/fix_tornado
Fix tornado
2016-01-10 01:03:16 +01:00
Oskar Hahn ccf88ec4d5 Switch host and port 2016-01-10 01:02:18 +01:00
Emanuel Schuetze 071b0a76be Fixed permissions in list views. 2016-01-10 01:02:13 +01:00
Oskar Hahn 4ee2b85b76 Merge pull request #1821 from normanjaeckel/LoginView
Fixed alerts on login form.
2016-01-10 00:59:03 +01:00
Oskar Hahn f4e91caeaf Merge pull request #1822 from normanjaeckel/ChatBox
Disabled autocomplete for chat box.
2016-01-10 00:58:45 +01:00
Oskar Hahn e93b2f1118 Merge pull request #1823 from normanjaeckel/ListOfSpeakersChess
Fixed strange empty field for sorting list of speakers.
2016-01-10 00:58:25 +01:00
Oskar Hahn ffa60e8d06 show user about me as html 2016-01-10 00:57:09 +01:00
Norman Jäckel 83ac20a704 Fixed strange empty field for sorting list of speakers. 2016-01-10 00:56:04 +01:00
Norman Jäckel 7005ab7f64 Disabled autocomplete for chat box. 2016-01-10 00:46:23 +01:00
Oskar Hahn 4bc0b1d19c fix autoupdate and hide some groups in user edit form 2016-01-10 00:44:02 +01:00
Norman Jäckel 5a1317eb19 Fixed alerts on login form. 2016-01-10 00:38:59 +01:00
Oskar Hahn b968a92630 fix autoupdate when openslides runs on a other port then 8000 2016-01-10 00:17:00 +01:00
Oskar Hahn c30116f5c1 Merge pull request #1815 from emanuelschuetze/candidateElected
Mark candidate as elected. Updated assignment detail.
2016-01-09 22:37:39 +01:00
Emanuel Schuetze 2c46d3ae0a Mark candidate as elected. Updated assignment detail. 2016-01-09 22:35:04 +01:00
Norman Jäckel f375f4b45a Merge pull request #1814 from ostcar/fix_config
Fix autoupdate of config
2016-01-09 22:19:30 +01:00
Oskar Hahn 3ae6482863 Fix autoupdate of config 2016-01-09 22:13:55 +01:00
Oskar Hahn 2f8138f672 Merge pull request #1811 from normanjaeckel/SquishMigrations
Squished all migrations.
2016-01-09 21:04:54 +01:00
Norman Jäckel 8d1c351c9a Squished all migrations. 2016-01-09 19:10:57 +01:00
Norman Jäckel 544efdb06e Merge pull request #1806 from ostcar/fix_autoupdate_after_reload
Fix autoupdate after auth
2016-01-09 18:55:24 +01:00
Oskar Hahn 5069649e14 Fix autoupdate after auth
Remove data after logout
2016-01-09 18:25:18 +01:00
Norman Jäckel 1f72ef4099 Merge pull request #1802 from normanjaeckel/Blocked
Removed possibility to block candidates. Fixes #1708.
2016-01-09 18:10:19 +01:00
Norman Jäckel 2e104d07b7 Removed possibility to block candidates. Fixes #1708. 2016-01-09 18:05:41 +01:00
Norman Jäckel 193d318bc9 Merge pull request #1803 from ostcar/os_filter
Add osFilter that filters for an explicit text
2016-01-09 17:07:31 +01:00
Norman Jäckel ae315d388b Merge pull request #1804 from ostcar/remove_old_search
Remove old haystack files
2016-01-09 17:01:42 +01:00
Oskar Hahn dba513c2fd Merge pull request #1805 from emanuelschuetze/agendaHidden
Improved item hidden filter.
2016-01-09 17:00:55 +01:00
Emanuel Schuetze 4a9f265b68 Used is_hidden instead of item.typ. Improve hidden filter.
Fixed JS error in users and assignments.
2016-01-09 16:55:21 +01:00
Oskar Hahn b7d63afc91 Remove old haystack files 2016-01-09 16:50:39 +01:00
Oskar Hahn e3b6fd8d6d Add osFilter that filters for an explicit text 2016-01-09 16:45:47 +01:00
Norman Jäckel 68ec516e6f Merge pull request #1799 from emanuelschuetze/loginText
Show info text in login form (Fixes #1754)
2016-01-09 16:07:55 +01:00
Emanuel Schuetze 11470d3b57 Move welcome config values to general section.
Use textarea for welcome text.
2016-01-09 16:05:06 +01:00
Emanuel Schuetze b035ee7d7c Improved legal notice page (Fixes #267) 2016-01-09 14:44:49 +01:00
Oskar Hahn c2041dca6f Merge pull request #1796 from normanjaeckel/MoveTranslations
Remove model field verbose names. Move help texts.
2016-01-09 14:25:42 +01:00
Emanuel Schuetze 363c928517 Show info text in login form (Fixes #1754) 2016-01-09 14:22:32 +01:00
Norman Jäckel e406b92745 Remove model field verbose names. Move help texts. 2016-01-09 14:17:51 +01:00
Oskar Hahn 890383006b Merge pull request #1797 from emanuelschuetze/agendaNumbering
Show agenda titles with correct numbering
2016-01-09 14:07:22 +01:00
Emanuel Schuetze 54b1c8e350 Show agenda titles with correct numbering 2016-01-09 14:01:30 +01:00
Oskar Hahn 622dadd4ef Merge pull request #1795 from normanjaeckel/StaticImpressumPage
Added config field for legal notes.
2016-01-09 13:22:54 +01:00
Norman Jäckel d7e39be708 Added config field for legal notes. 2016-01-09 13:01:18 +01:00
Oskar Hahn 4b69c57c78 Merge pull request #1789 from ostcar/update_requirements
Update requirements
2016-01-09 12:22:41 +01:00
Oskar Hahn 552998b067 Update requirements, fixt a lot of warnings
Set python 3.4 as minimal supported python version
2016-01-09 12:19:46 +01:00
Oskar Hahn cad252cd2b Merge pull request #1794 from normanjaeckel/LockoutProtextion
Added lockout protection, see #1452.
2016-01-09 12:19:28 +01:00
Norman Jäckel cb22071886 Added lockout protection, see #1452. 2016-01-09 12:07:31 +01:00
Oskar Hahn 96328f033b Merge pull request #1793 from emanuelschuetze/fixAssignmentPhasesRequest
Send assignments OPTION request for phases once only.
2016-01-09 12:05:57 +01:00
Oskar Hahn db22d1f7dc Merge pull request #1777 from emanuelschuetze/fix1662
Sort list of speakers (Fixes#1662)
2016-01-09 12:04:38 +01:00
Oskar Hahn 091c08dabd Merge pull request #1788 from emanuelschuetze/fixSlides
Fix slide templates
2016-01-09 12:01:11 +01:00
Emanuel Schuetze 4faf3dd2c0 Send assignments OPTION request for phases once only. 2016-01-09 11:45:25 +01:00
Oskar Hahn 308f55bb3f Merge pull request #1782 from ostcar/search
Added a search on the server side.
2016-01-09 11:44:08 +01:00
Oskar Hahn 75dcbab5d1 Add search on the server side. 2016-01-09 11:35:57 +01:00
Emanuel Schuetze 74110453c8 Rename ItemDetailSlide to ListOfSpeakersSlide (Fixes #1576) 2016-01-09 10:55:12 +01:00
Emanuel Schuetze 5cab3bf3dc Added indentation of subitems on agenda slide (Fixes #1716) 2016-01-09 10:34:34 +01:00
Norman Jäckel 6c33c60600 Merge pull request #1786 from normanjaeckel/LoginInfoView
Added login info text in config and view.
2016-01-09 10:24:56 +01:00
Norman Jäckel ecf561e305 Added login info text in config and view. 2016-01-09 10:01:17 +01:00
Emanuel Schuetze 3304cf48c5 Sort list of speakers (Fixes #1662) 2016-01-09 09:44:01 +01:00
Norman Jäckel 7843cc2ec0 Merge pull request #1785 from emanuelschuetze/fix-template-bugs
Fix template bugs
2016-01-09 01:12:51 +01:00
Norman Jäckel 241d3dbc20 Sorted list of speakers. 2016-01-08 23:32:29 +01:00
Emanuel Schuetze de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Oskar Hahn 5deae121ee Merge pull request #1779 from emanuelschuetze/fix-1761
Generate example csv import files (Fixes #1761)
2016-01-04 10:27:35 +01:00
Emanuel Schuetze 9b78b5992b Fix typo 2015-12-30 23:19:53 +01:00
Emanuel Schuetze 98cd4301a6 Generate example csv import files (Fixes #1761)
- agenda csv file
- motions csv file
- users csv file
2015-12-30 23:02:20 +01:00
Norman Jäckel 9a6ebdb2cf Merge pull request #1768 from normanjaeckel/FixTest
Fixed test.
2015-12-22 20:28:15 +01:00
Oskar Hahn c63bd31db0 Merge pull request #1778 from emanuelschuetze/fix1718
Fix publish assignment poll function. (Fixes#1718)
2015-12-22 00:02:44 +01:00
Oskar Hahn 701d3ce228 Merge pull request #1776 from emanuelschuetze/fix1717
Upgrade angular-ui-tree
2015-12-22 00:01:50 +01:00
Norman Jäckel e02e07f410 Fixed test. 2015-12-19 22:48:37 +01:00
Emanuel Schuetze b863c7ae13 Upgrade to angular-ui-tree 2.5.0
With >=2.10.0 there is an error "context is null" if start dragging.
With >=2.6.0 there is a missing angular 1.4 dependency.
2015-12-19 12:46:53 +01:00
Emanuel Schuetze 6b8aa56e87 Fix publish assignment poll function.
Set 'votes' to required=False in AssignmentAllPollSerializer.
2015-12-19 12:38:07 +01:00
Norman Jäckel d3e8c68a51 Merge pull request #1775 from emanuelschuetze/templateStuff
Fixed some template bugs (#1727)
2015-12-19 11:53:53 +01:00
Oskar Hahn 99b4e8c494 Merge pull request #1771 from emanuelschuetze/fix1729
Added whitespace before triple dots in template (Fixes #1729)
2015-12-12 11:05:58 +01:00
Oskar Hahn 63d4351c9a Merge pull request #1773 from emanuelschuetze/csv-import
Improved agenda and users csv import (Fixes #1748)
2015-12-12 11:05:03 +01:00
Emanuel Schuetze f5efca1d1e Added whitespace before triple dots in template (Fixes #1729) 2015-12-12 10:16:44 +01:00
Emanuel Schuetze 31c320f9ef Improved csv import for agenda and users.
- Fix users list.
2015-12-12 10:12:22 +01:00
Oskar Hahn 66e0fe272b Merge pull request #1764 from normanjaeckel/DefaultPermissions
Deleted Django's default permissions.
2015-12-12 09:32:40 +01:00
Oskar Hahn 9402d25f4f Merge pull request #1767 from normanjaeckel/ItemDetailSlide
Removed item detail slide on server and client side.
2015-12-12 09:31:36 +01:00
Oskar Hahn fae3747da6 Merge pull request #1769 from normanjaeckel/LoginLogout
Fixed login and logout view.
2015-12-12 09:30:00 +01:00
Oskar Hahn fd90b15a0e Merge pull request #1770 from emanuelschuetze/fix1728
Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728)
2015-12-12 09:28:20 +01:00
Oskar Hahn d3fba3a24e Merge pull request #1772 from emanuelschuetze/fix1750
Login dialog behavior if guest mode enabled/disabled (Fixes #1750)
2015-12-12 09:25:36 +01:00
Emanuel Schuetze c275b08178 Fixed some template bugs (#1727)
- Fixed z-index of messages and countdowns.
- Sidebar: Live view open by default. Improve section style.
- Set default value for open_posts in assignments create form.
- Redefine default values in motions create form.
2015-12-12 00:30:05 +01:00
Norman Jäckel e0e74d6c3c Fixed login, logout and password change view. 2015-12-11 23:58:59 +01:00
Emanuel Schuetze 041b01afe5 Login dialog behavior if guest mode enabled/disabled (Fixes #1750) 2015-12-11 21:18:45 +01:00
Emanuel Schuetze ca94a4e720 Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728) 2015-12-11 19:50:50 +01:00
Norman Jäckel 0701838bc8 Merge pull request #1765 from emanuelschuetze/WhoAmI
Login form
2015-12-11 15:44:02 +01:00
Norman Jäckel da37f3a441 Removed item detail slide on server and client side.
There is now only a list of speakers slide.
2015-12-11 15:37:13 +01:00
Norman Jäckel c73671805e Merge pull request #1753 from emanuelschuetze/fix1704
Project related object (Fixes #1704)
2015-12-11 15:25:56 +01:00
Emanuel Schuetze 5d29af5f52 Improved login form.
- Add redirect after aborting login. (Fixes #1762)
- Use new state paramater 'guest_enabled' for login form.
2015-12-11 13:45:53 +01:00
Norman Jäckel 24cb58dc12 Added guest enabled info to WhoAmI view. 2015-12-11 13:44:58 +01:00
Oskar Hahn c9adeb7fbb Merge pull request #1766 from emanuelschuetze/fix1752
Fix user.id in password reset request (Fixes #1752)
2015-12-10 22:19:51 +01:00
Emanuel Schuetze 9001456d19 Fix user.id in password reset request (Fixes #1752) 2015-12-10 15:03:18 +01:00
Norman Jäckel 114a38e4ee Deleted Django's default permissions. 2015-12-10 00:31:27 +01:00
Norman Jäckel f98b4f7840 Merge pull request #1760 from emanuelschuetze/cleanupExtras
Clean up extras directory.
2015-12-09 23:21:50 +01:00
Norman Jäckel 3919387cdf Merge pull request #1759 from emanuelschuetze/removeDocs
Moved docs to own github repository.
2015-12-09 23:20:36 +01:00
Norman Jäckel ea6a6206a0 Merge pull request #1756 from emanuelschuetze/fix1750
Redirect to login dialog if user is not logged in (Fixes #1750)
2015-12-09 23:16:22 +01:00
Oskar Hahn dac76df0c9 Merge pull request #1751 from normanjaeckel/ChangeGulp
Updated Gulpfile. Fixed #1746.
2015-12-09 22:59:48 +01:00
Emanuel Schuetze 4539b99d1f Clean up extras directory.
- moved 'extras/logo' to 'logo'
- moved 'csv-examples' to http://files.openslides.org/csv-examples/
- removed unused 'benchmark' and 'scripts' directories
2015-12-09 22:32:19 +01:00
Emanuel Schuetze f264c3911e Moved docs to own github repository.
See https://github.com/OpenSlides/openslides-docs
2015-12-09 22:25:03 +01:00
Emanuel Schuetze f050e04f0a Redirect to login dialog if user is not logged in (Fixes #1750) 2015-12-09 20:45:52 +01:00
Emanuel Schuetze 7bffeba93e Project related object (Fixes #1704)
- Override generic project and isProjected function in agenda.
- Fix project and isProjected function for list of speakers and move
  to jsDataModel of Agenda.
2015-12-09 20:02:08 +01:00
Norman Jäckel 17dc0943a3 Updated Gulpfile. Fixed #1746. 2015-12-08 18:43:28 +01:00
Norman Jäckel 5e3ff74575 Merge pull request #1745 from normanjaeckel/Release-2.0b1
Release 2.0b1
2015-12-07 22:01:04 +01:00
Norman Jäckel 1f63f84fde Update version to 2.0b2-dev 2015-12-07 21:55:56 +01:00
Norman Jäckel c5e3a14a82 Release 2.0b1 2015-12-07 21:55:17 +01:00
Norman Jäckel 28eda0f0b1 Updated setup.py. 2015-12-07 21:54:33 +01:00
Norman Jäckel 1415461141 Merge pull request #1744 from emanuelschuetze/readme
Updated Readme.
2015-12-07 21:54:08 +01:00
Emanuel Schuetze d583561342 Updated README and CHANGELOG for 2.0b1. 2015-12-07 21:42:20 +01:00
Emanuel Schuetze f4fb3f9460 Remove old unused win32 portable and gui code.
Moved to new repositories:
https://github.com/OpenSlides/openslides-portable
https://github.com/OpenSlides/openslides-gui
2015-12-07 20:43:22 +01:00
Norman Jäckel 9344e20b34 Merge pull request #1743 from normanjaeckel/Translations
Updated German translation.
2015-12-07 20:22:50 +01:00
Norman Jäckel 2f4b7c192c Updated French translation. 2015-12-07 20:11:46 +01:00
Norman Jäckel 00dd0b419a Updated German translation. 2015-12-07 20:06:05 +01:00
Norman Jäckel 55a0c327e4 Merge pull request #1742 from normanjaeckel/LanguageFile
Updated English language file.
2015-12-07 19:57:33 +01:00
Norman Jäckel 075c00ac4f Updated English language file. 2015-12-07 15:43:45 +01:00
Norman Jäckel d368bedfc9 Merge pull request #1741 from emanuelschuetze/translations
Updated English translation strings.
2015-12-07 15:36:18 +01:00
Emanuel Schuetze 3c5f49a127 Updated English translation strings. 2015-12-07 15:15:12 +01:00
Oskar Hahn 87c63f0d19 Merge pull request #1740 from normanjaeckel/FontsRepo
Used our own repository for Open Sans font.
2015-12-07 10:26:37 +01:00
Norman Jäckel 1b1e8f8ba2 Used our own repository for Open Sans font. 2015-12-06 23:55:30 +01:00
Norman Jäckel 586f781f8d Merge pull request #1738 from emanuelschuetze/templateFixes
Template fixes
2015-12-06 18:33:30 +01:00
Emanuel Schuetze 5c6977c46d Template fixes 2015-12-06 17:26:10 +01:00
Norman Jäckel 871f911be5 Merge pull request #1739 from emanuelschuetze/translations
Updated translation strings and pot file.
2015-12-06 13:48:36 +01:00
Emanuel Schuetze 232ce522fe Updated translation strings and pot file. 2015-12-06 07:25:07 +01:00
Oskar Hahn 37cd431aa9 Merge pull request #1737 from emanuelschuetze/motion-csv-import
Add motion csv import (Fixes #1675)
2015-12-05 23:53:08 +01:00
Emanuel Schuetze d987a1138d Added motion csv import (Fixes #1675)
using pre-import checks and preview table.
2015-12-05 21:44:19 +01:00
Oskar Hahn 5fad933371 Merge pull request #1736 from emanuelschuetze/newFavicon
Use transparent favicon.
2015-12-04 09:37:55 +01:00
Emanuel Schuetze f5452082f0 Use transparent favicon.
- Added favicon to projector template.
2015-12-02 14:20:59 +01:00
Oskar Hahn 31f46ce177 Merge pull request #1735 from normanjaeckel/Fix
Fixed comment.
2015-12-02 11:17:27 +01:00
Norman Jäckel 696bfb0883 Fixed comment. 2015-12-01 15:45:35 +01:00
Oskar Hahn acbe929706 Merge pull request #1734 from emanuelschuetze/fixTranslationAgendaSupplement
Fixed translations in agendaSupplement.
2015-12-01 14:22:41 +01:00
Emanuel Schuetze b81704a88f Fixed translations in agendaSupplement. 2015-12-01 13:45:54 +01:00
Oskar Hahn 3dd3a2f4fd Merge pull request #1732 from emanuelschuetze/fixTranslations
Fixed gettext strings in JavaScript.
2015-12-01 13:38:21 +01:00
Emanuel Schuetze e23121ed0f Updated language menu.
- improved header menu style
- define new Languages factory
- make it easier to define new languages
2015-12-01 12:06:15 +01:00
Emanuel Schuetze bf940b177c Fixed gettext strings in JavaScript.
- Added browser lanugage detection.
- Use gettextCatalog.getString(..) instead of gettext(..) in JS code.
- updated pot file
2015-11-30 23:52:42 +01:00
Oskar Hahn 727aa5d0e2 Merge pull request #1731 from normanjaeckel/GermanTranslation
Added German translation.
2015-11-30 23:18:59 +01:00
Norman Jäckel 139a5173b8 Added German translation. 2015-11-30 21:30:37 +01:00
Norman Jäckel 6cfa7f2309 Merge pull request #1725 from normanjaeckel/Fixes
Several fixes.
2015-11-30 21:12:59 +01:00
Norman Jäckel f84b8f29ac Template and translation changes. Updated English language files. 2015-11-30 21:06:31 +01:00
Norman Jäckel ea24202833 Merge pull request #1730 from emanuelschuetze/template-fix
Fix translation tags.
2015-11-30 20:58:09 +01:00
Emanuel Schuetze 5cf2134e95 Fix translation tags. 2015-11-30 20:52:02 +01:00
Norman Jäckel 9504cfe348 Merge pull request #1723 from emanuelschuetze/newTemplateDesign
New template design
2015-11-30 20:40:37 +01:00
Emanuel Schuetze fa267b68c2 New template design
- Great thanks to Jörn Bensch (from triagonale.de) for new base
  template!
- A lot of adaptations in all templates for new design.
2015-11-30 20:36:33 +01:00
Oskar Hahn aab8b28393 Merge pull request #1724 from emanuelschuetze/project-item-fix
Added own isProjected function for Agenda factory (Fixes #1704)
2015-11-30 14:49:17 +01:00
Oskar Hahn ca201758e8 Merge pull request #1715 from emanuelschuetze/template-improvements
Template improvements
2015-11-29 22:32:08 +01:00
Emanuel Schuetze 2b5c9c09b2 Template improvements
- use modal dialogs for new/edit views of customslide/motions/assigments
- use hover actions in all list views
- Show assignment candidate names
- support yesnoabstain/vote assignment poll
- Generic solution for open edit dialog.
2015-11-29 22:26:59 +01:00
Oskar Hahn e046dd5302 Merge pull request #1719 from normanjaeckel/AssignmentRESTReq
Added error message if a new cnadidate is already nominated.
2015-11-29 22:22:36 +01:00
Norman Jäckel 91174afa99 Added error message if a new candidate is already nominated. 2015-11-28 21:34:24 +01:00
Norman Jäckel a8e7ee40ad Merge pull request #1712 from ostcar/fix_item_sort
Angular: downgrade ui-tree to fix the agenda sort view
2015-11-28 20:52:38 +01:00
Norman Jäckel 6f924e6686 Merge pull request #1714 from ostcar/assignment_poll_candidate
AngularJS: Added js-data models for assignment poll candidates
2015-11-28 13:26:56 +01:00
Norman Jäckel 262964cbea Merge pull request #1713 from ostcar/fix_delete_speaker
AngularJS: Fix deletion of speakers.
2015-11-28 13:24:58 +01:00
Norman Jäckel 6dee05328d Merge pull request #1711 from ostcar/fix_assignment_autoupdate
Angular: Eject assignment related users before a assignment is updated
2015-11-28 13:22:27 +01:00
Oskar Hahn 99ef185502 Angular: Added js-data models for assignment poll candidates 2015-11-28 00:27:14 +01:00
Oskar Hahn 5ddedf94e1 angular: Fix deletion of speakers 2015-11-27 23:59:04 +01:00
Oskar Hahn f41b9626d1 Angular: downgrade ui-tree to fix the agenda sort view 2015-11-27 23:55:26 +01:00
Oskar Hahn 9a7dea26e0 Angular: Eject assignment related users before a assignment is updated 2015-11-27 22:26:30 +01:00
Oskar Hahn 6a4cc97469 Merge pull request #1709 from emanuelschuetze/assignments-rework
Assignments template improvements
2015-11-27 20:16:41 +01:00
Emanuel Schuetze 35a8042759 Assignments template improvements
- list view with quickview
- ngDialog for create/update view
- candidates
- polls
2015-11-27 00:19:37 +01:00
Norman Jäckel 91cc2b1bc1 Merge pull request #1705 from ostcar/assignment_js
Added assignment poll and assignment related user to js
2015-11-25 23:17:21 +01:00
Oskar Hahn e67897941e Added assignment poll and assignment related user to js 2015-11-25 19:28:35 +01:00
Emanuel Schuetze 92719f2b31 Added own isProjected function for Agenda factory
Allow to check if an related content object item is projected.
2015-11-25 14:50:23 +01:00
Norman Jäckel ec600c98f8 Merge pull request #1701 from normanjaeckel/AutoNumbering
Added REST API viewpoint to number the agenda.
2015-11-25 13:31:17 +01:00
Norman Jäckel 7bff79b377 Added manager to number all agenda items. 2015-11-25 13:05:39 +01:00
Emanuel Schuetze 28df416ec7 Added auto numbering button on agenda list view. 2015-11-25 13:05:39 +01:00
Norman Jäckel f0080865e6 Added REST API viewpoint to number the agenda. 2015-11-25 13:05:39 +01:00
Norman Jäckel bdcf58f2eb Merge pull request #1698 from emanuelschuetze/agenda-templates
Improvements for related agenda items
2015-11-25 13:04:36 +01:00
Emanuel Schuetze 968083e9e5 Improved related agenda items
- Added QuickEdit mode for related agenda items
- show/hide hidden agenda items
- Added ng-dialog for modal create/update dialogs of customslides
- use generic links for list of speakers, edit, delete, project
- Moved projector elements to sidebar of index template (In progress!
  It will be improved with new base template design).
- Fixed error if chat messages is empty.
- Moved ngSanitize to base.js to use ng-bind-html in projector slides.
2015-11-25 12:18:14 +01:00
Oskar Hahn 78c7b2497f Merge pull request #1702 from emanuelschuetze/split-motions-js
Split motions.js into base, site and projector
2015-11-24 15:56:22 +01:00
Emanuel Schuetze 9af302ce36 Fix 'operator' error in projector view.
Move operator factory from users/site.js to users/base.js.
The Motion factory uses 'operator' in motions/base.js which is also
loaded on projector. So operator is required in users/base.js.
2015-11-23 22:06:54 +01:00
Emanuel Schuetze f26188e0ff Split motions.js into base, site and projector 2015-11-23 22:06:50 +01:00
Oskar Hahn 984022baa4 Merge pull request #1679 from emanuelschuetze/chat
Chatbox
2015-11-23 10:35:26 +01:00
Emanuel Schuetze 3c0fcfebac Reworked on chatbox in base template. 2015-11-22 22:46:18 +01:00
Norman Jäckel b1dfd2a4e9 Added first chatbox draft on client side. 2015-11-22 22:45:59 +01:00
Oskar Hahn c6d9701369 Merge pull request #1696 from normanjaeckel/RemoveTranslations
Remove translations for projector exception messages.
2015-11-22 22:03:02 +01:00
Norman Jäckel c5f5fbf203 Remove translations for projector exception messages. 2015-11-21 00:01:48 +01:00
Norman Jäckel 1ef41b68bd Merge pull request #1683 from normanjaeckel/Translations
Updated Englisch language files.
2015-11-20 23:25:26 +01:00
Norman Jäckel 1016af3c52 Updated English language files. 2015-11-20 23:23:01 +01:00
Norman Jäckel cdd1813c02 Merge pull request #1691 from emanuelschuetze/motions-permissions
Updated motion permission checks
2015-11-20 23:18:54 +01:00
Oskar Hahn 02a67097e4 Merge pull request #1690 from emanuelschuetze/rest-password
Reset default password of an user in UserUpdateCtrl. (Fixes #412)
2015-11-20 10:26:04 +01:00
Emanuel Schuetze c93e20b1b3 Updated motion permission checks.
- Add permission checks in motion form (Fixes #1677)
- Implement get_allowed_actions in motions JavaScript (Fixes #1668)
2015-11-20 00:15:18 +01:00
Oskar Hahn 2458cc97fb Merge pull request #1689 from ostcar/fix_pas_perms_after_reload
AngularClient: Fix operator.pasPerms() after a reload
2015-11-19 22:34:03 +01:00
Oskar Hahn b1e7259ce5 AngularClient: Fix operator.pasPerms() after a reload 2015-11-19 21:49:51 +01:00
Emanuel Schuetze e9cf2fb591 Reset default password of an user in UserUpdateCtrl. (Fixes #412) 2015-11-19 21:49:28 +01:00
Oskar Hahn 07bd763a63 Merge pull request #1688 from normanjaeckel/VotesField
Enabled possibility to send null for motion poll votes vote value fie…
2015-11-19 20:37:11 +01:00
Norman Jäckel 19df7c82a2 Enabled possibility to send null for motion poll votes vote value fields. 2015-11-19 19:56:01 +01:00
Oskar Hahn 0cce7f967b Merge pull request #1661 from normanjaeckel/CKEditor
Added CKEditor to custom slide create and edit form.
2015-11-18 12:21:39 +01:00
Oskar Hahn 051c98ad88 Merge pull request #1684 from normanjaeckel/MotionFix
Fixed create view for non staff users, fixed #1670.
2015-11-18 12:20:08 +01:00
Oskar Hahn 6dee5d87f0 Merge pull request #1685 from normanjaeckel/VoteString
Return strings for special motion vote values. See #1669.
2015-11-18 12:19:10 +01:00
Norman Jäckel 69a6cb7c47 Return strings for special motion vote values. See #1669. 2015-11-18 01:46:58 +01:00
Norman Jäckel 2063dcff51 Fixed create view for non staff users, fixed #1670. 2015-11-18 01:20:49 +01:00
Emanuel Schuetze e3f57a250c Use custom ckeditor options 2015-11-17 23:25:09 +01:00
Norman Jäckel d299579f16 Added CKEditor to custom slide create and edit form. 2015-11-17 23:25:09 +01:00
Norman Jäckel 2417549755 Merge pull request #1663 from emanuelschuetze/motions-template2
Work on motions app.
2015-11-11 11:17:24 +01:00
Emanuel Schuetze ed72a90306 Reworked all motions templates.
motion detail:
- added progres bar for motionpoll
- added support/unsupport function
- show log

motion list:
- added state filter
- added css animations for enter/leave

motion form:
- use angular-formly (instead of old ng-fab-forms with no angular 1.4.x support)

general:
- Workflow states use new field 'css_class' (instead of unused
  'icon'). Added migration file.
- added 'allowed_actions' to rest api for each motion (by Norman)
- updated all JavaScript dependencies (bower.json)
2015-11-11 10:50:49 +01:00
Oskar Hahn c379544e97 Fixed motion states, handled workflow field. 2015-11-11 10:50:49 +01:00
Emanuel Schuetze 5b37a21c87 Motion detail updated for polls.
bower.json: updated ui-select
New QuickEdit feature in motion list.
2015-11-11 10:50:49 +01:00
Oskar Hahn 2495ba609b create MotionPoll in JS 2015-11-11 10:50:49 +01:00
Emanuel Schuetze 798126551b Motions template improvements.
- Added quickedit form for motion list.
2015-11-11 10:50:49 +01:00
Norman Jäckel ce52dde13a Merge pull request #1665 from normanjaeckel/ProfilePassword
Added possibility to reset password. Work on user app in general.
2015-11-08 22:58:30 +01:00
Norman Jäckel 8154b0324b Added possibility to reset password. Work on user app in general. 2015-11-08 22:10:24 +01:00
Oskar Hahn 08c31a6b09 Merge pull request #1666 from normanjaeckel/Mediafile
Fixed serializer and template. Fixed #1650.
2015-11-07 07:14:39 +01:00
Oskar Hahn 4e8566904a Merge pull request #1667 from normanjaeckel/Logo
Updated logo help text.
2015-11-07 07:13:43 +01:00
Norman Jäckel 03fcf950ff Updated logo help text. 2015-11-06 17:25:25 +01:00
Norman Jäckel cc21b3d015 Fixed mediafile serializer and template. Fixed #1650. 2015-11-06 17:17:27 +01:00
Oskar Hahn fb4a261cc5 Merge pull request #1659 from ostcar/related_items
Related items
2015-10-29 15:47:56 +01:00
Oskar Hahn 12a08b9732 New Agenda Item
Changed agenda item, so it can not be manualy created, but is always created
when a custom slide, motion or assignment is created.
2015-10-29 15:44:43 +01:00
Oskar Hahn d3a6c05a68 Merge pull request #1658 from normanjaeckel/RemoveBleach
Removed bleach.
2015-10-27 13:25:09 +01:00
Norman Jäckel 2dacdc8e87 Removed bleach. 2015-10-26 20:58:22 +01:00
Norman Jäckel 09a3f22fda Merge pull request #1657 from ostcar/fix_for_python_3.5
Update beautifulsoup4 to support python 3.5
2015-10-25 21:51:51 +01:00
Oskar Hahn b6b371d39a Update beautifulsoup4 to support python 3.5 2015-10-25 21:42:46 +01:00
Oskar Hahn 3533a41520 Merge pull request #1656 from normanjaeckel/Cleanup
Split and cleaned up JS files.
2015-10-24 16:14:02 +02:00
Norman Jäckel 32b23df763 Split and cleaned up JS files. Added test. 2015-10-22 00:28:01 +02:00
Oskar Hahn 0e3688fc33 Merge pull request #1653 from normanjaeckel/FixMotionPoll
Fixed changes in motion poll serializer.
2015-10-21 23:15:28 +02:00
Norman Jäckel c812d9746e Merge pull request #1654 from normanjaeckel/NewGulp
Added JSHint to Gulp. Split up JS-Code in users app.
2015-10-21 22:50:59 +02:00
Norman Jäckel f8cf279d82 Added JSHint to Gulp. Split up JS-Code in users app. 2015-10-21 22:44:07 +02:00
Norman Jäckel 0fc915ec35 Fixed changes in motion poll serializer. 2015-10-21 22:24:11 +02:00
Oskar Hahn 17973bae3d Merge pull request #1652 from ostcar/make_os-perms-lite_and_ng-show_compatible
Fix os-perms-lite to make it compatible to ng-show and ng-hide
2015-10-21 21:25:29 +02:00
Oskar Hahn bf3e125786 Merge pull request #1651 from normanjaeckel/MotionPoll
Changed Motion Poll REST fields.
2015-10-21 21:25:06 +02:00
Oskar Hahn 1f0ab173d3 Fix os-perms-lite to make it compatible to ng-show and ng-hide 2015-10-21 21:21:48 +02:00
Norman Jäckel 817e15b01a Changed Motion Poll REST fields. 2015-10-21 21:20:38 +02:00
Oskar Hahn baaa3f5a7c Merge pull request #1649 from emanuelschuetze/users-templates
Added multiselection delete mode for users list view.
2015-10-16 00:58:03 +02:00
Emanuel Schuetze fac45fbf2a Added multiselection delete mode for users list view.
Fix users import: Allows multiple groups.
2015-10-15 21:09:49 +02:00
Oskar Hahn 69268f0cc7 Merge pull request #1634 from emanuelschuetze/countdown-controls
Projector elements controls
2015-10-08 22:27:35 +02:00
Emanuel Schuetze dda16af532 Added controls for projector elements
countdowns, messages, scale/scroll/edit current slide
Use global serverOffset.
Fixed #1645 (wrong time of projector clock).
Show countdown description on projector slide.
2015-10-08 19:21:25 +02:00
Oskar Hahn 719330e6f6 Merge pull request #1644 from emanuelschuetze/fixAgendaSlide
Fix agenda slide and agendaIsProjected function.
2015-09-24 21:52:52 +02:00
Emanuel Schuetze 4559ffb882 Fix agenda slide and agendaIsProjected function. 2015-09-24 21:43:37 +02:00
Oskar Hahn 0c9d4b2627 Merge pull request #1647 from normanjaeckel/ServerTime
Added API view for server time.
2015-09-24 21:35:55 +02:00
Norman Jäckel 30e390dcfb Added API view for server time. 2015-09-24 21:28:30 +02:00
Norman Jäckel 9599e4c022 Merge pull request #1642 from normanjaeckel/CleanupUsers
Cleaned up users app.
2015-09-21 16:46:33 +02:00
Norman Jäckel 1e08e9411a Cleaned up users app. 2015-09-21 16:23:47 +02:00
Norman Jäckel d7fd61e979 Merge pull request #1637 from normanjaeckel/ProjectorScaleScroll
Added scale and scroll. Fixed #1633.
2015-09-18 10:36:28 +02:00
Norman Jäckel e646cce91e Added scale and scroll, up, down and reset. Fixed #1633. 2015-09-18 10:31:22 +02:00
Oskar Hahn 7860345116 Merge pull request #1641 from normanjaeckel/1629
Cleaned up mediafiles app. Fixed #1629.
2015-09-18 08:33:56 +02:00
Norman Jäckel 4ad99f2bc9 Cleaned up mediafiles app. Fixed #1629. 2015-09-17 22:58:24 +02:00
Norman Jäckel 4600fd9b02 Merge pull request #1625 from boehlke/master
Add upload feature to mediafiles module.
2015-09-17 12:41:10 +02:00
André Böhlke 10b8a1d838 Add upload feature to mediafiles module 2015-09-17 12:35:40 +02:00
Oskar Hahn 04fc25ffd0 Merge pull request #1638 from ostcar/projector-js-data-replace
Configure js-data for projector elements to "replace" on inject.
2015-09-17 12:16:40 +02:00
Oskar Hahn 264895b773 Configure js-data for projector elements to "replace" on inject.
fixes #1632
2015-09-17 12:04:45 +02:00
Oskar Hahn 9302b61918 Merge pull request #1639 from normanjaeckel/FixActiveElementLine
Fixed blue line for active projector elements.
2015-09-17 11:58:42 +02:00
Norman Jäckel 187cb0c42f Fixed blue line for active projector elements. 2015-09-16 23:59:20 +02:00
Oskar Hahn ddafb6682a Merge pull request #1636 from normanjaeckel/AgendaTree
Fixed agenda tree, fixed #1635.
2015-09-16 14:57:11 +02:00
Norman Jäckel 2a23150b78 Fixed agenda tree, fixed #1635. 2015-09-14 22:18:55 +02:00
Norman Jäckel b431f41b2c Merge pull request #1630 from normanjaeckel/ImportUser
Removed imports from openslides.users in other apps
2015-09-14 21:56:12 +02:00
Norman Jäckel c8dfb9437b Removed imports from openslides.users in other apps: Cleaned up agenda, assignments and motions. 2015-09-14 21:13:56 +02:00
Emanuel Schütze d79bad80f6 Merge pull request #1619 from emanuelschuetze/agenda-template
Agenda item list: new multiselect delete mode
2015-09-14 20:43:39 +02:00
Emanuel Schuetze 7f9c8b6a38 Agenda item list: new multiselect delete mode
Remove action column.
2015-09-14 20:35:24 +02:00
Emanuel Schütze e5008c1f53 Merge pull request #1628 from normanjaeckel/FixProjector
Fixed projector.
2015-09-14 20:33:44 +02:00
Norman Jäckel 8c48d67df0 Fixed projector. 2015-09-14 20:30:37 +02:00
Oskar Hahn 4d14a1297d Merge pull request #1626 from normanjaeckel/Chat
Added model, serializer and viewset for chat messages.
2015-09-07 17:34:43 +02:00
Norman Jäckel 6d76454925 Added model, serializer and viewset for chat messages. 2015-09-07 17:13:42 +02:00
Oskar Hahn f0803f1c03 Merge pull request #1624 from ostcar/agendaTree
Calculate agenda tree on the client side.
2015-09-06 15:04:38 +02:00
Oskar Hahn 85be9f23cc Merge pull request #1623 from normanjaeckel/ProjektorElementsOutput
Updated Projector config field and control views.
2015-09-06 15:04:26 +02:00
Oskar Hahn e22b9984e3 Calculate agenda tree on the client side.
Update changed agenda tree via autoupdate.
2015-09-06 15:01:41 +02:00
Norman Jäckel 5c4c0367a1 Updated Projector config field and control views. 2015-09-06 14:59:33 +02:00
Norman Jäckel da304ccc35 Merge pull request #1622 from normanjaeckel/User
Fix docstrings.
2015-09-06 13:29:16 +02:00
Norman Jäckel 5fc215c359 Fix docstrings. 2015-09-06 11:48:37 +02:00
Oskar Hahn 1fc7a361eb Merge pull request #1621 from normanjaeckel/User
Added possibility to update your own user object.
2015-09-06 11:37:52 +02:00
Norman Jäckel c8bf754646 Added possibility to update your own user object. Hide default password for non admins. 2015-09-06 11:26:48 +02:00
Norman Jäckel 063b6e5563 Merge pull request #1620 from ostcar/fix_operator_on_projector
Fix the projector
2015-09-06 10:30:35 +02:00
Oskar Hahn 2c64a161ac fix projector 2015-09-06 10:24:15 +02:00
Norman Jäckel 973d3fa653 Merge pull request #1618 from normanjaeckel/Projector
Added UUID to projector elements. Added update view.
2015-09-05 21:23:00 +02:00
Norman Jäckel 47a151c71e Added UUID to projector elements. Added update view. 2015-09-05 21:19:53 +02:00
Norman Jäckel 1fa221e249 Merge pull request #1617 from ostcar/ospermslite
Added osPermLite as alternative to osPerm.
2015-09-05 19:24:14 +02:00
Oskar Hahn bd51c6a52c Added osPermLite as alternative to osPerm 2015-09-05 19:17:41 +02:00
Oskar Hahn d8e9ef5575 Merge pull request #1616 from ostcar/main_menu
Autogenerate the main menu.
2015-09-05 18:19:59 +02:00
Oskar Hahn c54b00c5f4 Merge pull request #1613 from emanuelschuetze/user-profile
User settings profile view
2015-09-05 18:19:17 +02:00
Oskar Hahn 2da2177c49 Autogenerate the main menu. 2015-09-05 17:23:47 +02:00
Emanuel Schuetze 60002d9111 Added user profile view. 2015-09-05 17:22:37 +02:00
Oskar Hahn f802fde7de Merge pull request #1614 from normanjaeckel/BundleCountDown
Bundle countdown with list of speakers. Fixed #1541.
2015-09-05 17:12:22 +02:00
Norman Jäckel 7f90373176 Merge pull request #1615 from boehlke/master
Fix javascript syntax.
2015-09-05 16:19:16 +02:00
André Böhlke 8691608c5d Fix javascript syntax 2015-09-05 16:15:25 +02:00
Norman Jäckel 719b5ffedd Bundle countdown with list of speakers. Fixed #1541. 2015-09-05 15:07:03 +02:00
Oskar Hahn 948e776d33 Merge pull request #1612 from ostcar/motion_tag_save
Reload config after login
2015-09-05 11:32:52 +02:00
Emanuel Schütze 35fa5470d2 Merge pull request #1608 from emanuelschuetze/speakerscontrol
Added manage controls for list of speakers of agenda items.
2015-09-05 11:26:53 +02:00
Oskar Hahn fbc57cc23a Reload config after login
Fix errors by saving tags to motions
2015-09-05 11:26:41 +02:00
Emanuel Schuetze 77d027c1cc Agenda templates
- Added manage controls for list of speakers of agenda items.
- New slide for list of speakers.
- Fixed typo (speach -> speech)
2015-09-05 11:23:32 +02:00
Oskar Hahn 6acdb3c305 Merge pull request #1611 from emanuelschuetze/tags
Use tags in agenda. Fix motions.js.
2015-09-05 10:16:55 +02:00
Emanuel Schuetze 0e124dbbae Use tags in agenda. Fix motions.js. 2015-09-05 10:07:53 +02:00
Oskar Hahn 026f4d45cb Merge pull request #1607 from normanjaeckel/PollNumber
Removed poll_number field in MotionPoll model.
2015-09-05 09:58:57 +02:00
Oskar Hahn 2618001ddd Merge pull request #1609 from normanjaeckel/Localhost
Start browser at 'localhost:8000' in start script. Fixed #1534.
2015-09-05 09:39:46 +02:00
Oskar Hahn d8b0eca7f4 Merge pull request #1610 from normanjaeckel/GitAttributes
Removed .gitattributes. Fixed #1422.
2015-09-05 09:39:36 +02:00
Norman Jäckel 933318c19d Removed .gitattributes. Fixed #1422. 2015-09-05 09:36:47 +02:00
Norman Jäckel 80efae4980 Start browser at 'localhost:8000' in start script. Fixed #1534. 2015-09-05 09:32:56 +02:00
Norman Jäckel 5e5ab61612 Removed poll_number field in MotionPoll model. 2015-09-05 09:29:06 +02:00
Oskar Hahn dfe0094661 Merge pull request #1596 from ostcar/js-data-update
Updated js-data to 2.0
2015-09-04 21:07:49 +02:00
Oskar Hahn 6674ea85b7 Updated js-data to 2.0
Added js-data relation for the motion and agenda app

Added improved load function
2015-09-04 21:05:49 +02:00
Oskar Hahn ec50b6e67f Merge pull request #1602 from normanjaeckel/MotionPoll
Added views to create, update and delete MotionPoll objects.
2015-09-04 20:21:04 +02:00
Norman Jäckel a1f1cfed1f Added views to create, update and delete MotionPoll objects. 2015-09-04 19:55:47 +02:00
Norman Jäckel 6b747c8cef Merge pull request #1604 from normanjaeckel/OptionsPermissions
Set permissions for OPTIONS requests.
2015-09-04 15:51:43 +02:00
Norman Jäckel 965206e1fc Set permissions for OPTIONS requests. Fixed js-data dependency. Fixed blank in some motion model fields. Fixed error handling in agenda and core views. 2015-09-04 15:44:28 +02:00
Norman Jäckel aaadfbf78e Merge pull request #1600 from normanjaeckel/Plugins
Updated plugin utils. Enabled plugins to override urlpatterns.
2015-07-25 22:29:45 +02:00
Norman Jäckel 1cf8a1f222 Updated plugin utils. Enabled plugins to override urlpatterns. 2015-07-25 21:37:03 +02:00
Oskar Hahn f6c50a966d Merge pull request #1598 from ostcar/field_name_with_id_suffix
Appended an _id suffix to all related field names in the rest api
2015-07-25 19:20:44 +02:00
Oskar Hahn 89a6d5b451 Appended an _id suffix to all related field names in the rest api
Fixes #1597
2015-07-25 19:17:33 +02:00
Norman Jäckel 66f45ecd1f Merge pull request #1592 from normanjaeckel/CheckPermission
Refactored permission check for REST API viewsets.
2015-07-05 23:08:34 +02:00
Norman Jäckel 7e404946e4 Refactored view permissions.
Refactored permission check for REST API viewsets.
Removed old PermissionMixin.
Cleaned up several views.py files.
2015-07-05 22:17:58 +02:00
Oskar Hahn e6bc1c5016 Merge pull request #1588 from ostcar/python_requirements
Updated python requirements.
2015-07-03 11:04:24 +02:00
Oskar Hahn f31925387f Updated python requirements.
This included django 1.8
2015-07-02 14:51:08 +02:00
Norman Jäckel e2dc496352 Merge pull request #1591 from ostcar/angular_modules
Added a way to load angular apps dynamical
2015-07-01 22:21:02 +02:00
Oskar Hahn 291f60ee9f Added a way to load angular apps dynamical 2015-07-01 20:10:40 +02:00
Oskar Hahn 10c6d30252 Merge pull request #1589 from ostcar/fix_user_permissions
Fix osPerms to use groups registered and anonymous
2015-07-01 00:36:33 +02:00
Oskar Hahn 1dbe07c041 Fix osPerms to use groups registered and anonymous
Fixes #1586
2015-07-01 00:32:37 +02:00
Emanuel Schütze 0910c3fac2 Merge pull request #1585 from emanuelschuetze/release-2.0a1
Release 2.0a1
2015-06-29 22:03:10 +02:00
Emanuel Schuetze c6800bc8f5 Update version to 2.0b1-dev 2015-06-29 21:58:58 +02:00
518 changed files with 7725 additions and 44865 deletions

4
.gitattributes vendored
View File

@ -1,4 +0,0 @@
.gitattributes export-ignore
.gitignore export-ignore
/docs export-ignore
/extras export-ignore

37
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@ -0,0 +1,37 @@
---
name: Bug report
about: Create a report to help us improve OpenSlides
title: ""
labels: bug
assignees: ""
---
**Describe the bug**
A clear and concise description of what the bug is.
**How to Reproduce**
Steps to reproduce the behavior: preferably on [nighty](https://nightly.demo.openslides.org)
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**System information**
- OpenSlides-Version: [e.g. 2.1, 2.2, 2.3, 3,0]
- Additional version information (if any): [e.g. commit hash or installation-month]
- Python Version: [e.g. 3,5, 3.6, 3.7]
- Device: [e.g. iPhone6, Notebook]
- OS: [e.g. Andoird 7, iOS8.1, Windows 10]
- Browser: [e.g. chrome, firefox, opera, edge, safari]
- Browser-Version: [e.g. 22]
**Additional context**
Add any other information to comprehend your problem
**Screenshots**
If applicable, add screenshots to help explain your problem.

View File

@ -0,0 +1,19 @@
---
name: Feature request
about: Suggest an idea for OpenSlides
title: ""
labels: feature
assignees: ""
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -0,0 +1,39 @@
version: "3"
services:
backend:
image: openslides-backend
ports:
- "9002:9002"
environment:
- DATASTORE_READER_HOST=reader
- DATASTORE_READER_PORT=9010
- DATASTORE_WRITER_HOST=writer
- DATASTORE_WRITER_PORT=9011
depends_on:
- writer
- reader
reader:
image: openslides-datastore-reader
environment:
- DATASTORE_ENABLE_DEV_ENVIRONMENT=1
depends_on:
- postgresql
ports:
- "9010:9010"
writer:
image: openslides-datastore-writer
environment:
- DATASTORE_ENABLE_DEV_ENVIRONMENT=1
- MESSAGE_BUS_HOST=redis
- MESSAGE_BUS_PORT=6379
depends_on:
- postgresql
- redis
postgresql:
image: postgres:11
environment:
- POSTGRES_USER=openslides
- POSTGRES_PASSWORD=openslides
- POSTGRES_DB=openslides
redis:
image: redis:alpine

90
.github/workflows/build_images.yml vendored Normal file
View File

@ -0,0 +1,90 @@
---
name: Build Docker images for all OpenSlides services
on: [push, workflow_dispatch]
env:
IMAGE_VERSION: 4.0.0-beta
TAG_SUFFIX: -$(date +%Y%m%d)-${GITHUB_SHA::7}
jobs:
build:
name: Builds Docker images
runs-on: ubuntu-latest
strategy:
matrix:
service:
- name: openslides-proxy
directory: proxy
- name: openslides-client
directory: openslides-client
- name: openslides-backend
directory: openslides-backend
- name: openslides-datastore-reader
directory: openslides-datastore-service
args:
MODULE: reader
PORT: 9010
- name: openslides-datastore-writer
directory: openslides-datastore-service
args:
MODULE: writer
PORT: 9011
- name: openslides-autoupdate
directory: openslides-autoupdate-service
- name: openslides-auth
directory: openslides-auth-service
- name: openslides-vote
directory: openslides-vote-service
- name: openslides-icc
directory: openslides-icc-service
- name: openslides-media
directory: openslides-media-service
- name: openslides-manage
directory: openslides-manage-service
steps:
- name: Check out code
uses: actions/checkout@v2
with:
submodules: true
- name: Build image
working-directory: ${{ matrix.service.directory }}
env:
DOCKER_BUILDKIT: 1
run: |
if [ "${{ matrix.service.name }}" = "openslides-client" ]
then
eval echo ${IMAGE_VERSION}${TAG_SUFFIX} > client/src/assets/version.txt
fi
if [ "${{ matrix.service.args }}" != "" ]
then
export BUILD_ARGS="--build-arg MODULE=${{ matrix.service.args.MODULE }}
--build-arg PORT=${{ matrix.service.args.PORT }}"
fi
docker build . --tag ${{ matrix.service.name }} $BUILD_ARGS
- name: Log into registry
run: echo "${{ secrets.GITHUB_TOKEN }}" |
docker login ghcr.io --username ${{ github.actor }} --password-stdin
- name: Push image
run: |
IMAGE_ID=ghcr.io/${{ github.repository }}/${{ matrix.service.name }}
# Change all uppercase to lowercase
IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
docker tag ${{ matrix.service.name }} ${IMAGE_ID}:$(eval echo ${IMAGE_VERSION}${TAG_SUFFIX})
docker tag ${{ matrix.service.name }} ${IMAGE_ID}:latest
docker push ${IMAGE_ID}:$(eval echo ${IMAGE_VERSION}${TAG_SUFFIX})
docker push ${IMAGE_ID}:latest

25
.github/workflows/test-integration.yml vendored Normal file
View File

@ -0,0 +1,25 @@
---
name: Run integration tests (cypress)
on: [push, pull_request]
jobs:
run-cypress:
name: 'Runs integration tests in cypress'
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
with:
submodules: recursive
- name: Build and run OS4 Dev
run: make run-dev ARGS="-d"
- name: Run integration tests (cypress)
uses: cypress-io/github-action@v2
with:
working-directory: integration
wait-on: 'https://localhost:8000'
wait-on-timeout: 300
env:
NODE_TLS_REJECT_UNAUTHORIZED: 0

62
.gitignore vendored
View File

@ -1,27 +1,49 @@
# General
*.pyc
*.swp
*.swo
*.log
*~
# Virtual Environment
.virtualenv/*
.venv/*
# Javascript tools and libraries
node_modules/*
bower_components/*
# Development user data (settings, database, media, search index, static files)
development/*
openslides/static/*
# Package building/IDE
docs/_build/*
*.egg-info
build/*
dist/*
.DS_Store
.idea
*.code-workspace
# Unit test and coverage reports
# docs
docs/modelsvalidator/modelsvalidator
dev-commands/export.json
# certs
*.pem
# Deployment
/docker/docker-compose.yml
/docker/docker-stack.yml
/docker/secrets/auth_*_key
docker/secrets/*.env
# Integration testing
/integration/results
/integration/cypress/downloads
/integration/cypress/screenshots
/integration/cypress/videos
/integration/node_modules
# Old OS3 files and folders
.coverage
.mypy_cache
Compodoc
__pycache__
bower_components
client
make
openslides_*
openslides
personal_data
tests
.launch/
.venv/
.virtualenv/
.vscode/
client/package-lock.json
server/
# OS3+-Submodules
/autoupdate/

36
.gitmodules vendored Normal file
View File

@ -0,0 +1,36 @@
[submodule "openslides-datastore-service"]
path = openslides-datastore-service
url = https://github.com/OpenSlides/openslides-datastore-service.git
branch = main
[submodule "openslides-client"]
path = openslides-client
url = https://github.com/OpenSlides/openslides-client.git
branch = main
[submodule "openslides-backend"]
path = openslides-backend
url = https://github.com/OpenSlides/openslides-backend.git
branch = main
[submodule "openslides-autoupdate-service"]
path = openslides-autoupdate-service
url = https://github.com/OpenSlides/openslides-autoupdate-service.git
branch = main
[submodule "openslides-auth-service"]
path = openslides-auth-service
url = https://github.com/OpenSlides/openslides-auth-service.git
branch = main
[submodule "openslides-media-service"]
path = openslides-media-service
url = https://github.com/OpenSlides/openslides-media-service.git
branch = main
[submodule "openslides-manage-service"]
path = openslides-manage-service
url = https://github.com/OpenSlides/openslides-manage-service.git
branch = main
[submodule "openslides-icc-service"]
path = openslides-icc-service
url = https://github.com/OpenSlides/openslides-icc-service.git
branch = main
[submodule "openslides-vote-service"]
path = openslides-vote-service
url = https://github.com/OpenSlides/openslides-vote-service.git
branch = main

View File

@ -1,26 +0,0 @@
language: python
sudo: false
cache:
directories:
- node_modules
- $HOME/virtualenv/python$TRAVIS_PYTHON_VERSION/lib/python$TRAVIS_PYTHON_VERSION/site-packages/
- $HOME/virtualenv/python$TRAVIS_PYTHON_VERSION/bin/
python:
- "3.3"
- "3.4"
install:
- "pip install --upgrade --requirement requirements.txt"
- "npm install"
- "node_modules/.bin/bower install"
- "node_modules/.bin/gulp --production"
script:
- "flake8 openslides tests"
- "isort --check-only --recursive openslides tests"
- "DJANGO_SETTINGS_MODULE='tests.settings' coverage run ./manage.py test tests.unit"
- "coverage report --fail-under=43"
- "DJANGO_SETTINGS_MODULE='tests.settings' coverage run ./manage.py test tests.integration"
- "coverage report --fail-under=50"
- "DJANGO_SETTINGS_MODULE='tests.old.settings' ./manage.py test tests.old"

21
AUTHORS
View File

@ -16,3 +16,24 @@ Authors of OpenSlides in chronological order of first contribution:
Dominik Breu <dominikbreu@yahoo.de>
André Böhlke <ab@bcoding.de>
René von der Haar <rene.vonderhaar@medienweite.de> (Logo design)
Jörn Bensch <bensch@triagonale.de> (Template design)
John Felipe Urrego Mejia <ingenierofelipeurrego@gmail.com> (Spanish translation)
Erik Steenman <eriksteenman@gmail.com>
Sean Engelhardt <sean.f.t.engelhardt@gmail.com>
Maximilian Krambach <maximilian.krambach@gmx.de>
Joel Macht <joel.macht@web.de>
Finn Stutzenstein <finn.stutzenstein@intevation.de>
Thomas Junk <lilith2k3@archlinux.us>
Meinert Leinigen <openslides@leinigen.cc>
Andreas Engler <engel.a@web.de> (Russian translation)
Raimund Renkert <raimund@renkert.org>
Jochen Saalfeld <jochen.saalfeld@intevation.de>
Fadi Abbud <fmfn13@hotmail.com>
Gabriel Meyer <meyergabriel@live.de>
Gernot Schulz <gernot@intevation.de>
Joshua Sangmeister <joshua.sangmeister@gmail.com>
Ralf Peschke <rpeschke@peschke-it.de>
Ludwig Reiter <ludwig.reiter@intevation.de>
Adrian Richter <adrian@intevation.de>
Camille Akmut
Johannes Rolf <johannes.rolf@rwth-aachen.de>

489
CHANGELOG
View File

@ -1,489 +0,0 @@
=========================
CHANGELOG of OpenSlides
=========================
http://openslides.org
Version 2.0.0 (unreleased)
==========================
[https://github.com/OpenSlides/OpenSlides/milestones/2.0]
Agenda:
- Updated the tests and changed internal parts of method of the agenda model.
- Removed mptt.
Assignments:
- Renamed app from assignment to assignments.
- Massive refactoring and cleanup of the app.
Motions:
- Renamed app from motion to motions.
Mediafiles:
- Renamed app from mediafile to mediafiles.
Users:
- Massive refactoring of the participant app. Now called 'users'.
- Used new anonymous user object instead of an authentification backend. Used
special authentication class for REST requests.
- Used authentication frontend via AngularJS.
Other:
- New OpenSlides logo.
- Changed supported Python version to >= 3.3.
- Used Django 1.7 as lowest requirement.
- Added Django's application configuration. Refactored loading of signals
and projector elements/slides.
- Setup migrations.
- Added API using Django REST Framework 3.x. Added several views and mixins
for generic Django REST Framework views in OpenSlides apps.
- Removed most of the Django views and templates.
- Removed Django error pages.
- Refactored projector API using metaclasses now.
- Renamed SignalConnectMetaClass classmethod get_all_objects to get_all
(private API).
- Refactored config API and moved it into the core app.
- Removed old style personal info page, main menu entries and widget API.
- Used AngularJS with additional libraries for single page frontend.
- Removed use of 'django.views.i18n.javascript_catalog'. Used angular-gettext
now.
- Updated to Bootstrap 3.
- Used SockJS for automatic update of AngularJS driven single page frontend.
- Refactored start script and management commands.
- Refactored tests.
- Used Bower and gulp to manage third party JavaScript and Cascading Style
Sheets libraries.
- Used setup.cfg for development tools.
- Removed code for Windows portable version with GUI. Used new repository for
this.
Version 1.7 (2015-02-16)
========================
[https://github.com/OpenSlides/OpenSlides/milestones/1.7]
Core:
- New feature to tag motions, agenda and assignments.
- Fixed search index problem to index contents of many-to-many tables
(e. g. tags of a motion).
- Fixed AttributeError in chatbox on_open method.
Motions:
- New Feature to create amendments, which are related to a parent motion.
- Added possibility to hide motions from non staff users in some states.
Assignments:
- Fixed permissions to alter assignment polls.
Other:
- Cleaned up utils.views to increase performance when fetching single objects
from the database for a view (#1378).
- Fixed bug on projector which was not updated when an object was deleted.
- Fixed bug and show special characters in PDF like ampersand (#1415).
- Updated pdf.js to 1.0.907.
- Improve the usage of bsmselect jquery plugin.
- Updated translations.
Version 1.6.1 (2014-12-08)
==========================
[https://github.com/OpenSlides/OpenSlides/issues?milestone=16]
Agenda:
- Fixed error in item numbers.
Motions:
- Show supporters on motion slide if available.
- Fixed motion detail view template. Added block to enable extra content via
plugins.
Assignments:
- Fixed PDF build error when an election has more than 20 posts or candidates.
Participants:
- Fixed participant csv import with group ids:
* Allowed to add multiple groups in csv group id field, e. g. "3,4".
* Fixed bug that group ids greater than 9 can not be imported.
* Updated error message if group id does not exists.
Other:
- Fixed CKEditor stuff (added insertpre plugin and removed unused code).
- Updated French, German and Czech translation.
Version 1.6 (2014-06-02)
========================
[https://github.com/OpenSlides/OpenSlides/issues?milestone=14]
Dashboard:
- Added shortcuts for the countdown.
- Enabled copy and paste in widgets.
Agenda:
- New projector view with the current list of speakers.
- Added CSV import of agenda items.
- Added automatic numbering of agenda items.
- Fixed organizational item structuring.
Motions:
- New slide for vote results.
- Created new categories during CSV import.
Assignments/Elections:
- Coupled assignment candidates with list of speakers.
- Created a poll description field for each assignment poll.
- New slide for election results.
Participants:
- Disabled dashboard widgets by default.
- Added form field for multiple creation of new participants.
Files:
- Enabled update and delete view for uploader refering to his own files.
Other:
- Added global chatbox for managers.
- New config option to set the 100 % base for polls (motions/elections).
- Changed api for plugins. Used entry points to detect them automaticly. Load
them automaticly from plugin directory of Windows portable version.
- Added possibility to use custom templates and static files in user data path
directory.
- Changed widget api. Used new metaclass.
- Changed api for main menu entries. Used new metaclass.
- Inserted api for the personal info widget. Used new metaclass.
- Renamed config api classes. Changed permission system for config pages.
- Regrouped config collections and pages.
- Renamed some classes of the poll api.
- Renamed method and attribute of openslides.utils.views.PermissionMixin.
- Added api for absolute urls in models.
- Inserted command line option to translate config strings during database setup.
- Enhanced http error pages.
- Improved responsive design for templates.
- Fixed headings on custom slides without text.
- Moved dashboard and select widgets view from projector to core app.
- Renamed and cleaned up static direcories.
- Used jsonfield as required package. Removed jsonfield code.
- Added new package backports.ssl_match_hostname for portable build script.
- Used new app "django-ckeditor-updated" to render WYSIWYG html editors.
Removed CKEditor from sources.
- Only reload the webserver in debug-mode.
Version 1.5.1 (2014-03-31)
==========================
[https://github.com/OpenSlides/OpenSlides/issues?milestone=15]
Projector:
- Fixed path and config help text for logo on the projector.
Agenda:
- Fixed permission error in the list of speakers widget.
- Fixed Item instance method is_active_slide().
Motion:
- Fixed sorting of motions concerning the identifier. Used natsort and
DataTables Natural Sort Plugin.
Participant:
- Added permission to see participants to the manager group.
- Fixed user status view for use without Javascript.
Files:
- Fixed error when an uploaded file was removed from filesystem.
Other:
- Set minimum Python version to 2.6.9. Fixed setup file for use with Python 2.6.
- Used unicode font for circle in ballot pdf. Removed Pillow dependency package.
- Fixed http status code when requesting a non-existing static page using
Tornado web server.
- Fixed error in main script when using other database engine.
- Fixed error on motion PDF with nested lists.
Version 1.5 (2013-11-25)
========================
[https://github.com/OpenSlides/OpenSlides/issues?milestone=10]
Projector:
- New feature: Show PDF presentations on projector (with included pdf.js).
- Improved projector update process via new websocket API (using sockjs and tornado).
- New projector template with twitter bootstrap.
- Improved projector zoom and scroll behaviour.
Agenda:
- New config option: couple countdown with list of speakers.
- Used HTML editor (CKEditor) for agenda item text field.
- Added additional input format for agenda item duration field.
Motions:
- Enabled attachments for motions.
- Refactored warnings on CSV import view.
Elections:
- Refactored assignment app to use class based views instead of functions.
Polls:
- Added percent base to votes cast values.
Participants:
- Updated access data PDF: WLAN access (with QRCode for WLAN ssid/password)
and OpenSlides access (with QRCode for system URL), printed on a single A4 page
for each participant.
Other:
- Full text search integration (with Haystack and Whoosh).
- New start script with new command line options (see python manage.py --help)
- Fixed keyerror on user settings view.
- New messages on success or error of many actions like creating or editing objects.
- Changed messages backend, used Django's default now.
- A lot of template fixes and improvements.
- Extended css style options in CKEditor.
- Added feature to config app to return the default value for a key.
- Cleaned up OpenSlides utils views.
- Improved README (now with install instructions and used components).
- Updated all required package versions.
- Used flake8 instead of pep8 for style check, sort all import statements with isort.
- Added Portuguese translation (Thanks to Marco A. G. Pinto).
- Switched to more flexible versions of required third party packages.
- Updated to Django 1.6.x.
- Updated German documentation.
- Change license from GPLv2+ to MIT, see LICENSE file.
Version 1.4.2 (2013-09-10)
==========================
[https://github.com/OpenSlides/OpenSlides/issues?milestone=12]
- Used jQuery plugin bsmSelect for better <select multiple> form elements.
- New config option to disable paragraph numbering in motion pdf. (Default value: disabled.)
- Removed max value limitation in config field 'motion_min_supporters'.
- Removed supporters signature field in motion pdf.
- Fixed missing creation time of motion version. Show now string if identifier is not set (in widgets and motion detail).
- Fixed error when a person is deleted.
- Fixed deleting of assignments with related agenda items.
- Fixed wrong ordering of agenda items after order change.
- Fixed error in portable version: Open browser on localhost when server listens to 0.0.0.0.
- Fixed typo and updated translations.
- Updated CKEditor from 4.1.1 to 4.2. Fixed errors in MS Internet Explorer.
- Updated to Django 1.5.2.
Version 1.4.1 (2013-07-29)
==========================
[https://github.com/OpenSlides/OpenSlides/issues?milestone=11]
- Fixed tooltip which shows the end of each agenda item.
- Fixed duration of agenda with closed agenda items.
- Disabled deleting active version of a motion.
- Start browser on custom IP address.
- Fixed wrong URLs to polls in motion detail view.
- Added Czech translation.
Version 1.4 (2013-07-10)
========================
[https://github.com/OpenSlides/OpenSlides/issues?milestone=7]
Agenda:
- New feature: list of speakers for each agenda item which saves begin and end
time of each speaker; added new widget and overlay on the dashboard for easy
managing and presenting lists of speakers.
- New item type: organisational item (vs. agenda item).
- New duration field for each item (with total time calculation for end time of event).
- Better drag'n'drop sorting of agenda items (with nestedSortable jQuery plugin).
Motions:
- Integrated CKEditor to use allowed HTML formatting in motion text/reason.
With server-side whitelist filtering of HTML tags (with bleach) and HTML support
for reportlab in motion pdf.
- New motion API.
- Support for serveral submitters.
- New workflow concept with two built-in workflows:
a) complex workflow (like in OpenSlides <= v1.3)
b) simple workflow (only 4 states: submitted -> accepted|rejected|not decided;
no versioning)
- Categories for grouping motions.
- New modifiable identifier.
- New motion version diff view. Improved history table in motion detail view.
- New config variable 'Stop submitting of new motions' (for non-manager users).
- Updated motion status log.
- Updated csv import.
Participants:
- New feature: qr-code for system url on participants password pdf.
- Update default groups and permissions.
- New participant field: 'title'.
- Removed participants field 'type'. Use 'group' field instead. Updated csv import.
- Added warning if non-superuser removes his last group containing permission to
manage participants.
Other:
- New html template based on twitter bootstrap.
- New GUI frontend for the Windows portable version.
- New command to backup sqlite database.
- New mediafile app (files) to upload/download files via frontend.
- Used Tornado web server (instead of Django's default development server).
- Updated win32 portable version to use Tornado.
- Integrated DataTables jQuery plugin for overview tables of motions, elections
and participants (for client side sorting/filtering/pagination).
- New overlay API for projector view.
- New config app: Apps have to define config vars only once; config pages and
forms are created automatically.
- Moved version page out of the config app.
- Changed version number api for plugins.
- Moved widget with personal info to account app. Inserted info about lists of speakers.
- Updated to Django 1.5.
- Dropped support for python 2.5.
- Updated packaging (setup.py and portable).
- Open all PDFs in a new tab.
- Changed Doctype to HTML5.
- Updated German documentation (especially sections about agenda and motions).
- Several minor fixes and improvements.
Version 1.3.1 (2013-01-09)
==========================
[http://dev.openslides.org/milestone/1.3.1]
- Fixed unwanted automatical language switching on projector view if more than
one browser languages send projector request to OpenSlides (#434)
Version 1.3 (2012-12-10)
========================
[http://dev.openslides.org/milestone/1.3]
Projector:
- New public dashboard which allows access for all users per default. (#361)
(changed from the old, limited projector control page)
- New dashboard widgets:
* welcome widget (shows static welcome title and text)
* participant widget
* group widget
* personal widget (shows my motions and my elections)
- Hide scrollbar in projector view.
- Added cache for AJAX version of the projector view.
- Moved projector control icons into projector live widget. (#403)
- New weight field for custom slides (to order custom slides in widget).
- Fixed drag'n'drop behaviour of widgets into empty dashboard column.
- Fixed permissions for agenda, motion and assignment widgets (set to projector.can_manage_projector).
Agenda:
- Fixed slide error if agenda item deleted. (#330)
Motions:
- Translation: Changed 'application' to 'motion'.
- Fixed: Manager could not edit supporters. (#336)
- Fixed attribute error for anonymous users in motion view. (#329)
- Set default sorting of motions by number (in widget).
- CSV import allows to import group as submitter. (#419)
- Updated motion code for new user API.
- Rewrote motion views as class based views.
Elections:
- User can block himself/herself from candidate list after delete his/her candidature.
- Show blocked candidates in separate list.
- Mark elected candidates in candidate list. (#374)
- Show linebreaks in description. (#392)
- Set default sorting of elections by name (in widget).
- Fixed redirect from a poll which does not exists anymore.
- Changed default permissions of anonymous user to see elections. (#334)
- Updated assignment code for new user API.
Participants:
- New user and group API.
- New group option to handle a group as participant (and thus e.g. as submitter of motion).
- CSV import does not delete existing users anymore and append users as new users.
- New user field 'about me'. (#390)
- New config option for sorting users by first or last name (in participant lists, elections and motions). (#303)
- Allowed whitespaces in username, default: <firstname lastname>. (#326)
- New user and group slides. (#176)
- Don't allow to deactivate the administrator or themself.
- Don't allow to delete themself.
- Renamed participant field 'groups' to 'structure level' (German: Gliederungsebene).
- Rewrote participant views as class based views.
- Made OpenSlides user a child model of Django user model.
- Appended tests.
- Fixed error to allow admins to delete anonymous group
Other:
- Added French translation (Thanks to Moira).
- Updated setup.py to make an openslides python package.
- Removed frontpage (welcome widget contains it's content) and redirect '/' to dashboard url.
- Added LOCALE_PATHS to openslides_settings to avoid deprecation in Django 1.5.
- Redesigned the DeleteView (append QuestionMixin to send question via the django message API).
- Fixed encoding error in settings.py. (#349)
- Renamed openslides_settings.py to openslides_global_settings.py.
- New default path to database file (XDG_DATA_HOME, e.g. ~/.local/share/openslides/).
- New default path to settings file (XDG_CONFIG_HOME, e.g. ~/.config/openslides/).
- Added special handling to determine location of database and settings file in portable version.
- Don't use similar characters in generated passwords (no 'Il10oO').
- Localised the datetime in PDF header. (#296)
- Used specific session cookie name. (#332)
- Moved code repository from hg to git (incl. some required updates, e.g. version string function).
- Updated German translations.
- Several code optimizations.
- Several minor and medium issues and errors were fixed.
Version 1.2 (2012-07-25)
========================
[http://dev.openslides.org/milestone/1.2]
General:
- New welcome page with customizable title and text.
- OpenSlides portable win32 binary distribution.
- New start script (start.py) to automatically create the default settings and the
database, start the server and the default browser.
- Add plugin system. Allow other django-apps to interact with OpenSlides.
Projector:
- New projector dashboard to control all slides on projector.
- New projector live view on projector dashboard.
- Countdown calculation works now on server-side.
- New Overlay messages to show additional information on a second
projector layer.
- Add custom slides.
- Add a welcome slide.
- Project application and assignment slides without an agenda item.
- Update the projector once per second (only).
Agenda:
- Add new comment field for agenda items.
Elections (Assignments):
- New config option to publish voting results for selected winners only.
Applications:
- Now, it's possible to deactivate the whole supporter system.
- New import option: set status of all imported applications to
'permit'.
- More log entries for all application actions.
Participant:
- Add new comment field for participants.
- Show translated permissions strings in user rols form.
- Admin is redirect to 'change password' page.
- New default user name: "firstname lastname".
Other:
- Use Django's class based views.
- Update to Django 1.4. Drop python 2.4 support for this reason.
- Separate the code for the projector.
- Rewrite the vote results table.
- Rewrite the poll API.
- Rewrite the config API. (Now any data which are JSON serializable
can be stored.)
- Improved CSV import for application and participants.
- GUI improvements of web interface (e.g. sub navigations, overview tables).
- Several minor and medium issues and errors were fixed.
Version 1.1 (2011-11-15)
========================
[http://dev.openslides.org/milestone/1.1]
Agenda:
- [Feature] Agenda overview: New item-done-column for all non-manager (#7)
- [Feature] Allow HTML-Tags in agenda item of text (#12)
- [Feature] Split up hidden agenda items in new agenda table section (#13)
Projector:
- [Feature] Assignment projector view layout improvements (#9)
- [Bugfix] Zoom problem for sidebar div in beamer view (#5)
- [Bugfix] Blue 'candidate elected line' not visible in projector ajax view (#6)
- [Bugfix] Assignment projector view: Show results for elected candidates only (#11)
- [Bugfix] Missing beamer scaling (#2)
- [Bugfix] Assigment projector view: Removed empty character for no results cell. (#10)
Applications:
- [Feature] Import applications (#55)
- [Feature] Support trivial changes to an application (#56)
- [Bugfix] Order submitter and supporter form fields by full name (#53)
- [Bugfix] Application: Show profile instead of submitter username (#15)
- [Bugfix] "Application: Only check enough supports in status ""pub""" (#16)
Elections:
- [Feature] New button to show agenda item of selected application/assignment (#54)
- [Feature] Open add-user-url in new tab. (#32)
Applications/Elections:
- [Feature] Show voting results in percent (#48)
Participants:
- [Feature] Filter displayed permissions in group editor (#59)
- [Feature] Generate password after user creation automatically (#58)
- [Bugfix] Encoding error (#1)
- [Bugfix] List of participants (pdf) link not visible for users with see-particiants-permissions (#3)
- [Bugfix] Use user.profile.get_type_display() instead of user.profile.type (#4)
PDF:
- [Feature] Mark elected candidates in PDF (#31)
- [Feature] New config option to set title and preamble text for application and assignment pdf (#33)
- [Feature] New config option to set number of ballots in PDF (#26)
- [Bugfix] Assignment ballot pdf: Wrong line break in group name with brackets (#8)
- [Bugfix] Print available candidates in assignment pdf (#14)
- [Bugfix] "Show ""undocumented"" for result ""-2"" in application and assignment pdf" (#17)
Other:
- [Feature] Rights for anonymous (#45)
- [Feature] Show counter for limited speaking time (#52)
- [Feature] Reorderd config tab subpages (#61)
- [Localize] i18n German: Use gender-specific strings (#51)
- [Bugfix] <button> inside <a> tag not working in IE (#57)
- [Bugfix] Change default sort for tables of applications, assignments, participants (#27)
Version 1.0 (2011-09-12)
========================
[http://dev.openslides.org/milestone/1.0]

964
CHANGELOG.md Normal file
View File

@ -0,0 +1,964 @@
# CHANGELOG of OpenSlides
https://openslides.com
## Version 3.1 (2019-12-13)
[Milestone](https://github.com/OpenSlides/OpenSlides/milestones/3.0)
**General:**
- Improved loading time of OpenSlides [#5061, #5087, #5110, #5146 - Breaks IE11].
- Improved Websocket reconnection - works now more reliable [#5060].
- Improved performance by replacing deprecated encode and decode library with faster manual approaches [#5085, #5092].
- Improved mobile views for small devices [#5106].
- Improved virtual scrolling behavior of tables: remember last scroll position [#5156].
- New SingleSignOn login method via SAML [#5000].
- New inline editing for start page, legal notice and privacy policy [#5086].
- Reordered settings in subpages for better overview [#4878, #5083, #5096].
- Added html meta noindex tag to prevent search engines finding instances of OpenSlides [#5061].
- Added server log entries for usage of notify feature [#5066].
- Added server-side HTML validation for personal notes (motions) and about me field (users) [#5121].
- Fixed an issue where projector button in lists was always not indicating the projected element [#5055].
- Fixed issues where search-filter, property-filter and property-sort in list views does not work correctly [#5065].
- Fixed an issues where list view entries using virtual scrolling become invisible [#5072].
- Fixed an error where loading spinner would not disappear while offline mode [#5151].
- Various cleanups and improvements to usability, performance and translation.
**Agenda:**
- New config option to show motion submitters as subtitle in agenda list [#5002, #5094].
- New view to sort sepakers of a list - preventing unwanted changes esp. using mobile devices [#5069].
- New button to readd the last speaker to the top of the list [#5069, #5067].
- New agenda list filter 'item type' (topic, motion, motion block, election) [#5084].
- Changed window title for current list of speakers [#5037].
- Added motion title in agenda list [#5063].
**Motions:**
- New option to export personal notes [#5075].
- New amendment filter for motion list [#5056, #5157].
- New possibility to change state and recommendation in motion list using quick edit [#5071].
- Added multi select actions to amendment list [#5041].
- Added search value selector in multi select action dialogs [#5058].
- Added support for nested lists with line numbers in PDF export [#5138].
- Improved scaling of motion tile view [#5038].
- Improved performance for large motions with dozens of amendments by implementing manual change detection in motion detail [#5074, #5139].
- Improved display of long names for states and recommendations in drop down menu in motion detail view [#5079].
- Improved amendment slide by showing only changed line(s)s without surrounding paragraph [#5144].
- Fixed line number errors during creation of amendments [#5023].
- Fixed an issue that ol/ul lists are not printed in amendment PDF [#5051].
- Fixed the amendment option "Show entire motion text" [#5052].
- Fixed a rare bug in final version where change recommendations or amendments would have been hidden [#5070].
- Fixed PDF export in final version: use modified final version if available [#5139].
- Fixes a bug where the event name was printed twice in the PDF header [#5155].
**Elections:**
- Fixed errors by entering votes and sorting candidates [#5129, #5125].
- Fixed a permission issue that prevented nominating another participants for elections [#5154].
**Users:**
- Fixed wrong permission check for set password [#5128].
**Mediafiles:**
- Fixed mediafile upload path [#4710].
- Fixed double slash in mediafile URL [#5031].
- Original filename must now be unique for files [#5123].
**Projector:**
- New projector edit dialog with preview [#5043].
- Added support for custom aspect ratios in projector edit dialog; database migration required [#5141].
- Added missing autoupdates for changed projection defaults [#5045].
- Added scaleable tile for projector list [#5043].
- Added a lock icon on the list of speaker slide if list has been closed [#5154].
- Improved autoupdates for projectors by using changeIDs [#5064].
- Improved performance by preventing high CPU usage on Firefox in projector detail view [#5022].
- Changed config option to show nice horizontal meta box on motion slide [#5088].
- Changed config option "Event date" back to string format [#5042].
- Saved countdown settings [#5053].
**Breaking Changes:**
- Due to faster model handling (using the 'Proxy' function) Internet Explorer 11 cannot be supported anymore!
## Version 3.0 (2019-09-13)
[Milestone](https://github.com/OpenSlides/OpenSlides/milestones/3.0)
**General (Client):**
- OpenSlides client completely rewritten, based on Angular 8 and Material Design.
- OpenSlides is now a Progressive Web App (PWA).
- New browser caching via IndexedDB (one cache store for all browser tabs).
- New list views optimized with virtual scrolling (improved performance for long lists).
- New global quick search using by shortcut 'Alt+Shift+F'.
- New built-in design themes for customizing user interface.
- New update notification if OpenSlides static files are updated.
- New config option for pdf page size (DIN A4 or A5).
- Added TinyMCE 5 editor (switched from CKEditor caused by changed license).
- Switched from yarn/gulp to npm.
- Improved pdf gerneration with progress bar and cancel option.
- Translations available for EN, DE, RU and CS.
**General (Server):**
- New websocket protocol for server client communication using JSON schema.
- New change-id system to send only updated elements to client.
- New global history mode (useable for admin group only).
- Updated to Channels 2.
- Dropped support for Python 3.5.
- Dropped support for Geiss.
- Complete rework of startup and caching system. Dropped restricted data cache.
- Changed URL schema.
- Changed personal settings.py.
- Changed format for elements send via autoupdate.
- Changed projector concept.
- Compressed autoupdates before sending to clients (reduced traffic).
- Fixed autoupdate system for related objects.
- Fixed logo configuration if logo file is deleted.
- Added several bulk views for motions and users (one request for updating multiple selected elements).
- Added docs for using OpenSlides in 'big mode' with Gunicorn and Uvicorn.
- Added docs for configure OpenSlides in settingy.py.
- Dropped chat functionality.
- Server performance improvements.
**Agenda:**
- Agenda items are now optional (for motions, elections and mediafiles). New config to set default behavior.
- New drag&drop view to sort agenda items.
- New config option: only present participants can be added to list of speakers.
- New config option to hide number of speakers on projector.
**Motions:**
- New call list for custom sort of motions.
- New tile layout view with all categories (each category a tile).
- New statute motions with managing statute paragraphs.
- New permission to manage metadata (state, recommendation, submitters and supporters, category, motion block and polls).
- New permission to create amendments.
- New permission to see motions in internal states.
- New access restrictions definable for each motion state in workflow.
- New 'internal' option for motion blocks.
- New sorting view for categories to create subcategories.
- New custom comment fields for all motions (read/write access can be managed via permission groups).
- New motion history (each action is stored in global OpenSlides history which can be restored any time, replaced old motion version and log features).
- New XLSX export (docx support is dropped).
- New navigation for next/previous motion in detail view (shortcut: 'Alt+Shift+Left/Right').
- New multi select actions.
- New timestampes for motions (for sorting by creation date and last modified).
- New config option to set reason as required field.
- New config option to change multiple paragraphs with an amendment.
- New config option to hide motion text on projector.
- New config option to show sequential number.
- New config option to show all motions which are referred to a special motion.
- New config option to show submitters and recommendation in table of contents of PDF.
- New config options to control identifier generation - number of digits and blanks (moved from settings.py).
- Improved PDF export (optional with toc, page numbers, date, comments and meta information)
- Improved motion numbering in (sub)categories: Motions of subcategories are also numbered, and parents of amendments needs to be in the numbered category or any subcategory.
- Improved projection layout of motion blocks.
- Changed default workflows: Allowed submitters to set state of new motions in complex and customized workflow. No migration provided.
- Change CSV import to add tags.
**User:**
- New admin group which grants all permissions. Users of existing group 'Admin' or 'Staff' are move to the new group during migration.
- New gender field.
- New password forget/reset function via email.
- New permission to change own password.
- New config option for sender name and reply email address (From address is defined in settings.py).
**Mediafiles:**
- New support for (sub)folders and permission groups.
**Projector:**
- New views to list, manage and control created OpenSlides projectors.
- New projector queue (add slide to queue), all projected slides are logged.
- New chyron for current speaker.
- New color settings for each projector.
## Version 2.3 (2018-09-20)
[Release notes](https://github.com/OpenSlides/OpenSlides/wiki/OpenSlides-2.3) · [Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.3)
**Agenda:**
- New item type 'hidden'. New visibilty filter in agenda [#3790].
**Motions:**
- New feature to scroll the projector to a specific line [#3748].
- New possibility to sort submitters [#3647].
- New representation of amendments (paragraph based creation, new diff and list views for amendments) [#3637].
- New feature to customize workflows and states [#3772, #3785].
- New table of contents with page numbers and categories in PDF [#3766].
- New teporal field "modified final version" where the final version can be edited [#3781].
- New config options to show logos on the right side in PDF [#3768].
- New config to show amendments also in motions table [#3792].
- Support to change decimal places for polls with a plugin [#3803].
**Elections:**
- Support to change decimal places for elections with a plugin [#3803]
**Core:**
- Updated Django to 2.1 [#3777, #3786].
- Support for Python 3.7 [#3786].
- Python 3.4 is not supported anymore [#3777].
- Updated pdfMake to 0.1.37 [#3766].
- Changed behavior of collectstatic management command [#3804].
## Version 2.2 (2018-06-06)
[Release notes](https://github.com/OpenSlides/OpenSlides/wiki/OpenSlides-2.2) · [Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.2)
**Agenda:**
- New permission for managing lists of speakers [#3366].
- New DOCX export of agenda [#3569].
- New collapsable agenda overview [#3567].
- New feature: mark speakers (e.g. as submitter) [#3570].
- New config option to enable numbering of items [#3697].
- New config option to hide internal items when projecting subitems [#3701].
- Hide closed agenda items in the item slide [#3567].
- Fixed wrong sorting of last speakers [#3193].
- Fixed issue when sorting a new inserted speaker [#3210].
- Fixed multiple request on creation of agenda related items [#3341].
- Autoupdates for all children if the item type has changed [#3659].
**Motions:**
- New export dialog for managers only [#3185].
- New personal note field for each motions [#3190, #3267, #3404].
- New navigation between single motions [#3459].
- New possibility to create change recommendations for motion titles [#3626].
- New support for export motions in a ZIP archive [#3189, #3251].
- New PDF export for personal note and comments [#3239].
- New config option for customize sorting of category list in pdf/docx export [#3329].
- New config optoin for pagenumber alignment in PDF [#3327].
- New config options to hide reason, recommendation and meta data box on projector [#3432, #3692].
- New inline editing for motion reason [#3361].
- New multiselect filter for motion comments [#3372].
- New support for pinning personal notes to the window [#3360].
- New warning message if an edit dialog was already opened by another client [#3212].
- New change recommendation type "other" [#3495].
- Fixed issue when creating/deleting motion comment fields in the settings [#3187].
- Fixed empty motion comment field in motion update form [#3194].
- Fixed error on category sort [#3318].
- Bugfix: Changing motion line length did not invalidate cache [#3202].
- Bugfix: Added more distance in motion PDF for DEL-tags in new lines [#3211].
- Bugfix: Creating colliding change recommendation is now prevented on server side [#3304].
- Bugfix: Several bugfixes regarding splitting list items in change recommendations [#3288].
- Bugfix: Several bugfixes regarding diff version [#3407, #3408, #3410, #3440, #3450, #3465, #3537, #3546, #3548, #3644, #3656].
- Improved the multiselect state filter [#3459].
- Save pagination state to session storage [#3569].
- Allow to delete own motions [#3516].
- Reference to motions by id in state and recommendation special field [#3498].
- Log which comment was updated [#3569].
- Split up 'can_see_and_manage_comments' permission in two seperate ones [#3565].
- Combined all boolean filters into one dropdown menu and added a filter for amendments [#3501].
- Show motion identifier in (current) list of speakers [#3442]
- Show the number of next speakers in motion list view [#3470].
- Added (shortened) motion title to motion block slide [#3700].
- Clear identifier on state reset [#3356].
- Reworked DOCX export parser and added comments to DOCX [#3258].
- Removed server side image to base64 transformation and added local transformation [#3181].
- Added karma:watch command [#3466].
**Elections:**
- New pagination for list view [#3393].
**Users:**
- New fast mass import for users [#3290].
- New default user group 'admin' [#3621].
- New feature to send invitation emails with OpenSlides login data [#3503, #3525].
- New view to toggle presence by entering participant number (can be used with barcode scanner) [#3496].
- New support for password validation using Django or custom validators
5. 7. for minimum password length [#3200].
- Hide password in change password view [#3417].
- Users without the permission 'can see users' can now see agenda item speakers, motion submitters and supporters, assignment candidates, mediafile uploader and chat message users if they have the respective permissions [#3191, #3233].
- Fixed compare of duplicated users while CSV user import [#3201].
- Added settings option to enable updating the last_login field in the database. The default is now disabled [#3400].
- Removed OPTIONS request. All permissions are now provided on startup [#3306].
**Mediafiles:**
- New form for uploading multiple files [#3650].
- New custom CKEditor plugin for browsing mediafiles [#3337].
- Project images always in fullscreen [#3355].
- Protect mediafiles for forbidden access [#3384].
- Fixed reloading of PDF on page change [#3274].
**Core:**
- New settings to upload custom fonts (for projector and pdf) [#3568].
- New custom translations to use custom wordings [#3383].
- New support for choosing image files as logos for projector, PDF and web interface header [#3184, #3207, #3208, #3310].
- New notify system [#3212].
- New config option for standard font size in PDF [#3332].
- New config option for disabling header and footer in the projector [#3357].
- New dynamic webpage title [#3404].
- New 'go to top'-link [#3404].
- New custom format cleanup plugin for CKEditor [#3576].
- Reset scroll level for each new projection [#3686].
- Scroll to top on every state change [#3689].
- Added pagination on top of lists [#3698].
- Improved performance for PDF generation significantly (by upgrading to pdfmake 0.1.30) [#3278, #3285].
- Enhanced performance esp. for server restart and first connection of all clients by refactoring autoupdate, Collection and AccessPermission [#3223, #3539].
- Improved reconnect handling if the server was flushed [#3297].
- No reload on logoff. OpenSlides is now a full single page application [#3172].
- Highlight list entries in a light blue, if a related object is projected (e. g. a list of speakers of a motion) [#3301].
- Select the projector resolution with a slider and an aspect ratio [#3311].
- Delay the 'could not load projector' error 3 seconds to not irritate users with a slow internet connection [#3323].
- Added default sorting for agenda, motions, elections, mediafiles and users [#3334, 3348].
- Added caching for the index views [#3419, #3424].
- Added projector prioritization [#3425].
- Added --debug-email flag to print all emails to stdout [#3530].
- Added --no-template-caching flag to disable template caching for easier development [#3566].
- Updated CKEditor to 4.7 [#3375].
- Reduced ckeditor toolbar for inline editing [#3368].
- New api route to project items with just one request needed [#3713].
- Use native twisted mode for daphne [#3487].
- Saved language selection to session storage [#3543].
- Set default of projector resolution to 1220x915 [#2549].
- Preparations for the SAML plugin; Fixed caching of main views [#3535].
- Removed unnecessary OPTIONS request in config [#3541].
- Switched from npm to Yarn [#3188].
- Improvements for plugin integration [#3330].
- Cleanups for the collection and autoupdate system [#3390]
- Bugfixes for PDF creation [#3227, #3251, #3279, #3286, #3346, #3347, #3342].
- Fixed error when clearing empty chat [#3199].
- Fixed autoupdate bug for a user without user.can_see_name permission [#3233].
- Fixed bug the elements are projected and the deleted [#3336].
- Several bugfixes and minor improvements.
*[#xxxx] = Pull request number to get more details on https://github.com/OpenSlides/OpenSlides/pulls*
## Version 2.1.1 (2017-04-05)
[Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.1.1)
**Agenda:**
- Fixed issue #3173 that the agenda item text cannot be changed.
**Other:**
- Set required version for optional Geiss support to <1.0.0.
## Version 2.1 (2017-03-29)
[Release notes](https://github.com/OpenSlides/OpenSlides/wiki/OpenSlides-2.1) · [Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.1)
**Agenda:**
- Added button to remove all speakers from a list of speakers.
- Added option to create or edit agenda items as subitems of others.
- Fixed security issue: Comments were shown for unprivileged users.
- Added option to choose whether to show the current list of speakers slide as a slide or an overlay.
- Manage speakers on the current list of speakers view.
- List of speakers for hidden items is always visible.
**Core:**
- Added support for multiple projectors.
- Added control for the resolution of the projectors.
- Added smooth projector scroll.
- Set the projector language in the settings.
- Added migration path from OpenSlides 2.0.
- Added support for big assemblies with lots of users.
- Django 1.10 is now supported. Dropped support for Django 1.8 and 1.9.
- Used Django Channels instead of Tornado. Refactoring of the autoupdate process. Added retry with timeout in case of ChannelFull exception.
- Made a lot of autoupdate improvements for projector and site.
- Added new caching system with support for Redis.
- Support https as websocket protocol (wss).
- Accelerated startup process (send all data to the client after login).
- Add the command getgeiss to download the latest version of Geiss.
- Add a version of has_perm that can work with cached users.
- Removed our AnonymousUser. Make sure not to use user.has_perm() anymore.
- Added function utils.auth.anonymous_is_enabled which returns true, if it is.
- Changed has_perm to support an user id or None (for anyonmous) as first argument.
- Cache the group with there permissions.
- Added watching permissions in client and change the view immediately on changes.
- Used session cookies and store filter settings in session storage.
- Removed our db-session backend and added possibility to use any django session backend.
- Added template hook system for plugins.
- Used Roboto font in all templates.
- Added HTML support for messages on the projector.
- Moved custom slides to own app "topics". Renamed it to "Topic".
- Added button to clear the chatbox.
- Better dialog handling. Show dialog just in forground without changing the state url. Added new dialog for profile, change password, tag and category update view.
- Switched editor back from TinyMCE to CKEditor which provides a better copy/paste support from MS Word.
- Validate HTML strings from CKEditor against XSS attacks.
- Use a separate dialog with CKEditor for editing projector messages.
- Use CKEditor in settings for text markup.
- Used pdfMake for clientside generation of PDFs. Run pdf creation in background (in a web worker thread).
- Introduced new table design for list views with serveral filters and CSV export.
- New CSV import layout.
- Replaced angular-csv-import by Papa Parse for CSV parsing.
- Added UTF-8 byte order mark for every CSV export.
- Removed config cache to support multiple threads or processes.
- Added success/error symbol to config to show if saving was successful.
- Fixed bug, that the last change of a config value was not send via autoupdate.
- Moved full-text search to client-side (removed the server-side search engine Whoosh).
- Made a lot of code clean up, improvements and bug fixes in client and backend.
**Motions:**
- Added adjustable line numbering mode (outside, inside, none) for each motion text.
- Allowed to add change recommendations for special motion text lines (with diff mode).
- Added projection support for change recommendations.
- Added button to sort and number all motions in a category.
- Added recommendations for motions.
- Added options to calculate percentages on different bases.
- Added calculation for required majority.
- Added blocks for motions which can be used in agenda. Set states for multiple motions of a motion block by following the recommendation for each motion.
- Used global config variable for preamble.
- Added configurable fields for comments.
- Added new origin field.
- Reimplemented amendments.
- New PDF layout.
- Added DOCX export with docxtemplater.
- Changed label of former state "commited a bill" to "refered to committee".
- Number of ballots printed can now be set in config.
- Add new personal settings to remove all whitespaces from motion identifier.
- Add new personal settings to allow amendments of amendments.
- Added inline editing for comments.
**Elections:**
- Added options to calculate percentages on different bases.
- Added calculation for required majority.
- Candidates are now sortable.
- Removed unused assignment config to publish winner election results only.
- Number of ballots printed can now be set in config.
- Added inline edit field for a specific hint on ballot papers.
**Users:**
- Added new matrix-interface for managing groups and their permissions.
- Added autoupdate on permission change (permission added).
- Improved password reset view for administrators.
- Changed field for initial password to an unchangeable field.
- Added new field for participant number.
- Added new field 'is_committee' and new default group 'Committees'.
- Improved users CSV import (use group names instead of id).
- Allowed to import/export initial user password.
- Added more multiselect actions.
- Added QR code in users access pdf.
**Mediafiles:**
- Allowed to project uploaded images (png, jpg, gif) and video files (e. g. mp4, wmv, flv, quicktime, ogg).
- Allowed to hide uploaded files in overview list for non authorized users.
- Enabled removing of files from filesystem on model instance delete.
**Other:**
- Added Russian translation (Thanks to Andreas Engler).
- Added command to create example data.
## Version 2.0 (2016-04-18)
[Milestone](https://github.com/OpenSlides/OpenSlides/milestones/2.0)
*OpenSlides 2.0 is essentially not compatible to OpenSlides 1.7. E. g. customized templates, databases and plugins can not be reused without adaption.*
**Agenda:**
- Updated the tests and changed internal parts of method of the agenda model.
- Changed API of related objects. All assignments, motions and custom slides are now agenda items and can be hidden.
- Removed django-mptt.
- Added attachments to custom sldies.
- Improved CSV import.
**Assignments:**
- Renamed app from assignment to assignments.
- Removed possibility to block candidates.
- Massive refactoring and cleanup of the app.
**Motions:**
- Renamed app from motion to motions.
- Massive refactoring and cleanup of the app.
**Mediafiles:**
- Renamed app from mediafile to mediafiles.
- Used improved pdf presentation with angular-pdf.
- Massive refactoring and cleanup of the app.
**Users:**
- Massive refactoring of the participant app. Now called 'users'.
- Used new anonymous user object instead of an authentification backend. Used special authentication class for REST requests.
- Used authentication frontend via AngularJS.
- Improved CSV import.
**Other:**
- New OpenSlides logo.
- New design for web interface.
- Added multiple countdown support.
- Added colored countdown for the last n seconds (configurable).
- Switched editor from CKEditor to TinyMCE.
- Changed supported Python version to >= 3.4.
- Used Django 1.8 as lowest requirement.
- Django 1.9 is supported
- Added Django's application configuration. Refactored loading of signals and projector elements/slides.
- Setup migrations.
- Added API using Django REST Framework 3.x. Added several views and mixins for generic Django REST Framework views in OpenSlides apps.
- Removed most of the Django views and templates.
- Removed Django error pages.
- Added page for legal notice.
- Refactored projector API using metaclasses now.
- Renamed SignalConnectMetaClass classmethod get_all_objects to get_all (private API).
- Refactored config API and moved it into the core app.
- Removed old style personal info page, main menu entries and widget API.
- Used AngularJS with additional libraries for single page frontend.
- Removed use of 'django.views.i18n.javascript_catalog'. Used angular-gettext now.
- Updated to Bootstrap 3.
- Used SockJS for automatic update of AngularJS driven single page frontend.
- Refactored plugin API.
- Refactored start script and management commands. Changed command line option and path for local installation.
- Refactored tests.
- Used Bower and gulp to manage third party JavaScript and Cascading Style Sheets libraries.
- Used setup.cfg for development tools.
- Removed code for documentation and for Windows portable version with GUI. Used new repositories for this. Cleaned up main repository.
- Updated all dependencies.
**Translations:**
- Updated DE, FR, CS and PT translations.
- Added ES translations.
## Version 1.7 (2015-02-16)
https://github.com/OpenSlides/OpenSlides/milestones/1.7
**Core:**
- New feature to tag motions, agenda and assignments.
- Fixed search index problem to index contents of many-to-many tables (e. g. tags of a motion).
- Fixed AttributeError in chatbox on_open method.
**Motions:**
- New Feature to create amendments, which are related to a parent motion.
- Added possibility to hide motions from non staff users in some states.
**Assignments:**
- Fixed permissions to alter assignment polls.
**Other:**
- Cleaned up utils.views to increase performance when fetching single objects from the database for a view (#1378).
- Fixed bug on projector which was not updated when an object was deleted.
- Fixed bug and show special characters in PDF like ampersand (#1415).
- Updated pdf.js to 1.0.907.
- Improve the usage of bsmselect jquery plugin.
- Updated translations.
## Version 1.6.1 (2014-12-08)
https://github.com/OpenSlides/OpenSlides/milestones/1.6.1
**Agenda:**
- Fixed error in item numbers.
**Motions:**
- Show supporters on motion slide if available.
- Fixed motion detail view template. Added block to enable extra content via plugins.
**Assignments:**
- Fixed PDF build error when an election has more than 20 posts or candidates.
**Participants:**
- Fixed participant csv import with group ids:
- Allowed to add multiple groups in csv group id field, e. g. "3,4".
- Fixed bug that group ids greater than 9 can not be imported.
- Updated error message if group id does not exists.
**Other:**
- Fixed CKEditor stuff (added insertpre plugin and removed unused code).
- Updated French, German and Czech translation.
## Version 1.6 (2014-06-02)
https://github.com/OpenSlides/OpenSlides/milestones/1.6
**Dashboard:**
- Added shortcuts for the countdown.
- Enabled copy and paste in widgets.
**Agenda:**
- New projector view with the current list of speakers.
- Added CSV import of agenda items.
- Added automatic numbering of agenda items.
- Fixed organizational item structuring.
**Motions:**
- New slide for vote results.
- Created new categories during CSV import.
**Assignments/Elections:**
- Coupled assignment candidates with list of speakers.
- Created a poll description field for each assignment poll.
- New slide for election results.
**Participants:**
- Disabled dashboard widgets by default.
- Added form field for multiple creation of new participants.
**Files:**
- Enabled update and delete view for uploader refering to his own files.
**Other:**
- Added global chatbox for managers.
- New config option to set the 100 % base for polls (motions/elections).
- Changed api for plugins. Used entry points to detect them automaticly. Load them automaticly from plugin directory of Windows portable version.
- Added possibility to use custom templates and static files in user data path directory.
- Changed widget api. Used new metaclass.
- Changed api for main menu entries. Used new metaclass.
- Inserted api for the personal info widget. Used new metaclass.
- Renamed config api classes. Changed permission system for config pages.
- Regrouped config collections and pages.
- Renamed some classes of the poll api.
- Renamed method and attribute of openslides.utils.views.PermissionMixin.
- Added api for absolute urls in models.
- Inserted command line option to translate config strings during database setup.
- Enhanced http error pages.
- Improved responsive design for templates.
- Fixed headings on custom slides without text.
- Moved dashboard and select widgets view from projector to core app.
- Renamed and cleaned up static direcories.
- Used jsonfield as required package. Removed jsonfield code.
- Added new package backports.ssl_match_hostname for portable build script.
- Used new app "django-ckeditor-updated" to render WYSIWYG html editors. Removed CKEditor from sources.
- Only reload the webserver in debug-mode.
## Version 1.5.1 (2014-03-31)
https://github.com/OpenSlides/OpenSlides/milestones/1.5.1
**Projector:**
- Fixed path and config help text for logo on the projector.
**Agenda:**
- Fixed permission error in the list of speakers widget.
- Fixed Item instance method is_active_slide().
**Motion:**
- Fixed sorting of motions concerning the identifier. Used natsort and DataTables Natural Sort Plugin.
**Participant:**
- Added permission to see participants to the manager group.
- Fixed user status view for use without Javascript.
**Files:**
- Fixed error when an uploaded file was removed from filesystem.
**Other:**
- Set minimum Python version to 2.6.9. Fixed setup file for use with Python 2.6.
- Used unicode font for circle in ballot pdf. Removed Pillow dependency package.
- Fixed http status code when requesting a non-existing static page using Tornado web server.
- Fixed error in main script when using other database engine.
- Fixed error on motion PDF with nested lists.
## Version 1.5 (2013-11-25)
https://github.com/OpenSlides/OpenSlides/milestones/1.5
**Projector:**
- New feature: Show PDF presentations on projector (with included pdf.js).
- Improved projector update process via new websocket API (using sockjs and tornado).
- New projector template with twitter bootstrap.
- Improved projector zoom and scroll behaviour.
**Agenda:**
- New config option: couple countdown with list of speakers.
- Used HTML editor (CKEditor) for agenda item text field.
- Added additional input format for agenda item duration field.
**Motions:**
- Enabled attachments for motions.
- Refactored warnings on CSV import view.
**Elections:**
- Refactored assignment app to use class based views instead of functions.
**Polls:**
- Added percent base to votes cast values.
**Participants:**
- Updated access data PDF: WLAN access (with QRCode for WLAN ssid/password) and OpenSlides access (with QRCode for system URL), printed on a single A4 page for each participant.
**Other:**
- Full text search integration (with Haystack and Whoosh).
- New start script with new command line options (see python manage.py --help)
- Fixed keyerror on user settings view.
- New messages on success or error of many actions like creating or editing objects.
- Changed messages backend, used Django's default now.
- A lot of template fixes and improvements.
- Extended css style options in CKEditor.
- Added feature to config app to return the default value for a key.
- Cleaned up OpenSlides utils views.
- Improved README (now with install instructions and used components).
- Updated all required package versions.
- Used flake8 instead of pep8 for style check, sort all import statements with isort.
- Added Portuguese translation (Thanks to Marco A. G. Pinto).
- Switched to more flexible versions of required third party packages.
- Updated to Django 1.6.x.
- Updated German documentation.
- Change license from GPLv2+ to MIT, see LICENSE file.
## Version 1.4.2 (2013-09-10)
https://github.com/OpenSlides/OpenSlides/milestones/1.4.2
- Used jQuery plugin bsmSelect for better ``<select multiple>`` form elements.
- New config option to disable paragraph numbering in motion pdf. (Default value: disabled.)
- Removed max value limitation in config field 'motion_min_supporters'.
- Removed supporters signature field in motion pdf.
- Fixed missing creation time of motion version. Show now string if identifier is not set (in widgets and motion detail).
- Fixed error when a person is deleted.
- Fixed deleting of assignments with related agenda items.
- Fixed wrong ordering of agenda items after order change.
- Fixed error in portable version: Open browser on localhost when server listens to 0.0.0.0.
- Fixed typo and updated translations.
- Updated CKEditor from 4.1.1 to 4.2. Fixed errors in MS Internet Explorer.
- Updated to Django 1.5.2.
## Version 1.4.1 (2013-07-29)
https://github.com/OpenSlides/OpenSlides/milestones/1.4.1
- Fixed tooltip which shows the end of each agenda item.
- Fixed duration of agenda with closed agenda items.
- Disabled deleting active version of a motion.
- Start browser on custom IP address.
- Fixed wrong URLs to polls in motion detail view.
- Added Czech translation.
## Version 1.4 (2013-07-10)
https://github.com/OpenSlides/OpenSlides/milestones/1.4
**Agenda:**
- New feature: list of speakers for each agenda item which saves begin and end time of each speaker; added new widget and overlay on the dashboard for easy managing and presenting lists of speakers.
- New item type: organisational item (vs. agenda item).
- New duration field for each item (with total time calculation for end time of event).
- Better drag'n'drop sorting of agenda items (with nestedSortable jQuery plugin).
**Motions:**
- Integrated CKEditor to use allowed HTML formatting in motion text/reason. With server-side whitelist filtering of HTML tags (with bleach) and HTML support for reportlab in motion pdf.
- New motion API.
- Support for serveral submitters.
- New workflow concept with two built-in workflows:
1) complex workflow (like in OpenSlides <= v1.3)
2) simple workflow (only 4 states: submitted -> acceptednot decided; no versioning)
- Categories for grouping motions.
- New modifiable identifier.
- New motion version diff view. Improved history table in motion detail view.
- New config variable 'Stop submitting of new motions' (for non-manager users).
- Updated motion status log.
- Updated csv import.
**Participants:**
- New feature: qr-code for system url on participants password pdf.
- Update default groups and permissions.
- New participant field: 'title'.
- Removed participants field 'type'. Use 'group' field instead. Updated csv import.
- Added warning if non-superuser removes his last group containing permission to manage participants.
**Other:**
- New html template based on twitter bootstrap.
- New GUI frontend for the Windows portable version.
- New command to backup sqlite database.
- New mediafile app (files) to upload/download files via frontend.
- Used Tornado web server (instead of Django's default development server).
- Updated win32 portable version to use Tornado.
- Integrated DataTables jQuery plugin for overview tables of motions, elections and participants (for client side sorting/filtering/pagination).
- New overlay API for projector view.
- New config app: Apps have to define config vars only once; config pages and forms are created automatically.
- Moved version page out of the config app.
- Changed version number api for plugins.
- Moved widget with personal info to account app. Inserted info about lists of speakers.
- Updated to Django 1.5.
- Dropped support for python 2.5.
- Updated packaging (setup.py and portable).
- Open all PDFs in a new tab.
- Changed Doctype to HTML5.
- Updated German documentation (especially sections about agenda and motions).
- Several minor fixes and improvements.
## Version 1.3.1 (2013-01-09)
https://github.com/OpenSlides/OpenSlides/milestones/1.3.1
- Fixed unwanted automatical language switching on projector view if more than one browser languages send projector request to OpenSlides (#434)
## Version 1.3 (2012-12-10)
https://github.com/OpenSlides/OpenSlides/milestones/1.3
**Projector:**
- New public dashboard which allows access for all users per default. (#361) (changed from the old, limited projector control page)
- New dashboard widgets:
- welcome widget (shows static welcome title and text)
- participant widget
- group widget
- personal widget (shows my motions and my elections)
- Hide scrollbar in projector view.
- Added cache for AJAX version of the projector view.
- Moved projector control icons into projector live widget. (#403)
- New weight field for custom slides (to order custom slides in widget).
- Fixed drag'n'drop behaviour of widgets into empty dashboard column.
- Fixed permissions for agenda, motion and assignment widgets (set to projector.can_manage_projector).
**Agenda:**
- Fixed slide error if agenda item deleted. (#330)
**Motions:**
- Translation: Changed 'application' to 'motion'.
- Fixed: Manager could not edit supporters. (#336)
- Fixed attribute error for anonymous users in motion view. (#329)
- Set default sorting of motions by number (in widget).
- CSV import allows to import group as submitter. (#419)
- Updated motion code for new user API.
- Rewrote motion views as class based views.
**Elections:**
- User can block himself/herself from candidate list after delete his/her candidature.
- Show blocked candidates in separate list.
- Mark elected candidates in candidate list. (#374)
- Show linebreaks in description. (#392)
- Set default sorting of elections by name (in widget).
- Fixed redirect from a poll which does not exists anymore.
- Changed default permissions of anonymous user to see elections. (#334)
- Updated assignment code for new user API.
**Participants:**
- New user and group API.
- New group option to handle a group as participant (and thus e.g. as submitter of motion).
- CSV import does not delete existing users anymore and append users as new users.
- New user field 'about me'. (#390)
- New config option for sorting users by first or last name (in participant lists, elections and motions). (#303)
- Allowed whitespaces in username, default: ``<firstname lastname>`` (#326)
- New user and group slides. (#176)
- Don't allow to deactivate the administrator or themself.
- Don't allow to delete themself.
- Renamed participant field 'groups' to 'structure level' (German: Gliederungsebene).
- Rewrote participant views as class based views.
- Made OpenSlides user a child model of Django user model.
- Appended tests.
- Fixed error to allow admins to delete anonymous group
**Other:**
- Added French translation (Thanks to Moira).
- Updated setup.py to make an openslides python package.
- Removed frontpage (welcome widget contains it's content) and redirect '/' to dashboard url.
- Added LOCALE_PATHS to openslides_settings to avoid deprecation in Django 1.5.
- Redesigned the DeleteView (append QuestionMixin to send question via the django message API).
- Fixed encoding error in settings.py. (#349)
- Renamed openslides_settings.py to openslides_global_settings.py.
- New default path to database file (XDG_DATA_HOME, e.g. ~/.local/share/openslides/).
- New default path to settings file (XDG_CONFIG_HOME, e.g. ~/.config/openslides/).
- Added special handling to determine location of database and settings file in portable version.
- Don't use similar characters in generated passwords (no 'Il10oO').
- Localised the datetime in PDF header. (#296)
- Used specific session cookie name. (#332)
- Moved code repository from hg to git (incl. some required updates, e.g. version string function).
- Updated German translations.
- Several code optimizations.
- Several minor and medium issues and errors were fixed.
## Version 1.2 (2012-07-25)
https://github.com/OpenSlides/OpenSlides/milestones/1.2
**General:**
- New welcome page with customizable title and text.
- OpenSlides portable win32 binary distribution.
- New start script (start.py) to automatically create the default settings and the database, start the server and the default browser.
- Add plugin system. Allow other django-apps to interact with OpenSlides.
**Projector:**
- New projector dashboard to control all slides on projector.
- New projector live view on projector dashboard.
- Countdown calculation works now on server-side.
- New Overlay messages to show additional information on a second projector layer.
- Add custom slides.
- Add a welcome slide.
- Project application and assignment slides without an agenda item.
- Update the projector once per second (only).
**Agenda:**
- Add new comment field for agenda items.
**Elections (Assignments):**
- New config option to publish voting results for selected winners only.
**Applications:**
- Now, it's possible to deactivate the whole supporter system.
- New import option: set status of all imported applications to 'permit'.
- More log entries for all application actions.
**Participant:**
- Add new comment field for participants.
- Show translated permissions strings in user rols form.
- Admin is redirect to 'change password' page.
- New default user name: "firstname lastname".
**Other:**
- Use Django's class based views.
- Update to Django 1.4. Drop python 2.4 support for this reason.
- Separate the code for the projector.
- Rewrite the vote results table.
- Rewrite the poll API.
- Rewrite the config API. (Now any data which are JSON serializable can be stored.)
- Improved CSV import for application and participants.
- GUI improvements of web interface (e.g. sub navigations, overview tables).
- Several minor and medium issues and errors were fixed.
## Version 1.1 (2011-11-15)
https://github.com/OpenSlides/OpenSlides/milestones/1.1
**Agenda:**
- [Feature] Agenda overview: New item-done-column for all non-manager (#7)
- [Feature] Allow HTML-Tags in agenda item of text (#12)
- [Feature] Split up hidden agenda items in new agenda table section (#13)
**Projector:**
- [Feature] Assignment projector view layout improvements (#9)
- [Bugfix] Zoom problem for sidebar div in beamer view (#5)
- [Bugfix] Blue 'candidate elected line' not visible in projector ajax view (#6)
- [Bugfix] Assignment projector view: Show results for elected candidates only (#11)
- [Bugfix] Missing beamer scaling (#2)
- [Bugfix] Assigment projector view: Removed empty character for no results cell. (#10)
**Applications:**
- [Feature] Import applications (#55)
- [Feature] Support trivial changes to an application (#56)
- [Bugfix] Order submitter and supporter form fields by full name (#53)
- [Bugfix] Application: Show profile instead of submitter username (#15)
- [Bugfix] "Application: Only check enough supports in status ""pub""" (#16)
**Elections:**
- [Feature] New button to show agenda item of selected application/assignment (#54)
- [Feature] Open add-user-url in new tab. (#32)
**Applications/Elections:**
- [Feature] Show voting results in percent (#48)
**Participants:**
- [Feature] Filter displayed permissions in group editor (#59)
- [Feature] Generate password after user creation automatically (#58)
- [Bugfix] Encoding error (#1)
- [Bugfix] List of participants (pdf) link not visible for users with see-particiants-permissions (#3)
- [Bugfix] Use user.profile.get_type_display() instead of user.profile.type (#4)
**PDF:**
- [Feature] Mark elected candidates in PDF (#31)
- [Feature] New config option to set title and preamble text for application and assignment pdf (#33)
- [Feature] New config option to set number of ballots in PDF (#26)
- [Bugfix] Assignment ballot pdf: Wrong line break in group name with brackets (#8)
- [Bugfix] Print available candidates in assignment pdf (#14)
- [Bugfix] Show "undocumented" for result "-2" in application and assignment pdf (#17)
**Other:**
- [Feature] Rights for anonymous (#45)
- [Feature] Show counter for limited speaking time (#52)
- [Feature] Reorderd config tab subpages (#61)
- [Localize] i18n German: Use gender-specific strings (#51)
- [Bugfix] ``<button>`` inside ``<a>`` tag not working in IE (#57)
- [Bugfix] Change default sort for tables of applications, assignments, participants (#27)
## Version 1.0 (2011-09-12)
https://github.com/OpenSlides/OpenSlides/tree/1.0/

159
DEVELOPMENT.md Normal file
View File

@ -0,0 +1,159 @@
# Development of OpenSlides 4
## Requirements
You need git, bash, docker, docker-compose, make and openssl installed.
Go is needed to install https://github.com/FiloSottile/mkcert (but Go is not a requirement to start the development server). The development setup uses HTTPS per default. OpenSlides does not work with HTTP anymore since features are required (like http2) that only works in a secure environment.
## Before starting the development
Clone this repository:
$ git clone --recurse-submodules git@github.com:OpenSlides/OpenSlides.git
After cloning you need to initialize all submodules:
$ git submodule update --init
Finally, start the development server:
$ make run-dev
(This command won't run without sudo, or without having set up Docker to run without sudo - see their documentation)
You can access the services independently using their corresponding ports
or access the full stack on
$ https://localhost:8000
## Running tests
To run all tests of all services, execute `run-service-tests`. TODO: Systemtests in this repo.
## Adding a new Service
$ git submodule add <git@myrepo.git>
Append `branch = main` to the new entry in the `.gitmodules` file. Verify,
that it is there (the folder should have 160000 permissions: Submodule) with the
current commit:
$ git diff --cached
Then, commit changes and create a pull request.
## Work in submodules
Create your own fork at github.
Remove the upstream repo as the origin in the submodule:
$ cd <submodule>
$ git remote remove origin
Add your fork and the main repo as origin and upstream
$ git remote add origin `<your fork>`
$ git remote add upstream `<main repo>`
$ git fetch --all
$ git checkout origin main
You can verify that your setup is correct using
$ git remote -v
The output should be similar to
origin git@github.com:<GithubUsername>/OpenSlides.git (fetch)
origin git@github.com:<GithubUsername>/OpenSlides.git (push)
upstream git@github.com:OpenSlides/OpenSlides.git (fetch)
upstream git@github.com:OpenSlides/OpenSlides.git (push)
## Requirements for services
### Environment variables
These environment variables are available:
- `<SERVICE>_HOST`: The host from a required service
- `<SERVICE>_PORT`: The port from a required service
Required services can be `MESSAGE_BUS`, `DATASTORE_WRITER`, `PERMISSION`, `AUTOUPDATE`,
etc. For private services (e.g. a database dedicated to exactly one service),
use the following syntax: `<SERVICE>_<PRIV_SERVICE>_<ATTRIBUTE>`, e.g. the
Postgresql user for the datastore: `DATASTORE_POSTGRESQL_USER`.
### Makefile
A makefile must be provided at the root-level of the service. The currently
required (phony) targets are:
- `run-tests`: Execute all tests from the submodule
- `build-dev`: Build an image with the tag `openslides-<service>-dev`
### Build arguments in the Dockerfile
These build arguments should be supported by every service:
- `REPOSITORY_URL`: The git-url for the repository to use
- `GIT_CHECKOUT`: A branch/tag/commit to check out during the build
Note that meaningful defaults should be provided in the Dockerfile.
## Developing on a single service
Go to the serivce and create a new branch (from main):
$ cd my-service
$ git status # -> on main?
$ git checkout -b my-feature
Run OpenSlides in development mode (e.g. in a new terminal):
$ make run-dev
After making some changes in my-service, create a commit and push to your fork
$ git add -A
$ git commit -m "A meaningful commit message here"
$ git push origin -u my-feature
As the last step, you can create a PR on Github. After merging, these steps are
required to be executed in the main repo:
$ cd my-service
$ git pull upstream main
$ cd ..
$ git diff # -> commit hash changed for my-service
If the update commit should be a PR:
$ git checkout -b updated-my-service
$ git commit -am "Updated my-service"
$ git push origin updated-my-service
Or a direct push on main:
$ git commit -am "Updated my-service"
$ git push origin main
## Working with Submodules
After working in many services with different branches, this command checks
out `main` (or the given branch in the .gitmodules) in all submodules and
pulls main from upstream (This requres to have `upstream`set up as a remote
in all submodules):
$ git submodule foreach -q --recursive 'git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo main); git pull upstream $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo main)'
This command has can also be called from the makefile using:
$ make services-to-main
When changing the branch in the main repo (this one), the submodules do not
automatically gets changed. THis ocmmand checks out all submodules to the given
commits in the main repo:
$ git submodule update

View File

@ -1,6 +1,6 @@
The MIT License (MIT)
MIT License
Copyright (c) 2011-2015 OpenSlides Team
Copyright (c) Since 2011 Authors of OpenSlides, see AUTHORS
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@ -1,9 +0,0 @@
include AUTHORS
include CHANGELOG
include LICENSE
include README.rst
include requirements_production.txt
recursive-include openslides *.*
recursive-exclude openslides *.pyc
recursive-exclude openslides *.swp
recursive-exclude openslides *~

52
Makefile Normal file
View File

@ -0,0 +1,52 @@
run-integration-tests:
@echo "Start OpenSlides Dev"
make run-dev ARGS="-d"
@echo "Start integration tests"
make cypress-docker
docker-compose -f integration/docker-compose.yml up
@echo "Stop OpenSlides Dev"
make stop-dev
run-service-tests:
git submodule foreach 'make run-tests'
build-dev:
./dev-commands/submodules-do.sh 'make build-dev'
make -C proxy build-dev
run-dev: | build-dev
docker-compose -f docker/docker-compose.dev.yml up $(ARGS)
run-dev-otel: | build-dev
docker-compose -f docker/docker-compose.dev.yml -f docker/dc.otel.dev.yml up $(ARGS)
stop-dev:
docker-compose -f docker/docker-compose.dev.yml down --volumes --remove-orphans
stop-dev-otel:
docker-compose -f docker/docker-compose.dev.yml -f docker/dc.otel.dev.yml down --volumes --remove-orphans
copy-node-modules:
docker-compose -f docker/docker-compose.dev.yml exec client bash -c "cp -r /app/node_modules/ /app/src/"
mv openslides-client/client/src/node_modules/ openslides-client/client/
reload-proxy:
docker-compose -f docker/docker-compose.dev.yml exec -w /etc/caddy proxy caddy reload
services-to-main:
./services-to-main.sh
submodules-origin-to-upstream:
# You may only use this one time after cloning this repository.
# Will set the upstream remote to "origin"
git submodule foreach -q --recursive 'git remote rename origin upstream'
cypress-open:
cd integration; npm run cypress:open
cypress-run:
cd integration; npm run cypress:run
cypress-docker:
docker-compose -f integration/docker-compose.yml build
docker-compose -f integration/docker-compose.yml up

57
README.md Normal file
View File

@ -0,0 +1,57 @@
# OpenSlides
## What is OpenSlides?
OpenSlides is a free, web based presentation and assembly system for
managing and projecting agenda, motions and elections of an assembly. See
https://openslides.com for more information.
## Using OpenSlides productively
__OpenSlides 4 (this) is currently in beta version!__
If you are just looking to use OpenSlides in a productive manner, please refer
to the [OpenSlides 3.4 (stable)](https://github.com/OpenSlides/OpenSlides/tree/stable/3.4.x)
## Installation
### Requirements
You need [Docker](https://docs.docker.com/engine/install/) and [Docker
Compose](https://docs.docker.com/compose/install/).
### Setup OpenSlides
For a productive setup of OpenSlides get the [OpenSlides manage
tool](https://github.com/OpenSlides/openslides-manage-service/releases/tag/latest)
from GitHub and make it executable. E. g. run:
$ wget https://github.com/OpenSlides/openslides-manage-service/releases/download/latest/openslides
$ chmod +x openslides
Then follow the instructions outlined in the [OpenSlides Manage
Service](https://github.com/OpenSlides/openslides-manage-service).
## Development
For further information about developing OpenSlides, refer to [the development
readme](DEVELOPMENT.md).
### Architecture of OpenSlides 4
![System architecture of OpenSlides 4](https://raw.githubusercontent.com/wiki/OpenSlides/OpenSlides/OS4/img/OpenSlides4.svg)
Read more about our [concept of OpenSlides 4.0](https://github.com/OpenSlides/OpenSlides/wiki/DE%3AKonzept-OpenSlides-4).
The technical documentation about the internals, requests and functionality can
be found [in the wiki](https://github.com/OpenSlides/OpenSlides/wiki/DE%3AKonzept-OpenSlides-4).
## License and authors
OpenSlides is Free/Libre Open Source Software (FLOSS), and distributed
under the MIT License, see ``LICENSE`` file. The authors of OpenSlides are
mentioned in the ``AUTHORS`` file.

View File

@ -1,299 +0,0 @@
============
OpenSlides
============
I. What is OpenSlides?
======================
OpenSlides is a free web-based presentation and assembly system for
displaying and controlling of agenda, motions and elections of an assembly.
See http://openslides.org/ for more information.
II. Requirements
================
OpenSlides runs everywhere where Python is running (for example on
GNU/Linux, Mac or Windows (XP or newer)). On each client you need only an
actual webbrowser.
III. Installation
=================
Installation on GNU/Linux or Mac OS X
-------------------------------------
1. Check requirements
Make sure that you have installed Python Programming Language 3 (>= 3.3)
on your system. You will also need the Python development headers.
For example for Ubuntu run::
$ sudo apt-get install python3-dev
2. Setup a virtual environment with Virtual Python Environment builder
(optional)
You can setup a virtual environment to install OpenSlides as non-root
user. Make sure that you have installed Virtual Python Environment
builder on your system.
For example for Ubuntu run::
$ sudo apt-get install python-virtualenv
Create your OpenSlides directory, change to it, setup and activate the
virtual environment::
$ mkdir OpenSlides
$ cd OpenSlides
$ virtualenv -p /usr/bin/python3 .virtualenv
$ source .virtualenv/bin/activate
3. Install OpenSlides
You can use the package from the `OpenSlides Website
<http://openslides.org/download/>`_. Download latest OpenSlides release
as compressed tar archive and run::
$ pip install openslides-x.x.tar.gz
OpenSlides will install all required python packages (see
requirements_production.txt).
Installation on Windows
-----------------------
*Note: There is a portable version of OpenSlides for Windows which does not
required any install steps. If there is a reason that you can not use the
portable version you should observe the following install steps.*
1. Check requirements
Make sure that you have installed Python Programming Language 3 (>= 3.3)
and Setuptools on your system.
a. Download and run the latest `Python 3.4 32-bit MSI installer
<https://www.python.org/downloads/windows/>`_. Note
that the 32-bit MSI installer is required even on a 64-bit Windows
system. If you use the 64-bit MSI installer, step 3 of this
instruction will fail unless you installed the package reportlab
manually.
b. Add python directories to PATH (via Control Panel > System >
Advanced): ``";C:\\Python34;C:\\Python34\\Scripts"``. Note that the path
can differ if you customized the install of Python in the first step.
c. Download and run (via double click) the last `install script
ez_setup.py for Setuptools
<https://pypi.python.org/pypi/setuptools/#installation-instructions>`_.
2. Setup a virtual environment with Virtual Python Environment builder
(optional)
You can setup a virtual environment to install OpenSlides as non-root
user. Make sure that you have installed Virtual Python Environment
builder on your system.
To install Virtual Python Environment builder, open command line (cmd)
and run::
> easy_install https://pypi.python.org/packages/source/v/virtualenv/virtualenv-12.0.5.tar.gz
Create your OpenSlides directory, change to it, setup and activate the
virtual environment::
> md OpenSlides
> cd OpenSlides
> virtualenv .virtualenv
> .virtualenv\Scripts\activate
3. Install OpenSlides
You can use the package from the `OpenSlides Website
<http://openslides.org/download/>`_. Download latest OpenSlides release
as compressed tar archive and run::
> easy_install openslides-x.x.tar.gz
OpenSlides will install all required python packages (see
requirements_production.txt).
IV. Start
=========
To start OpenSlides simply run on command line::
openslides
If you run this command the first time, a new database and the admin account
(Username: `admin`) will be created. Please change the password (Password:
`admin`) after first login!
OpenSlides will start using the integrated Tornado webserver. It will also
try to open the webinterface in your default webbrowser. The server will
try to listen on the local ip address on port 80 or port 8000 if you do not
have admin permissions. That means that the server will be available to
everyone on your local network (at least for commonly used network
configurations).
If you use a virtual environment (see install instructions, step 2), do not
forget to activate the environment before restart after you have closed the
terminal.
For Unix and Mac OS X run::
$ source .virtualenv/bin/activate
For Windows run::
> .virtualenv\Scripts\activate
To get help on the command line options run::
openslides --help
V. Development
==============
If you want to join us developing OpenSlides, have a look at `GitHub
<https://github.com/OpenSlides/OpenSlides/>`_ or write an email to our
`mailing list <http://openslides.org/contact/>`_.
Installation and start of the development version
-------------------------------------------------
1. Check requirements
You need to have `Python 3 (>=3.3) <https://www.python.org/>`_, `Node.js
(>=0.10) <https://nodejs.org/>`_ and `Git <http://git-scm.com/>`_
installed. See also step 1 in the correspondent instruction in section
III.
2. Get OpenSlides source code
Clone current master version from `OpenSlides' GitHub repository
<https://github.com/OpenSlides/OpenSlides/>`_::
cd ... # Go to a nice place in your filesystem.
git clone https://github.com/OpenSlides/OpenSlides.git
cd OpenSlides
3. Setup and activate a virtual environment with Virtual Python Environment
builder (optional)
Follow step 2 in the correspondent instruction in section III.
4. Install all required Python packages::
$ pip install -r requirements.txt
5. Install all npm and bower packages
For Unix and Mac OS X run::
$ npm install
$ node_modules/.bin/bower install
For Windows run::
> npm install
> node_modules\.bin\bower install
6. Concat and copy all third party JavaScript and Cascading Style Sheets
libraries
For Unix and Mac OS X run::
$ node_modules/.bin/gulp
For Windows run::
> node_modules\.bin\gulp
7. Start OpenSlides
Use the command-line interface::
python manage.py start
This will create a new development directoy with settings.py and database.
To get help on the command-line options run::
python manage.py --help
Coding Style
------------
You can find some information on the coding style in the `OpenSlides wiki
<https://github.com/OpenSlides/OpenSlides/wiki/De%3ACode-Richtlinien-f%C3%BCr-Openslides>`_.
VI. Used software
=================
OpenSlides uses the following projects or parts of them:
* `backports.ssl_match_hostname <https://bitbucket.org/brandon/backports.ssl_match_hostname>`_,
License: Python Software Foundation License
* `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/>`_,
License: MIT
* `Bleach <https://github.com/jsocol/bleach/>`_, License: BSD
* `Bootstrap <http://getbootstrap.com/2.3.2/>`_, License: Apache
License v2.0
* `Django <https://www.djangoproject.com>`_, License: BSD
* `Django CKEditor <https://github.com/riklaunim/django-ckeditor>`_, License: BSD
* `Django haystack <http://haystacksearch.org>`_, License: BSD
* `pdf.js <http://mozilla.github.io/pdf.js/>`_, License: Apache License v2.0
* `ReportLab <http://www.reportlab.com/software/opensource/rl-toolkit/>`_,
License: BSD
* `roman <https://pypi.python.org/pypi/roman>`_, License: Python 2.1.1
* `setuptools <https://pypi.python.org/pypi/setuptools>`_,
License: Python Software Foundation License
* `sockjs-tornado <https://github.com/mrjoes/sockjs-tornado>`_,
License: MIT
* `Sphinx <http://sphinx-doc.org/>`_, License: BSD
* Sphinx extension `autoimage <https://gist.github.com/kroger/3856821/>`_,
License: MIT
* `Sphinx Bootstrap Theme
<http://ryan-roemer.github.io/sphinx-bootstrap-theme/>`_, License: MIT
* `Tornado <http://www.tornadoweb.org/en/stable/>`_, License: Apache
License v2.0
* `Ubuntu TrueType Font <http://font.ubuntu.com>`_, License: Ubuntu Font
Licence 1.0
* `Whoosh <https://bitbucket.org/mchaput/whoosh/wiki/Home/>`_, License: BSD
* Several JavaScript packages (see bower.json)
VII. License and authors
========================
OpenSlides is Free/Libre Open Source Software (FLOSS), and distributed under
the MIT License, see LICENSE file. The authors of OpenSlides are mentioned
in the AUTHORS file.

View File

@ -1,27 +0,0 @@
{
"name": "OpenSlides",
"private": true,
"dependencies": {
"lodash": "~3.0.1",
"jquery": "~2.1.4",
"jquery.cookie": "~1.4.1",
"bootstrap-css-only": "~3.3.4",
"angular": "~1.3.15",
"angular-bootstrap": "~0.13.0",
"angular-messages": "~1.3.15",
"angular-animate": "~1.3.15",
"angular-csv-import": "~0.0.15",
"angular-loading-bar": "~0.7.1",
"angular-ui-router": "~0.2.13",
"angular-ui-select": "~0.12",
"angular-ui-tree": "~2.2.0",
"angular-gettext": "~2.0.2",
"angular-sanitize": "~1.3.15",
"angular-xeditable": "~0.1.9",
"js-data-angular": "~2.1.0",
"ng-fab-form": "~1.2.7",
"ngBootbox": "~0.0.5",
"sockjs": "~0.3.4",
"font-awesome-bower": "4.3.0"
}
}

2
db.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/bash
docker-compose -f docker/docker-compose.dev.yml exec datastore-writer psql -h postgres -U openslides

3
dc-dev.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
cd "$(dirname $0)"
docker-compose -f docker/docker-compose.dev.yml $@

5
dev-commands/clear-ds.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/bash
set -e
curl --header "Content-Type: application/json" -d '' http://localhost:9011/internal/datastore/writer/truncate_db

8
dev-commands/export-ds.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
set -e
cd "$(dirname $0)"
TARGET=${1:-export.json}
URL="http://localhost:9010/internal/datastore/reader/get_everything"
curl --header "Content-Type: application/json" -d '{}' $URL 2> /dev/null | python3 strip-meta-fields.py > $TARGET

3
dev-commands/manage.sh Normal file
View File

@ -0,0 +1,3 @@
#!/bin/bash
docker build openslides-manage-service/ --target manage --tag openslides-manage
docker run --network host openslides-manage $@

10
dev-commands/set-ds.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/bash
set -e
cd "$(dirname $0)"
# first argument is the example data
DATA=$(cat ${1:-../docs/example-data.json})
./clear-ds.sh
docker-compose -f ../docker/docker-compose.dev.yml exec datastore-writer \
bash -c "source export-database-variables.sh; echo '$DATA' > /data.json; export DATASTORE_INITIAL_DATA_FILE=/data.json; python cli/create_initial_data.py"

View File

@ -0,0 +1,12 @@
import sys
import json
data = sys.stdin.read()
json_data = json.loads(data)
for collection, models in json_data.items():
for model in models.values():
for field in list(model.keys()):
if field.startswith("meta_"):
del model[field]
sys.stdout.write(json.dumps(json_data, separators=(',', ':')))

23
dev-commands/submodules-do.sh Executable file
View File

@ -0,0 +1,23 @@
#!/bin/bash
# This script runs a command in every registered submodule parallel
# Credits go to https://stackoverflow.com/a/70418086
if [ -z "$1" ]; then
echo "Missing Command" >&2
exit 1
fi
COMMAND="$@"
IFS=$'\n'
for DIR in $(git submodule foreach --recursive -q sh -c pwd); do
printf "\n\"${DIR}\": \"${COMMAND}\" started!\n" \
&& \
cd "$DIR" \
&& \
eval "$COMMAND" \
&& \
printf "\"${DIR}\": \"${COMMAND}\" finished!\n" \
&
done
wait

35
docker/.env Normal file
View File

@ -0,0 +1,35 @@
# OpenSlides instance configuration
#
# As well as environment variables for various services, this file contains
# variables used to persist custom settings for docker-compose.yml or
# docker-stack.yml. See the preamble of a docker-compose.yml.m4 or
# docker-stack.yml.m4 template for more information.
#
# Most variables are listed here only to facilitate discovery of the available
# options. Empty values cause the template's defaults to be inserted.
# General
# -------
INSTANCE_DOMAIN=
PROJECT_STACK_NAME=
EXTERNAL_HTTP_PORT=
DEFAULT_DOCKER_REGISTRY=
# Docker Images
# -------------
DOCKER_OPENSLIDES_BACKEND_NAME=
DOCKER_OPENSLIDES_BACKEND_TAG=
DOCKER_OPENSLIDES_FRONTEND_NAME=
DOCKER_OPENSLIDES_FRONTEND_TAG=
# Configuration
# -------------
ENABLE_ELECTRONIC_VOTING=
# Service Replication
# -------------------
# TODO!!
OPENSLIDES_BACKEND_SERVICE_REPLICAS=
OPENSLIDES_FRONTEND_SERVICE_REPLICAS=
REDIS_RO_SERVICE_REPLICAS=
MEDIA_SERVICE_REPLICAS=

152
docker/build.sh Executable file
View File

@ -0,0 +1,152 @@
#!/bin/bash
set -e
HOME=$(dirname "$(realpath "${BASH_SOURCE[0]}")")
declare -A TARGETS
TARGETS=(
[proxy]="$HOME/../proxy/"
[client]="$HOME/../openslides-client/"
[backend]="$HOME/../openslides-backend/"
[auth]="$HOME/../openslides-auth-service/"
[autoupdate]="$HOME/../openslides-autoupdate-service/"
[manage]="$HOME/../openslides-manage-service/"
[datastore-reader]="$HOME/../openslides-datastore-service/reader"
[datastore-writer]="$HOME/../openslides-datastore-service/writer"
[media]="$HOME/../openslides-media-service/"
[vote]="$HOME/../openslides-vote-service/"
[icc]="$HOME/../openslides-icc-service/"
)
DOCKER_REPOSITORY="openslides"
DOCKER_TAG="latest-4"
CONFIG="/etc/osinstancectl"
OPTIONS=()
BUILT_IMAGES=()
DEFAULT_TARGETS=(proxy client backend auth autoupdate permission manage datastore-reader datastore-writer media vote icc)
usage() {
cat << EOF
Usage: $(basename ${BASH_SOURCE[0]}) [<options>] <service>...
Options:
-D, --docker-repo Specify a Docker repository
(default: unspecified, i.e., system default)
-t, --tag Tag the Docker image (default: $DOCKER_TAG)
--ask-push Offer to push newly built images to registry
--no-cache Pass --no-cache to docker-build
EOF
}
# Config file
if [[ -f "$CONFIG" ]]; then
echo "Found ${CONFIG} file."
source "$CONFIG"
fi
shortopt="hr:D:t:"
longopt="help,docker-repo:,tag:,ask-push,no-cache"
ARGS=$(getopt -o "$shortopt" -l "$longopt" -n "$ME" -- "$@")
if [ $? -ne 0 ]; then usage; exit 1; fi
eval set -- "$ARGS";
unset ARGS
# Parse options
while true; do
case "$1" in
-D|--docker-repo)
DOCKER_REPOSITORY="$2"
shift 2
;;
-t|--tag)
DOCKER_TAG="$2"
shift 2
;;
--ask-push)
ASK_PUSH=1
shift 1
;;
--no-cache)
OPTIONS+="--no-cache"
shift 1
;;
-h|--help) usage; exit 0 ;;
--) shift ; break ;;
*) usage; exit 1 ;;
esac
done
SELECTED_TARGETS=($@)
[[ "${#SELECTED_TARGETS[@]}" -ge 1 ]] || SELECTED_TARGETS=("${DEFAULT_TARGETS[@]}")
[[ "${SELECTED_TARGETS[@]}" != "all" ]] || SELECTED_TARGETS=("${!TARGETS[@]}")
for i in "${SELECTED_TARGETS[@]}"; do
loc="${TARGETS[$i]}"
[[ -n "$loc" ]] || {
echo "ERROR: Cannot build ${i}: not configured."
continue
}
img_name="openslides-${i}"
img="${img_name}:${DOCKER_TAG}"
if [[ -n "$DOCKER_REPOSITORY" ]]; then
img="${DOCKER_REPOSITORY}/${img}"
fi
echo "Building $img..."
cd $loc
{
printf '{\n'
printf '\t"service": "%s,\n' "${i}"
printf '\t"date": "%s",\n' "$(date)"
printf '\t"commit": "%s",\n' "$(git rev-parse HEAD)"
printf '\t"commit-abbrev": "%s",\n' "$(git rev-parse --abbrev-ref HEAD)"
printf '}\n'
} > version.json
# Special instructions for local services
build_script="${loc}/build.sh"
if [[ -f "$build_script" ]]; then
( . "$build_script" )
else
docker build --tag "$img" --pull "${OPTIONS[@]}" "$loc"
fi
rm version.json
BUILT_IMAGES+=("$img ON")
done
if [[ "${#BUILT_IMAGES[@]}" -ge 1 ]]; then
printf "\nSuccessfully built images:\n\n"
for i in "${BUILT_IMAGES[@]}"; do
read -r img x <<< "$i"
printf " - $img\n"
done
else
echo "No images were built."
exit 3
fi
[[ "$ASK_PUSH" ]] || exit 0
if hash whiptail > /dev/null 2>&1; then
while read img; do
echo "Pushing ${img}."
docker push "$img"
done < <( whiptail --title "OpenSlides build script" \
--checklist "Select images to push to their registry." \
25 78 16 --separate-output --noitem --clear \
${BUILT_IMAGES[@]} \
3>&2 2>&1 1>&3 )
else
echo
for i in "${BUILT_IMAGES[@]}"; do
read -r img x <<< "$i"
read -p "Push image '$img' to repository? [Y/n] " REPL
case "$REPL" in
N|n|No|no|NO) exit 0;;
*) docker push "$img" ;;
esac
done
fi

13
docker/dc.otel.dev.yml Normal file
View File

@ -0,0 +1,13 @@
version: "3"
services:
collector:
image: otel/opentelemetry-collector:0.41.0
command: ["--config=/etc/otel-collector-config.yml"]
volumes:
- ./otel-collector-config.yml:/etc/otel-collector-config.yml
jaeger:
image: jaegertracing/all-in-one
ports:
- "16686:16686"

View File

@ -0,0 +1,187 @@
version: "3"
services:
datastore-reader:
image: openslides-datastore-reader-dev
depends_on:
- postgres
env_file: services.env
environment:
- DATASTORE_ENABLE_DEV_ENVIRONMENT=1
- NUM_WORKERS=8
- OPENSLIDES_DEVELOPMENT=1
volumes:
- ../openslides-datastore-service/datastore:/app/datastore
ports:
- 9010:9010
datastore-writer:
image: openslides-datastore-writer-dev
depends_on:
- postgres
- message-bus
env_file: services.env
volumes:
- ../openslides-datastore-service/datastore:/app/datastore
- ../openslides-datastore-service/cli:/app/cli
environment:
- DATASTORE_ENABLE_DEV_ENVIRONMENT=1
- COMMAND=create_initial_data
- DATASTORE_INITIAL_DATA_FILE=https://raw.githubusercontent.com/OpenSlides/openslides-backend/main/global/data/example-data.json
- OPENSLIDES_DEVELOPMENT=1
ports:
- 9011:9011
postgres:
image: postgres:11
environment:
- POSTGRES_USER=openslides
- POSTGRES_PASSWORD=openslides
- POSTGRES_DB=openslides
client:
image: openslides-client-dev
depends_on:
- backend
- autoupdate
env_file: services.env
environment:
- OPENSLIDES_DEVELOPMENT=1
volumes:
- ../openslides-client/client/src:/app/src
backend:
image: openslides-backend-dev
depends_on:
- datastore-reader
- datastore-writer
- auth
env_file: services.env
ports:
- "9002:9002"
- "9003:9003"
- "5678:5678"
environment:
- OPENSLIDES_DEVELOPMENT=1
- EMAIL_HOST=mailhog
- EMAIL_PORT=1025
# - EMAIL_HOST_USER username
# - EMAIL_HOST_PASSWORD secret
# EMAIL_CONNECTION_SECURITY use NONE, STARTTLS or SSL/TLS
- EMAIL_CONNECTION_SECURITY=NONE
- EMAIL_TIMEOUT=5
- EMAIL_ACCEPT_SELF_SIGNED_CERTIFICATE=false
- DEFAULT_FROM_EMAIL=noreply@example.com
volumes:
- ../openslides-backend/openslides_backend:/app/openslides_backend
- ../openslides-backend/migrations:/app/migrations
autoupdate:
image: openslides-autoupdate-dev
depends_on:
- datastore-reader
- message-bus
env_file: services.env
environment:
- OPENSLIDES_DEVELOPMENT=1
volumes:
- ../openslides-autoupdate-service/cmd:/root/cmd
- ../openslides-autoupdate-service/internal:/root/internal
- ../openslides-autoupdate-service/pkg:/root/pkg
icc:
image: openslides-icc-dev
depends_on:
- datastore-reader
- message-bus
- auth
env_file: services.env
environment:
- OPENSLIDES_DEVELOPMENT=1
volumes:
- ../openslides-icc-service/cmd:/root/cmd
- ../openslides-icc-service/internal:/root/internal
ports:
- "9007:9007"
auth:
image: openslides-auth-dev
depends_on:
- datastore-reader
- cache
env_file: services.env
environment:
- OPENSLIDES_DEVELOPMENT=1
volumes:
- ../openslides-auth-service/auth/src:/app/src
cache:
image: redis:latest
media:
image: openslides-media-dev
depends_on:
- backend
- postgres
env_file: services.env
environment:
- OPENSLIDES_DEVELOPMENT=1
volumes:
- ../openslides-media-service/src:/app/src
manage:
image: openslides-manage-dev
depends_on:
- auth
- datastore-writer
env_file: services.env
environment:
- OPENSLIDES_DEVELOPMENT=1
ports:
- "9008:9008"
message-bus:
image: redis:latest
proxy:
image: openslides-proxy-dev
depends_on:
- client
- backend
- autoupdate
ports:
- "8000:8000"
mailhog:
image: mailhog/mailhog
logging:
driver: "none" # disable saving logs
ports:
- "8025:8025" # web ui to check mails manually
vote:
image: openslides-vote-dev
depends_on:
- auth
- message-bus
- datastore-reader
- postgres
environment:
- OPENSLIDES_DEVELOPMENT=true
- VOTE_HOST=vote
- VOTE_PORT=9013
- DATASTORE_READER_HOST=datastore-reader
- MESSAGING=redis
- MESSAGE_BUS_HOST=message-bus
- VOTE_REDIS_HOST=cache
- VOTE_DATABASE_HOST=postgres
- VOTE_DATABASE_USER=openslides
- VOTE_DATABASE_PASSWORD=openslides
- VOTE_DATABASE_NAME=openslides
- AUTH=ticket
- AUTH_HOST=auth
- VOTE_DISABLE_LOG=true
volumes:
- ../openslides-vote-service/cmd:/root/cmd
- ../openslides-vote-service/internal:/root/internal
ports:
- "9013:9013"

View File

@ -0,0 +1,21 @@
receivers:
otlp:
protocols:
http:
grpc:
exporters:
jaeger:
endpoint: jaeger:14250
tls:
insecure: true
processors:
batch:
service:
pipelines:
traces:
receivers: [otlp]
processors: [batch]
exporters: [ jaeger]

16
docker/reset-admin-password.sh Executable file
View File

@ -0,0 +1,16 @@
#!/bin/bash
# This script sets password of user 1 (superadmin) to superadmin. You may also use the manage tool for this work.
set -e
# Hash the new password
response=$(docker-compose exec auth curl --header "Content-Type: application/json" -d '{"toHash": "superadmin"}' http://localhost:9004/internal/auth/hash)
hash=$(jq .hash <<< $response)
# Set user/1/password to $hash
request_data_prefix='{"user_id": 1, "information": {}, "locked_fields": {}, "events": [{"type": "update", "fqid": "user/1", "fields": {"password":'
request_data="$request_data_prefix $hash}}]}"
docker-compose exec backend curl --header "Content-Type: application/json" -d "$request_data" http://datastore-writer:9011/internal/datastore/writer/write
echo "Done"

View File

@ -0,0 +1,3 @@
## secrets/adminsecret.env is sourced by the server container to set the initial
## admin user password.
# OPENSLIDES_ADMIN_PASSWORD="<securepassword>"

View File

@ -0,0 +1,5 @@
## Example user credential configuration
# OPENSLIDES_USER_FIRSTNAME="John"
# OPENSLIDES_USER_LASTNAME="Doe"
# OPENSLIDES_USER_PASSWORD="<securepassword>"
# OPENSLIDES_USER_EMAIL="john@example.com"

49
docker/services.env Normal file
View File

@ -0,0 +1,49 @@
MESSAGE_BUS_HOST=message-bus
MESSAGE_BUS_PORT=6379
DATASTORE_READER_HOST=datastore-reader
DATASTORE_READER_PORT=9010
DATASTORE_WRITER_HOST=datastore-writer
DATASTORE_WRITER_PORT=9011
DATASTORE_DATABASE_HOST=postgres
ACTION_HOST=backend
ACTION_PORT=9002
PRESENTER_HOST=backend
PRESENTER_PORT=9003
AUTOUPDATE_HOST=autoupdate
AUTOUPDATE_PORT=9012
PERMISSION_HOST=permission
PERMISSION_PORT=9005
AUTH_HOST=auth
AUTH_PORT=9004
CACHE_HOST=cache
CACHE_PORT=6379
ICC_PORT=9007
ICC_HOST=icc
ICC_REDIS_HOST=message-bus
ICC_REDIS_PORT=6379
MEDIA_HOST=media
MEDIA_PORT=9006
MEDIA_DATABASE_HOST=postgres
MEDIA_DATABASE_NAME=openslides
MANAGE_HOST=manage
MANAGE_PORT=9008
VOTE_HOST=vote
VOTE_PORT=9013
VOTE_REDIS_HOST=cache
VOTE_DATABASE_HOST=postgres
VOTE_DATABASE_USER=openslides
VOTE_DATABASE_PASSWORD=openslides
VOTE_DATABASE_NAME=openslides
OTEL_EXPORTER_JAEGER_ENDPOINT=http://jaeger:14268/api/traces
OTEL_EXPORTER_OTLP_ENDPOINT=collector:4318
OPENTELEMETRY_ENABLED=0

View File

@ -1,86 +0,0 @@
# Makefile for Sphinx documentation
#
# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build
LANGUAGES = de
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$$lang $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) -c . -A language=$$lang -A languages='$(LANGUAGES)' -E
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " text to make text files"
@echo " changes to make an overview of all changed/added/deprecated items"
@echo " linkcheck to check all external links for integrity"
clean:
-rm -rf $(BUILDDIR)/*
html:
@for lang in $(LANGUAGES);\
do \
mkdir -p $(BUILDDIR)/html/$$lang $(BUILDDIR)/doctrees/$$lang; \
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/html/$$lang;\
done
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
latex:
@for lang in $(LANGUAGES);\
do \
mkdir -p $(BUILDDIR)/latex/$$lang $(BUILDDIR)/doctrees/$$lang; \
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/latex/$$lang;\
done
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."
latexpdf:
@for lang in $(LANGUAGES);\
do \
mkdir -p $(BUILDDIR)/latex/$$lang $(BUILDDIR)/doctrees/$$lang; \
$(MAKE) -C $(BUILDDIR)/latex/$$lang all-pdf; \
done
@echo
@echo "Running LaTeX files through pdflatex..."
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
text:
@for lang in $(LANGUAGES);\
do \
mkdir -p $(BUILDDIR)/text/$$lang $(BUILDDIR)/doctrees/$$lang; \
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $$lang $(BUILDDIR)/text/$$lang;\
done
@echo
@echo "Build finished. The text files are in $(BUILDDIR)/text."
changes:
@for lang in $(LANGUAGES);\
do \
mkdir -p $(BUILDDIR)/changes/$$lang $(BUILDDIR)/doctrees/$$lang; \
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes/$$lang; \
done
@echo
@echo "The overview file is in $(BUILDDIR)/changes."
linkcheck:
@for lang in $(LANGUAGES);\
do \
mkdir -p $(BUILDDIR)/linkcheck/$$lang $(BUILDDIR)/doctrees/$$lang; \
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck/$$lang; \
done
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

Some files were not shown because too many files have changed in this diff Show More