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

8148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emanuel Schütze
688b1b276d
Merge pull request #5563 from tsiegleauq/hide-id-in-amendment-list 
Show or hide motion id in amendment list by config
 2020-09-17 15:03:42 +02:00
Emanuel Schütze
3d7bfe652c
Merge pull request #5562 from tsiegleauq/amendment-filter-new-workflow 
Evaluate default amendment workflow in list
 2020-09-17 15:00:57 +02:00
Sean
df2e26c3ed Show or hide motion id in amendment list by config 
Hides the motion id in the list of amendments if the given config was
enabled or disabled
 2020-09-16 15:51:03 +02:00
Emanuel Schütze
909a7539c5
Merge pull request #5561 from tsiegleauq/fix-csv 
Adjust the example csv gender fields
 2020-09-16 14:21:56 +02:00
Sean
51512fd589 Evaluate default amendment workflow in list 
Evaluates the default amendment workflow in the amendment list so users
can se the filters accordingly
 2020-09-16 11:55:02 +02:00
Sean
34f23b3d0e Adjust the example csv gender fields 
The example fields are now as they would be expected by the OpenSlides
translation
 2020-09-15 17:44:47 +02:00
Emanuel Schütze
04477d9ebd
Merge pull request #5559 from tsiegleauq/no-final-version-in-amendments 
Avoid final version to amendments
 2020-09-15 09:31:45 +02:00
Sean
bc333a6b51 Avoid final version to amendments 
If the motion is a paragraph based amendment the user cannot create a
final version anymore
 2020-09-14 16:40:08 +02:00
Emanuel Schütze
2759f8ce2b
Merge pull request #5551 from FinnStutzenstein/crInProjector 
Always include CRs in motion slide
 2020-09-11 11:38:57 +02:00
Emanuel Schütze
b555de8510
Merge pull request #5556 from tsiegleauq/accepted-amendment-cr-in-main-motion 
Show amendments change reco in main motion
 2020-09-11 09:59:51 +02:00
Sean
b596bf0ca5 Show amendments change reco in main motion 
Fixes a bug which was preventing change recos from amendments to display
in main motions
 2020-09-11 00:07:33 +02:00
Finn Stutzenstein
d893f3dbe5 Always include CRs in motion slide 
Show Amendment CR in Projector

Shows the amendment CR in the projector if the projected slide is in
diff version.
Only shows direct Change recos to amended paragraphs
 2020-09-10 19:38:25 +02:00
Emanuel Schütze
9148d97f7a
Merge pull request #5554 from gsiv/dev/templ-no-none 
Docker templates: Set empty values instead of None
 2020-09-10 14:31:16 +02:00
Gernot Schulz
ed9e50a1b4 Docker templates: Set empty values instead of None 2020-09-10 10:12:16 +02:00
Finn Stutzenstein
5b63809b12
Merge pull request #5547 from gsiv/master 
Docker build.sh: Run aux build scripts in subshell
 2020-09-07 11:21:41 +02:00
Gernot Schulz
a408ee62ee Docker build.sh: Run aux build scripts in subshell 2020-09-07 10:29:18 +02:00
Emanuel Schütze
fb27f8ce8a
Merge pull request #5519 from tsiegleauq/fix-jitsi-password-doc 
Change jitsi_password to jitsi_room_password
 2020-09-04 15:10:09 +02:00
Emanuel Schütze
792f0e5d06
Merge pull request #5543 from tsiegleauq/adjust-live-conf-perms 
Adjust live stream permission
 2020-09-04 15:01:39 +02:00
Emanuel Schütze
392c32fd92
Merge pull request #5544 from tsiegleauq/firefox-80-state-issues 
Fix Firefox indexedDB state change issue
 2020-09-04 14:43:47 +02:00
Sean
28878a0b12 Fix Firefox indexedDB state change issue 
Firefox ignores the state change of the conf state
after reloading
 2020-09-04 14:19:50 +02:00
Sean
059ace3a11 Adjust live stream permission 
New rules to show the live stream and jitsi bar
 2020-09-04 14:14:36 +02:00
Emanuel Schütze
06974b559e
Merge pull request #5536 from tsiegleauq/pdf-line-number-in-long-lists 
PDF line number alignment
 2020-09-01 15:47:37 +02:00
Emanuel Schütze
7a1e7c298d
Merge pull request #5530 from FinnStutzenstein/hotfix 
Fixed errors in client
 2020-09-01 10:06:13 +02:00
Sean
ef87f05454 PDF line number alignment 
- Aligns line number for long lists
- Better support for changes to the default font
 2020-08-31 15:15:00 +02:00
Finn Stutzenstein
a329031942
Fixed errors in client 2020-08-31 13:45:59 +02:00
Finn Stutzenstein
0367398cb5
Merge pull request #5535 from FinnStutzenstein/fix-black 
Fixing black
 2020-08-31 13:41:03 +02:00
Finn Stutzenstein
325c5ea1f4
Fixing black 2020-08-31 13:24:16 +02:00
Emanuel Schütze
9a4f8e1781
Merge pull request #5514 from CatoTH/create-line-number-performance-tweak 
Performance tweak for creating line numbers
 2020-08-27 09:01:25 +02:00
Emanuel Schütze
38af3d3b8a
Merge pull request #5529 from tsiegleauq/export-dialog-supporter 
Add "supporter" to motion export dialog
 2020-08-27 08:35:23 +02:00
Emanuel Schütze
4960a8f115
Merge pull request #5516 from tsiegleauq/no-final-may-decide 
Hide motion preamble in final state
 2020-08-27 08:28:59 +02:00
Sean
0d16b487d5 Add "supporter" to motion export dialog 
Allows PDF, CSV and XLSX to export the supporter manually
 2020-08-26 15:52:08 +02:00
Sean
756fdc9c66
Merge pull request #5522 from tsiegleauq/clean-submitter-component 
Fix selector with in submitter component
 2020-08-26 11:05:52 +02:00
Tobias Hößl
fcdfad1c2e
Improve performance of line range detection + html2fragment / avoid recalculation of full changeset 2020-08-25 19:53:10 +02:00
Sean
5070069910 Fix selector with in submitter component 
Fixes the too small search value selector in the submitter component

fixed the ad-hoc creation
 2020-08-24 14:08:58 +02:00
Sean
a9c1578ebb Hide motion preamble in final state 
If a motion is in final state, the preamble does not get shown in detail
view and pdf
 2020-08-24 13:57:09 +02:00
Emanuel Schütze
aed17360e6
Merge pull request #5517 from tsiegleauq/motion-projection-controls 
Allow motion of non existing change recos
 2020-08-21 18:23:08 +02:00
Emanuel Schütze
d8f62a05ba
Merge pull request #5520 from tsiegleauq/more-permission-checks 
Hide group selector without manage rights
 2020-08-21 17:49:04 +02:00
Emanuel Schütze
1b6b70c080
Merge pull request #5521 from tsiegleauq/update-supported-browsers 
Update supported browsers
 2020-08-21 17:29:35 +02:00
Sean
7bf8e880fd Update supported browsers 
Push latest Firefox ESR as latest supported browser
Push opera 70 as latest supported browser
 2020-08-21 16:15:50 +02:00
Sean
7af65f790e Hide group selector without manage rights 
Fixes a bug where the user group selector was shown even though the user
had not permission to manage the users
 2020-08-21 16:09:06 +02:00
Sean
0933bb6abd Change jitsi_password to jitsi_room_password 
Fixes false naming in both documentation, template
and docker
 2020-08-21 15:46:43 +02:00
Finn Stutzenstein
216e4f00a3
Merge pull request #5440 from FinnStutzenstein/restructure 
WIP: Repository restructure
 2020-08-21 08:36:27 +02:00
Gernot Schulz
8faa2ad38f
Docker: Add --ask-push option to build.sh 2020-08-21 08:11:16 +02:00
Finn Stutzenstein
9ddf9ddb8c
fixed lost changes 2020-08-21 08:11:16 +02:00
Gernot Schulz
251296f42f
Docker: No longer install Vim in server 2020-08-21 08:11:16 +02:00
Gernot Schulz
9a2d3a3760
Docker: Add SAML configuration 
To configure SAML, ENABLE_SAML must be set to True in .env.
Additionally, the following files must be provided in ./secrets/saml/:

  - sp.crt
  - sp.key
  - saml_settings.json

The files will be added as Docker secrets.

Even though saml_settings.json does not contain secret information
per se it is nonetheless added as a secret for simplicity.  Technically,
the file is equally suited to be configured as a "Docker config".

Please note:

  - This patch has not been tested yet.
  - python3-saml's version should probably be pinned.
 2020-08-21 08:11:16 +02:00
Gernot Schulz
3cb3ef2974
README: Include production setup info 
Now that this repository has become the entry point through which
OpenSlides instances are configured, this patch transfers some relevant
information formerly included in
https://github.com/OpenSlides/openslides-docker-compose/ to this
repository's README file.
 2020-08-21 08:11:16 +02:00
Gernot Schulz
2b7e4d3d19
Docker: Add backend variables to .env and templates 
This setup chooses to avoid the env_file option available for Docker
Compose files.  Docker has a peculiar way of parsing variables which
makes it, for example, include quotes verbatim.

This is both confusing and incompatible with shells parsing the same
file which is a requirement.  For this reason, the configuration does
not import the complete environment using env_file but assigns variables
explicitly on a need-to-know basis in the YAML file, much like Docker
secrets.

Since the configuration is generated automatically, the burden on users
is the same as with env_file: they only need to edit .env for
customizations.
 2020-08-21 08:11:15 +02:00
Gernot Schulz
d1640bc98d
Docker: Add .env 
This file was copied from
https://github.com/OpenSlides/openslides-docker-compose/
and still needs to be adjusted for the present setup.
 2020-08-21 08:11:15 +02:00
Gernot Schulz
1c0724341c
build.sh: More convenient way to push images 
Since build.sh now builds more than just two images, individual queries
whether to push each image to a registry may become tedious.  This patch
replaces the queries with a single checklist menu.  After making
a selection, the images get pushed all at once.

In the menu, all images are unchecked by default in order to prevent
accidental uploads.  This, too, may become tedious.  In that case, the
default could be flipped or a new option could be introduced.
 2020-08-21 08:11:15 +02:00