Emanuel Schütze
beb59cee73
Updated translations
2020-11-05 22:03:00 +01:00
Jochen Winzer
d89c7cfdb0
Disable checkbox if user is not permitted to change presence.
2020-11-05 21:33:04 +01:00
Joshua Sangmeister
883463ea87
Deactivate empty votes for assignment polls
2020-11-05 16:44:22 +01:00
Jochen Winzer
513f1477af
Call assignment details from new route after a route change.
...
Make private.
2020-11-04 18:05:10 +01:00
Jochen Winzer
837af97d57
Need perm to show list of speakers. Use content-container.
...
Fix link.
2020-11-04 18:01:38 +01:00
Sean
6bc2c104b1
Merge pull request #5673 from jwinzer/poll-collection-refresh
...
Bug fix preventing undesired recreation of poll-collection
2020-11-04 16:23:51 +01:00
Sean
d4b92a2b4e
Merge pull request #5628 from tsiegleauq/vjs-404
...
catch and refresh unreachable video streams
2020-11-04 16:15:01 +01:00
Jochen Winzer
5ef1869a10
Bug fix preventing undesired recreation of poll-collection and poll-votes on poll change.
2020-11-04 09:38:53 +01:00
Sean
ccc48e6b3f
Add "point of order" feature to ListOfSpeakers
...
Adds the option "point of order" to the list of speakers
- You can make a point of order even though you normally have no
permission to add yourself to the ListOfSpeakers
- You can make a point of order even though you are already on theListOfSpeakers (but you may only be there once)
- new points of order will be on top of the list of speakers
- Point of orders will be highlighted by a red triangle
This feature can be used to request to speak with a higher level of
urgency
2020-11-03 12:40:36 +01:00
Sean
b391ed0dfe
catch and refresh unreachable video streams
...
Detects if a live stream is reachable or not.
Adds a refresh key to recheck if a stream can be reached
Live adding and removing streams made easier
2020-10-29 09:20:18 +01:00
Finn Stutzenstein
12e6090fa7
Merge pull request #5546 from FinnStutzenstein/checkForCookies
...
Added missing client part for cookie checking on login
2020-10-08 09:17:02 +02:00
Emanuel Schütze
e77b2518d5
Updated translations
2020-10-07 23:32:28 +02:00
Emanuel Schütze
21990aa568
Merge pull request #5602 from FinnStutzenstein/addDemoModeToDocker
...
Add demo mode to all docker setups
2020-10-07 23:30:35 +02:00
Emanuel Schütze
58db337a40
Merge pull request #5617 from tsiegleauq/only-non-stable-slides-in-ap
...
Show first unstable element in autopilot
2020-10-07 23:30:19 +02:00
Sean
70ea4f3658
Merge pull request #5568 from tsiegleauq/show-amendment-cr-in-lead-motion-slide
...
Add amendment cr to lead motion slide
2020-10-07 18:17:52 +02:00
Emanuel Schütze
25d83b4419
Merge pull request #5609 from tsiegleauq/show-delegations-in-single-vote-table
...
Add "represented by" to single votes table
2020-10-07 17:35:20 +02:00
Sean
22a318bde2
Show first unstable element in autopilot
...
Skips all unstable elements in autopilot
2020-10-07 17:24:44 +02:00
Finn Stutzenstein
fd2fd8d73a
Add demo mode to all docker setups
2020-10-07 16:50:08 +02:00
Sean Engelhardt
823a87c164
Add amendment cr to lead motion slide
...
Adds amendment cr to the lead motion slide.
Previously the amendmet cr was only present in the amendment slide but was forgotten in the motion slide
2020-10-07 16:47:16 +02:00
Sean
2162f2b049
Add "represented by" to single votes table
...
Adds a "represented by" field to the single votes table, to indicate a
vote delegation.
Also fixes an height issue that occured in large single vote tables when
the user was navigating from a list view table to a single vote table
2020-10-07 16:45:31 +02:00
Finn Stutzenstein
435bb59472
Add parsing of decimal fields for projector data
...
Fixes an issue where the projector would not show special poll values,
such as "majority" or "not counted"
2020-10-07 15:01:58 +02:00
Sean
de474e9eae
Merge pull request #5613 from tsiegleauq/invisible-agenda-item-issue
...
Fix hidden motions in agenda list
2020-10-07 10:29:31 +02:00
Emanuel Schütze
706c1d9e36
Merge pull request #5592 from tsiegleauq/assignment-projector-percentage
...
Fix assignment polldata discovery in percent pipe
2020-10-06 22:33:34 +02:00
Emanuel Schütze
e6fc32b9b4
Merge pull request #5598 from tsiegleauq/export-vote-weight
...
Export users with username and vote weight
2020-10-06 22:31:03 +02:00
Emanuel Schütze
2bb0134cd8
Merge pull request #5610 from tsiegleauq/mediafile-multi-download-perms
...
Fix mediafile multi download permission
2020-10-06 22:26:04 +02:00
Sean
daaf404756
Fix hidden motions in agenda list
...
Fixes an error where hidden motions in the agenda list would throw an
error
2020-10-06 16:11:17 +02:00
Sean
d22e0bf2f6
Fix mediafile multi download permission
...
Fixes a permission issue in the mediafile list.
Without manage right, the vertical dot menu was not visible.
Also allows multi selection and selective download without manage
rights.
Fixes a ngrid css error in mediafile list
2020-10-05 17:28:22 +02:00
Sean
ed1c3eaa7a
Add search and filter for vote delegation
...
Adds a new filter "Vote delegation" to user list:
Transferred vote right
Received vote reight
neither received not transferred vote right
Adjusts the user list search and the global search to include vote
deligations
2020-10-05 12:39:17 +02:00
Sean
9607f05454
Merge pull request #5507 from tsiegleauq/repair-compodoc
...
Update and fix compodoc generation
2020-10-05 11:05:20 +02:00
Sean
2ca157bb7c
Merge pull request #5604 from tsiegleauq/select-search-throws-errors
...
Fix mat select search errors
2020-10-05 10:47:05 +02:00
Sean
25878f297f
Fix mat select search errors
...
Mat select search wants a mat-option now
2020-10-02 15:27:30 +02:00
Finn Stutzenstein
8d2a7f1b12
Merge pull request #5541 from jsangmeister/vote-delegation
...
Add vote delegation
2020-10-02 14:15:06 +02:00
Sean
28bac117be
Export users with username and vote weight
...
Importer expects both username and vote weight,
Thus, exported csv could not easily be reimported
2020-10-01 15:44:20 +02:00
Sean
98a8de3c2d
Fix assignment polldata discovery in percent pipe
...
Fixes an issue where projector data was not delivering enough
information to guess if a poll data belongs to an assignment or a
motion.
This error resultet that the percent base pipe used the percent bases
for motions to calculate for assignments
2020-10-01 13:51:25 +02:00
Sean
8c28b03ffc
Vote delegations on client
...
Add "your vote was delegated" error
Observe operator alterations during vote
Add "canVoteFor" getter
Adjust poll progress bars
2020-10-01 12:18:44 +02:00
Finn Stutzenstein
90e13a0f8e
Update .dockerignore to reduce the context size
2020-09-29 16:16:58 +02:00
Sean
677a93e2ca
Update and fix compodoc generation
...
Fixes and updates compodoc.
2020-09-28 13:02:56 +02:00
Sean
991c08d57d
Merge pull request #5534 from tsiegleauq/protected-values-cause-user-error
...
Cleanup previous return statements in void functions
2020-09-28 11:53:57 +02:00
Sean
6606e46f68
Add package lock to dockerfile
...
Adds the package-lock file to the clients dockerfile, so npm-ci works
2020-09-23 14:44:33 +02:00
Sean
42dd397fae
Update to Angular 10
...
Update @angular/core @angular/cli
Update material, search-select, cdk, ngrid
Update localstorage
Update rxjs
Update ngx-translate
Update ngx-translate-extract
Update @schematics/angular
Update some deps
Update dev deps
Fix css imports, lint
Downgrad CDK and Material for ngrid
Update docker
Provide pdf worker
Move static file output to django folder
Update readme / used files
Update package-lock.json for npm ci
2020-09-23 10:29:57 +02:00
Emanuel Schütze
69299808b6
Updated translations
2020-09-23 09:36:57 +02:00
Emanuel Schütze
cf4573cb54
Merge pull request #5515 from tsiegleauq/lazy-user-mode
...
Implement cinema mode (autopilot)
2020-09-23 08:37:33 +02:00
Emanuel Schütze
b392ac83aa
Merge pull request #5570 from tsiegleauq/vjs-poster-url-config
...
Add vjs live steam poster url as config
2020-09-23 08:22:37 +02:00
Sean Engelhardt
7f53636b7b
Add vjs live steam poster url as config
...
Adds a new config to show a poster url in the live stream view
2020-09-22 14:53:31 +02:00
Sean Engelhardt
bc540180dd
fix white change-recommendation-overview
...
Fixes a bug where a white or blank change-recommendation-overview appeared
2020-09-18 16:29:13 +02:00
Sean
ec13ab56e8
Implement cinema mode
...
Implements a viewer mode containing the most important information and
Heavily refactors ListOfSpeaker and CurrentListOfSpeaker
interaction heavy components on a single view:
Current List of Speakers
Currently Open Polls
Current projector
Permission in migration
2020-09-17 18:38:57 +02:00
Emanuel Schütze
acbddd3c53
Merge pull request #5567 from tsiegleauq/pdf-list-cr-amendment-fixes
...
More reliable text/stack defintion in cr pdf
2020-09-17 18:31:28 +02:00
Sean
6007799f1d
More reliable text/stack defintion in cr pdf
...
Motion pdfs with line numbers, CR/Amendment and bullet points with
multiple changes have a better chance to produce expected results
2020-09-17 18:11:45 +02:00
Emanuel Schütze
2687d1abba
Merge pull request #5564 from tsiegleauq/amendment-projection-default
...
Add amendment projection defaults
2020-09-17 17:26:29 +02:00
Emanuel Schütze
c4a2b02f5d
Merge pull request #5565 from CatoTH/bugfix/show-changed-amendment-in-slides
...
Fix changed amendment in slides
2020-09-17 16:54:10 +02:00
Emanuel Schütze
e8e39b1e89
Merge pull request #5550 from tsiegleauq/vscroll-selector-component
...
Add virtual scrolling for search value selector
2020-09-17 16:48:12 +02:00
Sean
a42205e47f
Hide diff-box in projector
2020-09-17 15:40:43 +02:00
Emanuel Schütze
855db8241b
Merge pull request #5542 from tsiegleauq/vscroll-user-import
...
Vscroll for user import
2020-09-17 15:14:01 +02:00
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
Tobias Hößl
1a0e017f80
Fix changed amendment in slides
2020-09-16 19:52:37 +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
Sean
4712707d6b
Add amendment projection defaults
...
Creates projection defaults for (paragraph based) amendments.
Adds a migration to add amendments as projection defaults.
Will only work for paragraph based amendments, other amendments will
still be considered motions
2020-09-16 15:41:11 +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
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
Sean
594777960b
Adjust code style in user repo
...
Cleans up return statements in void functions
2020-09-14 12:29:21 +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
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
Sean
eb98289b84
Add virtual scrolling for search value selector
...
Adds virtual scrolling for the search value selector.
2020-09-08 12:57:27 +02:00
Sean
f3fe98436e
Vscroll for user import
...
Allows to import giant sets of users as CSV.
Tested 500k. The client is fine. The python server and the SQL data base really do not like that.
2020-09-07 16:00:11 +02:00
Finn Stutzenstein
7446effe0f
Added missing client part for cookie checking on login
2020-09-07 08:36:02 +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
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
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
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
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
Gernot Schulz
418480bff5
build.sh: Make build script more useful
...
build.sh replaces docker-compose as an image build tool. Instead, all
OpenSlides services can be built using this script which offers various
important options such as tagging and configurable defaults.
The now-redundant build instructions have been removed from the YAML
templates.
The almost identical server and client build scripts have been made
fully identical.
2020-08-21 08:11:15 +02:00
FinnStutzenstein
2bcab5d098
Repository restructure
...
- moved all server related things into the folder `server`, so this
configuration is parallel to the client.
- All main "services" are now folders in the root directory
- Added Dockerfiles to each service (currently server and client)
- Added a docker compose configuration to start everything together.
Currently there are heavy dependencies into https://github.com/OpenSlides/openslides-docker-compose
- Resturctured the .gitignore. If someone needs something excluded,
please add it to the right section.
- Added initial build setup with Docker and docker-compose.
- removed setup.py. We won't deliver OpenSlides via pip anymore.
2020-08-21 08:11:13 +02:00
Finn Stutzenstein
2c85bb28f1
Merge pull request #5504 from tsiegleauq/demo-mode
...
Add demo mode
2020-08-21 08:10:45 +02:00
Sean
2b55388870
Allow motion of non existing change recos
...
Allows to project any version of the motions, event if they do not yet
exist.
Gives the user more control about the content they want to project.
Currently, if a motion has no logical changed version, they would
always project the original version which does not automatically
update if a changed version exists. This behaviour would require the
user to update their current projection
2020-08-20 13:22:47 +02:00
Sean
fbf424e570
Add demo mode
...
Adds a demo mode in the settings.py to prevent certain obvious
kinds of vandalism on public openslides testing instances
2020-08-17 07:25:53 +02:00
Sean
b59c69e086
Update TinyMCE and TinyMCE angular
...
Updates TinyMCE and TinyMCE angular to the latest version
2020-08-13 12:27:14 +02:00
Emanuel Schütze
2b3766b758
Merge pull request #5502 from tsiegleauq/enter-animation-without-css
...
Replace meeting room keyframe animation
2020-08-12 18:43:50 +02:00
Sean
c0f5c7b548
Replace meeting room keyframe animation
...
Replaces the meeting room keyframe css animation with anuglar
animations.
The css keyframe animation declaration was
"optimized away" on prod build
2020-08-12 18:18:04 +02:00
Emanuel Schütze
c6abbb629e
Merge pull request #5505 from tsiegleauq/multiple-file-download
...
Download mutliple files as zip
2020-08-12 17:13:41 +02:00
Sean
e75573e139
Download mutliple files as zip
...
Adds the possitibility to download folders
and multiple files as zip.
2020-08-12 15:24:37 +02:00
Emanuel Schütze
5f5f704057
Merge pull request #5498 from tsiegleauq/jitsi-meet-api-update
...
Update jitsi-meet external api
2020-08-12 15:05:29 +02:00
Emanuel Schütze
b726801747
Merge pull request #5500 from tsiegleauq/crate-users-svc
...
Add "create user" to more search value selectors
2020-08-12 15:00:55 +02:00
Emanuel Schütze
a48592af50
Merge pull request #5497 from tsiegleauq/fix-parent-motion-title-change-error
...
Cleaner pdf getUnifiedChanges solution
2020-08-12 14:49:33 +02:00
Finn Stutzenstein
d682d0d134
Fixed poll required users and motion state extension selector
2020-08-11 13:21:51 +02:00
Sean
bfe72497cd
Add "create user" to more search value selectors
...
Adds the "create new user" function to more search value
selectors.
2020-08-11 12:15:47 +02:00
Sean
65ee468c21
Update jitsi-meet external api
...
Updates jitsi-meet external api the the current version
Hide "security" and "invite" in jitsi-iFrame
2020-08-10 15:37:14 +02:00
Sean
09a10c7e92
Cleaner pdf getUnifiedChanges solution
...
Fixes a bug where cercain amendments where causing an
"titleChange of undefined" error
2020-08-10 14:17:43 +02:00
Emanuel Schütze
23ae32a758
Merge pull request #5480 from tsiegleauq/amendment-without-parent-motion
...
Detect if the parent motion was deleted
2020-07-17 16:55:47 +02:00
Sean
2c17d7b7aa
Add "motions_amendments_workflow" config
...
Adds a config for the default workflow for amendments and maked the
necessary changes to motion detail and amendment wizzard
2020-07-17 16:10:45 +02:00
Sean
e268903536
Detect if the parent motion was deleted
...
Fixes an error where the motion detail page would not open if the parent
motion to an amendment was deleted.
Show a warning if the parent motion to an amendment is missing
2020-07-17 16:08:15 +02:00
Emanuel Schütze
9aefb122e6
Release 3.2
2020-07-15 16:16:00 +02:00
Emanuel Schütze
47113f14fc
Merge pull request #5470 from tsiegleauq/cannot-click-bg
...
Fix clicking behind conference bar
2020-07-15 12:43:10 +02:00
Sean
7d912d82de
Fix clicking behind conference bar
...
Fixes an issue with the live stream.
Clicks in the background were falsely cought.
2020-07-14 15:10:01 +02:00
Emanuel Schütze
ebf8325ded
Merge pull request #5468 from tsiegleauq/safari-list-views
...
Fix list views for safari
2020-07-14 14:28:08 +02:00
Emanuel Schütze
03acae26ff
Merge pull request #5465 from tsiegleauq/better-jitsi-icons
...
Add link to CLOS to meeting room indicator
2020-07-14 14:24:54 +02:00
Sean
109fea791d
Fix list views for safari
...
Usually useless hight information fixes rendering issues on safari
browsers
2020-07-14 13:13:49 +02:00
Sean
c2bd7c16a9
Fix PDF generation for motion with free amendments
...
Fixes an issue where motions which had free form amendments were not be
able to render as pdf
2020-07-14 12:34:05 +02:00
Sean
7ded2cd8a1
Add link to CLOS to meeting room indicator
...
Links the "cannot enter meeting room"-indicator to the CLOS.
Changes the minimize icon
2020-07-14 10:53:02 +02:00
Emanuel Schütze
74e3ea119e
Updated translations (DE, CZ, RU)
2020-07-12 17:41:06 +02:00
Emanuel Schütze
9e55cb1480
Merge pull request #5462 from tsiegleauq/more-jitsi-improvements
...
Improve Jitsi UI
2020-07-12 17:22:32 +02:00
Sean
719d1d1cf1
Improve Jitsi UI
...
Some slight jitsi/stream look and feel improvements
The "closed door" now has a tooltip "add yourseld to los to enter
conference"
Use "keyboard_hide" to indicate minimize/hide
Hide the potentially obsolete quick controls when the full jitsi dialog
is open
Use the "voice_chat" icon to indicate showing the full jitsi dialog
Remove "hangup" "raise hand" and "help" from the jitsi iframe
Add hangup and leave to the jitsi dialog in replacement of hangup in the
iFrame
The "enter live conference" icon is now highlighted by a fade animation
2020-07-10 16:46:29 +02:00
Sean
2835e746e8
Add prefix to topic list of speaker slide
...
The topics prefix (number) was missing in the list of speakers slide
2020-07-09 12:56:58 +02:00
Emanuel Schütze
a7703a5557
Merge pull request #5454 from tsiegleauq/whole-agenda-slide-misses-top
...
Add top to agenda projection
2020-07-09 09:25:36 +02:00
Sean
32775b0a2a
Add top to agenda projection
...
Show the agenda title prefix in the whole agenda slide projection
2020-07-09 08:16:57 +02:00
Sean
011c23093f
Use a-tag for external link
...
Allows to left-click, right-click and middle-click the "open external"
button. Left clicking will disconnect from the current jitsi connection
in OpenSlides. Useful for tests and power using, such as multiple jitsi
connections or easier copying the link.
2020-07-09 08:11:39 +02:00
Sean
656fcccee1
Improve Jitsi on mobile
...
Improves Jitsi and various other stuff for small to smallest devices.
The mobile main action button is a little higher and aligns with the
jitsi bar.
Some mat-cards have extra space to be more jitsi-bar-friendly.
Hides the list filter option on phones
2020-07-08 13:43:54 +02:00
Emanuel Schütze
d76d74e225
Remove debug output
2020-07-08 11:43:39 +02:00
Emanuel Schütze
ba3c5e07f7
Merge pull request #5449 from emanuelschuetze/translations-20200702
...
Updated translations
2020-07-02 22:05:25 +02:00
Emanuel Schütze
55f1d02fcc
Merge pull request #5429 from tsiegleauq/main-page-cleanup
...
Cleanup main routing page and ngrid lists
2020-07-02 22:04:53 +02:00
Emanuel Schütze
378d091dbd
Merge pull request #5448 from tsiegleauq/fix-duration-for-ff-headless
...
Fix duration service for non chrome browsers
2020-07-02 21:46:38 +02:00
Emanuel Schütze
cb8f219163
Updated translations
2020-07-02 21:44:22 +02:00
Emanuel Schütze
66757b04ae
Merge pull request #5446 from tsiegleauq/login-ignore-warning
...
Add "login anyway" button
2020-07-02 21:38:35 +02:00
Sean
346413fbb0
Fix duration service for non chrome browsers
...
-0, 0 and other uses of negative values in the duration service hat a
change of producing undesired results.
Added tests and fixed the function
2020-07-02 15:52:31 +02:00
Finn Stutzenstein
cb190331f3
Merge pull request #5447 from tsiegleauq/allow-negative-duration
...
Allow negative duration
2020-07-02 11:43:25 +02:00
Sean
23ee6a2951
Allow negative duration
...
Allow negative values for durationToString.
The use case is fairly constructed, but now logically correct
2020-07-01 17:44:33 +02:00
Sean
f5654f3a8c
Add "login anyway" button
...
Skip browser warning easier.
2020-07-01 12:22:37 +02:00
FinnStutzenstein
4a96aa31c1
Fixed import of the clos into the operator
2020-06-29 09:25:50 +02:00
Emanuel Schütze
fab51091b1
Merge pull request #5443 from tsiegleauq/pdf-left-footer
...
Render left pdf footer image and page number
2020-06-27 12:59:55 +02:00
Sean
988ee0fe93
Render left pdf footer image and page number
...
Using the web worker, the PDF page number in combination with a left
footer image could not be rendered together.
2020-06-26 14:31:22 +02:00
Sean
3d252060c9
Always show the toolbar in jitsi iframe
...
Try to prevent that the toolbar hides itself
2020-06-26 10:35:26 +02:00
Sean
c2a1b62c8b
Replace jitsi mat dialog
...
Replace Jitsis Mat Dialog with an div container
Fixes an issue where observables in jitsi would register multiple times
Clear the IndexedDB on logout
2020-06-25 16:34:36 +02:00
Sean
fde745530e
Updates some npm deps, fixes travis
...
Another thing for travis
2020-06-23 12:12:01 +02:00
Emanuel Schütze
9a47cff7fa
Merge pull request #5435 from emanuelschuetze/translations20200619
...
Updated translations
2020-06-19 17:29:04 +02:00
Sean
22a374a150
Cleanup main routing page and ngrid lists
...
Sets the main container to absolute,
makes it easier to detect the pages height
ngrid lists can dynamically detect the page height using flexbox,
remove external class injection from list-views,
add "spacer-bottom-60" class for the jitsi-container,
add it everywhere where the jitsi container could hide the content.
2020-06-19 16:47:40 +02:00
Emanuel Schütze
435f555559
Updated translations
2020-06-19 16:29:52 +02:00
Sean
9cf602f0c1
Fix poll progress
...
Fixes a regression in the poll progress.
Poll progress war no longer working for assignments
2020-06-19 13:26:23 +02:00
Emanuel Schütze
2fd4e70b0c
Merge pull request #5433 from tsiegleauq/import-doubled-topics
...
Allow to import the same topic multiple times
2020-06-18 23:05:03 +02:00
Emanuel Schütze
e20c93d445
Merge pull request #5430 from tsiegleauq/stream-jitsi-perms
...
separate stream permission from jitsi
2020-06-18 15:57:15 +02:00
Sean
55f65576f0
Allow to import the same topic multiple times
...
Remove checking for duplicated topic names.
Allows to import topics more than once, usefull if you have to import an
agenda over and over again.
2020-06-18 15:51:51 +02:00
Emanuel Schütze
d558c293b2
Merge pull request #5424 from jsangmeister/delegate-view-fixes
...
Fix some delegate view bugs
2020-06-18 15:51:08 +02:00
Joshua Sangmeister
44f1d1e819
Fix some delegate view bugs
2020-06-18 15:26:50 +02:00
Sean
677595fe5b
Merge pull request #5431 from tsiegleauq/dark-theme-improvements
...
Improve dark themes
2020-06-18 13:35:17 +02:00
Sean
912a528f8a
Improve dark themes
...
Add better contrast to dark themes on various instances
Add yellow as accent color for red themes
2020-06-18 13:11:45 +02:00
Sean
9feaa59ebb
Seperate stream permission from jitsi
...
Allows jitsi conferences without stream permission,
allowing detailed speration from users who can jitsi streams and see
stream
2020-06-18 12:06:59 +02:00
Sean
00e644292d
Use title for amendments if an id does not exist
...
Also some slight head-bar cleanups
2020-06-17 11:08:22 +02:00
Emanuel Schütze
b43151fd59
Merge pull request #5425 from tsiegleauq/motion-csv-impexp
...
Export motion id latest
2020-06-16 22:17:04 +02:00
Sean
fbbc4389fb
Export motion id latest
...
Put the motion id to the end of all export used.
Solves the issue that users cannot re-import CSVs if they export them
with sequential numbers
2020-06-16 21:35:24 +02:00
Emanuel Schütze
68c77fe52c
Rename and check "can see extra data" permission.
2020-06-16 21:00:37 +02:00
Sean
b9fbf4209b
Cleanup theming related code
...
Enhance color usage, add more default themes, add solarized theme
2020-06-16 12:56:08 +02:00
Emanuel Schütze
ac4cb39105
Merge pull request #5419 from tsiegleauq/agenda-slide-distance
...
Add more distance for topics in agenda slide
2020-06-15 15:12:52 +02:00
Emanuel Schütze
b5bc855dfe
Merge pull request #5417 from tsiegleauq/agenda-numbered-topics-pdf
...
Prevent double "TOP" in agenda PDF
2020-06-15 15:10:22 +02:00
Sean
1f876ec6dd
Prevent double "TOP" in agenda pdf
...
Also: changes the definition of "getTitle" and "getAgendaTitle" to be more
consistent and easier to guess. getTitle will simply return the title, while getAgendaTitle
returns the title with the agenda-prefix
2020-06-12 16:18:57 +02:00
Emanuel Schütze
c1605929e9
Merge pull request #5410 from tsiegleauq/better-login-page
...
Add better login page
2020-06-12 15:13:41 +02:00
Emanuel Schütze
2ea95937d7
Merge pull request #5420 from tsiegleauq/user-set-present-link-dup
...
Remove presence link in user multi select mode
2020-06-12 15:09:50 +02:00
Sean
f06f2dee9f
Remove presence link in user multi select mode
...
Removes the link to "users/presence" while in the user lists multi
selection view. The link was duplicated to be present in both multi
select and single selct view
2020-06-12 14:51:05 +02:00
Sean
33ba8c4628
Add more distance for topics in agenda slide
...
Makes the projection of the agenda looks cleaner and more relaxed
2020-06-12 14:43:40 +02:00
Sean
7d3280707d
Merge pull request #5414 from tsiegleauq/support-chrome-80
...
Lower chrome/chromium support version to version
2020-06-12 11:08:26 +02:00
Sean
13cbece9d9
Lower chrome/chromium support version to version
...
Lowers the supported version for chrome and chromium based browsers to
80. Keep in mind that you can always skip the checks!
2020-06-12 10:50:36 +02:00
Sean
5ed9c88ae4
Add better login page
...
Themes now cover the login page
more responsive on both large, small and smalest screens
the footer behaves like a footer
2020-06-12 10:23:10 +02:00
Emanuel Schütze
ff4324117e
Updated translations.
2020-06-11 17:23:42 +02:00
Emanuel Schütze
f590994875
Merge pull request #5403 from tsiegleauq/blacklist-browsers
...
Catch unsupported browsers
2020-06-11 15:42:45 +02:00
Emanuel Schütze
2cdb3f4ef3
Merge pull request #5407 from tsiegleauq/assignment-pdf-reduce
...
Fix assignment pdf results
2020-06-11 15:10:36 +02:00
Sean
9387a3f394
Catch unsupported browsers
...
unspoorted browsers trying to access the login mask will be forwarded to
an info page.
The info page shows that the browser is not suppoted and hints the smallest
supported version of their current browser.
As it works best and might prevent some support calls, I added an hint
for chrome as the favored browser by OpenSlides (debateable)
To update/downgrade the supported versions, simply edit the enum in the
service.
If we cannot detect the browser, we assume it was supported.
2020-06-11 14:39:14 +02:00
Sean
56b47214bc
Fix assignment pdf results
...
Filters out results unfitting to the current election method.
2020-06-11 14:12:10 +02:00
Sean
0d9738b72d
Integrate streams
...
Integrate live streaming inside the jitsi/rtc components.
Live streaming works without jitsi, but is using the same components for
a fluid integration.
A streaming URL can be set in the settings page.
Users EITHER consume the live stream OR are presend in a jitsi live
conference.
To consume both the live stream and the jitsi conference, users may use
a dedicated jitsi tab in their session.
The jitsi users can be restricted to only allow thouse with the right
the manage speakers or being present on the "current list of speakers",
automatically simulating a virtual plenum
2020-06-11 11:20:00 +02:00
Emanuel Schütze
acf499f6e1
Merge pull request #5378 from jsangmeister/monospace-countdown
...
Replaces the countdown font with a monospaced one
2020-06-09 23:15:06 +02:00
Joshua Sangmeister
e653021eff
Add a configurable monospace font for the countdown
...
use Roboto Condensed bold by default
2020-06-09 22:54:31 +02:00
Emanuel Schütze
aeb893a8d9
Merge pull request #5399 from tsiegleauq/normal-amendments-in-list
...
Fix error for freely editable amendments
2020-06-09 21:48:13 +02:00
Emanuel Schütze
ff9125fb9f
Merge pull request #5401 from tsiegleauq/assignment-poll-chart-abstain
...
Hide abstain bar in assignment polls chart
2020-06-09 21:20:54 +02:00
Sean
d4f211e344
Fix error for freely editable amendments
...
Recent changes to amendment had various bugs.
This one regarded the amendment list, where amendments without amendmend
paragraphs returned several errors.
2020-06-09 21:16:04 +02:00
Emanuel Schütze
4673c741e9
Merge pull request #5402 from jsangmeister/fix-tiny-mce
...
Fix change detection for Tiny MCE
2020-06-09 20:56:29 +02:00
Joshua Sangmeister
bf35c55956
Fix change detection for Tiny MCE
2020-06-09 13:14:05 +02:00
Sean
6efdc9a3dd
Hide abstain bar in assignment polls chart
...
If the percent base does not include "abstain", the grey abstain bar
will not be shown in the assignment poll chart
2020-06-09 12:47:38 +02:00
Tobias Hößl
cadef6d42e
Don't show amendment CR-diff-view if no CRs exist
2020-06-07 15:02:35 +02:00
Tobias Hößl
bc3b8be78d
Increase recalculation performance by additional caching
2020-06-07 11:44:07 +02:00
Tobias Hößl
18bc495bd8
Bugfix: errors with non-paragraph-based amendments
2020-06-07 10:54:57 +02:00
Emanuel Schütze
5072e66a7e
Updated translations
2020-06-04 17:06:08 +02:00
Emanuel Schütze
3109337004
Merge pull request #5394 from tsiegleauq/jitsi-iframe-dialog
...
Show Jitsi iFrame in Dialog
2020-06-04 16:37:01 +02:00
Sean
3ca4714812
Show Jitsi iFrame in Dialog
...
Replace the external link button with a (real) Dialog containing the
jitsi iFrame.
The dialog can be hidden but not entirly closed.
Replace all dialogService.closeAll() functions by closing the specific
dialog rather than all of them.
2020-06-04 16:29:35 +02:00
FinnStutzenstein
c186a575f6
Fixed incomplete autoupdates
...
A conceptional issue in `get_data_since` leads to incomplete
autoupdates. The behaviour was long time in the code, but only with a
lot of autoupdates (high concurrency) and the autoupdate delay I noticed
the bug during testing. I'm sure, that this issue might have caused
incomplete autoupdates (which the user may experience as "lost
autoupdates") in previous productive instances. Instead of quering a
range (from_change_id to to_change_id) one now can only get data from a
change id up to the max change id in the element cache. The max change
id gets now returned by `get_data_since`.
I also added a get_all_data with the capability of returning the
max_change_id at this point of time.
As a usability-"fix" (more like a fix the result of a bug, not the bug
itself) a refresh button for a poll was added, that issues an autoupdate
for the poll and all options.
2020-06-04 15:16:05 +02:00
Emanuel Schütze
c4f482b70c
Merge pull request #5391 from jsangmeister/update-poll-slide
...
Fixes motion poll slide icon size & rounding
2020-06-03 19:16:29 +02:00
Emanuel Schütze
0275df6ab2
Merge pull request #5392 from tsiegleauq/vote-await-server-answer
...
Wait for server while voting
2020-06-03 17:35:19 +02:00
Sean
dced8fbcc7
Wait for server while voting
...
Blocks voting state changes and prevents the user from sending multiple
vote values while the server is not responding during voting
2020-06-03 14:53:31 +02:00
Joshua Sangmeister
f4907e6604
Fixes motion poll slide icon size & rounding
2020-06-02 22:41:23 +02:00
Emanuel Schütze
d7408b40f9
Merge pull request #5390 from jsangmeister/hide-amendments-when-deactivated
...
Hides amendments entry in menu if deactivated
2020-06-02 22:26:14 +02:00
Emanuel Schütze
7665634d42
Merge pull request #5375 from FinnStutzenstein/autoupdatePerformance
...
Autoupdate performance
2020-05-29 17:31:32 +02:00
FinnStutzenstein
0eee839736
Small improvements and first attempt to make to poll progress responsive
...
to massive autoupdates. The "optimization" didn't help, so this has to
be continued in another PR.
2020-05-29 15:46:19 +02:00
Joshua Sangmeister
a84bfccd07
Hides amendments entry in menu if deactivated
2020-05-28 15:26:56 +02:00
FinnStutzenstein
d8b21c5fb5
(WIP) Ordered and delayed autoupdates:
...
- Extracted autoupdate code from consumers
- collect autoupdates until a AUTOUPDATE_DELAY is reached (since the first autoupdate)
- Added the AUTOUPDATE_DELAY parameter in the settings.py
- moved some autoupdate code to utils/autoupdate
- moved core/websocket to utils/websocket_client_messages
- add the autoupdate in the response (there are some todos left)
- do not send autoupdates on error (4xx, 5xx)
- the client blindly injects the autoupdate in the response
- removed the unused autoupdate on/off feature
- the clients sends now the maxChangeId (instead of maxChangeId+1) on connection
- the server accepts this.
2020-05-27 16:05:27 +02:00
Raphael Topel
60621bf4d0
Fix tinymce version to 5.2.2
2020-05-22 22:19:45 +02:00
FinnStutzenstein
23842fd496
Synchronize autoupdate code in the client
...
If autoupdates are too fast, the first one may not be fully executed. Especially when the maxChangeId is not yet updated, the second Autoupdate will trigger a refresh, because for the client it "lay in the future". This can be prevented by synchronizing the autoupdate-handling code with a mutex.
2020-05-22 15:23:53 +02:00
Sean
4ac7b1eb4b
Merge pull request #5380 from FinnStutzenstein/closService
...
Fix the CLOS service to trigger on CLOS updates
2020-05-20 18:29:11 +02:00
FinnStutzenstein
17049cc0f3
Fix the CLOS service to trigger on CLOS updates
...
additionally fixed some naming issues
2020-05-20 18:09:50 +02:00
Emanuel Schütze
37c3ac5aff
Updated translations
2020-05-14 19:52:18 +02:00
Sean
3820e09b89
Show assignment poll result table instad of chart
...
Replaces the assignment result chart with the result table from the
detail view and projector
2020-05-14 16:40:19 +02:00
Emanuel Schütze
1ca3196a75
Merge pull request #5370 from tsiegleauq/tags-for-agenda
...
Add tags for agenda items
2020-05-14 15:23:55 +02:00
Emanuel Schütze
ee6076f168
Merge pull request #5372 from tsiegleauq/unset-gender
...
Allow unset gender in user form
2020-05-14 15:18:00 +02:00
Sean
b6bb1fe767
Add tags for agenda items
...
Adds tags for agnda items, adds tag filter in agenda list view, server
changes, client relations, adjust agenda csv exporter
2020-05-14 15:07:59 +02:00
Sean
7609a0c3db
Allow unset gender in user form
...
Fixes a bug that prevented the form from unsetting the gender value
2020-05-14 14:53:44 +02:00
Emanuel Schütze
b090e46b66
Merge pull request #5359 from tsiegleauq/clean-projector-permissions
...
Add permission as lookup object
2020-05-14 14:48:37 +02:00
Emanuel Schütze
ca039860f7
Merge pull request #5365 from jsangmeister/default-voting-type
...
Added config for default poll type
2020-05-14 13:02:51 +02:00
Sean
fca4154bb5
Add permission as lookup object
...
Adds a lookup object for a more solid approach to handling permissions.
Permissions are now an actual type rather than just a string.
2020-05-14 10:12:22 +02:00
Emanuel Schütze
621d0f4e1a
Merge pull request #5366 from tsiegleauq/motion-not-switching-state
...
Change motion cr mode view behavior
2020-05-14 08:25:01 +02:00
Emanuel Schütze
d1b6ed8d29
Merge pull request #5367 from tsiegleauq/hide-submitter-in-projector
...
Hide the submitter-box in motion slide if empty
2020-05-14 08:22:28 +02:00
Sean
853bc31e21
Change motion cr mode view behavior
...
if the default cr mode is 'original' nothing really happens
if the default cr mode is 'changed' you will stay in original view after
creating cr's. That's due to the autoupdate limitation. Changing this
would mean that you cannot change the view anymore
if the default cd mode is 'diff' you will switch to diff view after
creating a cr. It seems that the diff view has an automatic fallback to
the original view if no cr exists, perhaps Tobias knows more about that.
If the default cr mode if 'final' you will try to change to
mod-final-version if it exists. If there is no change-reco, you will
fall back to original version.
2020-05-14 07:42:25 +02:00
Joshua Sangmeister
fa63ef0307
added config for default poll type
2020-05-14 07:38:14 +02:00
Sean
fef3cf41bb
Hide the submitter-box in motion slide if empty
...
Hides the "submitter" text and corresponding boxes if they are empty
2020-05-14 07:37:18 +02:00
FinnStutzenstein
34d85c996c
Fix projector subtitles for items without agenda items
2020-05-14 07:32:44 +02:00
Emanuel Schütze
9938a68865
Updated translations
2020-05-11 15:33:58 +02:00
Sean
3e19840b08
Merge pull request #5352 from tsiegleauq/speaker-list-change-detection
...
Manual cd for list of speakers
2020-05-11 11:19:55 +02:00
Sean
7a31cff612
Merge pull request #5347 from GabrielInTheWorld/statistics
...
Create statistics of closed list of speakers
2020-05-11 11:07:53 +02:00
GabrielMeyer
e7de593b54
Create statistics of closed list of speakers
2020-05-11 07:56:50 +02:00
Sean
602d1c8e7b
Manual cd for lost of speakers
...
Adds better cd for list of speakers
2020-05-08 12:20:15 +02:00
Tobias Hößl
25839ea709
Toggle to show all amendments in diff view
2020-05-06 20:28:19 +02:00
FinnStutzenstein
c643a233ae
fixed endless spinner on SAML login
2020-05-06 18:23:38 +02:00
Sean
fede11b59f
Fix poll results under iOS
...
Fixes an issue on iOS devices regarding click-bindungs in structural
loops. iOS devices did not respond to touch inputs in the given view
2020-05-06 14:32:46 +02:00
Emanuel Schütze
77cf3e2785
Merge pull request #5321 from tsiegleauq/projector-indicator-on-agenda
...
Projector indicator list view tables
2020-05-05 17:50:27 +02:00
Sean
4e624384e7
Projector indicator list view tables
...
Shows a projector indicator in the list view tables.
Width is 24px, just as small as mat-icon needs.
Works in every list view that allows projector buttons (which should
cover everything where an indicator could be demanded)
2020-05-05 16:08:32 +02:00
Emanuel Schütze
f9cd3ebd89
Merge pull request #5304 from CatoTH/change-recommendations-for-amendments
...
Change recommendations for amendments
2020-05-05 15:46:00 +02:00
Sean
1a653c3fa7
Set tinymce urls to absolute
...
Potentially fixes a deeper TinyMCE issue that causes TinyMCE to remove
important parts of pasted URLs
2020-05-04 17:19:05 +02:00
Tobias Hößl
b51787129b
Change recommendations for amendments
2020-05-02 18:40:59 +02:00
Emanuel Schütze
f415fd0554
Updated translations
2020-04-30 17:43:48 +02:00
Emanuel Schütze
c6836ff6c5
Merge pull request #5294 from GabrielInTheWorld/sort-speakers
...
Changes workflow for sorting speakers
2020-04-30 16:42:52 +02:00
GabrielMeyer
4a24da12da
Changes workflow for sorting speakers
2020-04-30 15:58:49 +02:00
Sean
38ee6bb2f1
Show first contribution hint in list of speaker
...
Shows a hint in the list of speakers if a speaker contributes for the
first time.
2020-04-30 14:06:37 +02:00
Emanuel Schütze
a47285c0ff
Merge pull request #5309 from tsiegleauq/integrate-jitsi-meet-client
...
Integrate jitsi-meet in OpenSlides
2020-04-30 13:05:12 +02:00
Sean
1439444b2e
Integrate jitsi-meet in OpenSlides
...
- minimal jitsi client in the bottom right of the screen
- can be shown and hidden like a messenger
- allows to mute, unmute, call, stop call
- automatically connects to a conference
- shows a list of users connected to the room
- jitsi iframe is currently hidden
- "open in jitsi meet" link
- only one connection will be opened if using multiple tabs
- JITSI_DOMAIN and JITSI_ROOM_NAME must be present in the settings.py
- config variables in settings
2020-04-30 11:07:32 +02:00
FinnStutzenstein
aa1a2cec89
Removed vote weight from votes_cast
2020-04-30 08:10:39 +02:00
Emanuel Schütze
7a25a2496d
Updated German translations.
2020-04-24 14:28:26 +02:00
FinnStutzenstein
152401a9a3
Duplicates single and multiple topics in the agenda
2020-04-24 12:34:22 +02:00
Emanuel Schütze
2057150076
Merge pull request #5322 from FinnStutzenstein/delete-all-speakers
...
delete all speakers of all lists of speakers
2020-04-24 12:25:49 +02:00
Emanuel Schütze
cb52347354
Merge pull request #5328 from FinnStutzenstein/projectorSubtitles
...
Subtitles for projected elements in the projector detail view
2020-04-24 12:12:22 +02:00
Emanuel Schütze
0c6da9799c
Merge pull request #5335 from GabrielInTheWorld/fixTopicPreview
...
Fixes preview of topics in global search
2020-04-24 09:13:36 +02:00
GabrielMeyer
41b9065807
Fixes preview of topics in global search
2020-04-23 23:36:10 +02:00
Emanuel Schütze
527f947143
Updated German translations
2020-04-23 20:35:59 +02:00
FinnStutzenstein
c8faa982ac
Subtitles for projected elements in the projector detail view
2020-04-23 16:01:18 +02:00
FinnStutzenstein
38486463bc
delete all speakers of all lists of speakers
2020-04-23 09:43:04 +02:00
Finn Stutzenstein
6a488eb78e
Merge pull request #5323 from tsiegleauq/linter-prettier-updates
...
Update linting rules
2020-04-22 17:32:42 +02:00
Sean
97c2299aec
Implement vote weight in client
...
Implements vote weight in client
The user detail page has a new property
change deserialize to parse floats
change "yes"-voting to send "Y" and "0" instead of "1" and "0"
add vote weight to user list, filter, sort
add vote weight to single voting result
votesvalid and votescast respect the individual vote weight
fix parse-poll pipe and null in pdf
2020-04-22 16:54:50 +02:00
Sean
e702843f07
Update linting rules
...
Includes strickt(er) tslint line-length of 120, with an exception
for import statements (prettier does not like these)
2020-04-22 16:24:08 +02:00
Sean
91d4b3c7af
Fixes an issue regarding self-set-present
2020-04-20 19:17:03 +02:00
Emanuel Schütze
d210496146
Merge pull request #5293 from GabrielInTheWorld/subline-comment
...
Adds a third line for comments
2020-04-20 18:09:52 +02:00
Emanuel Schütze
35ce596706
Merge pull request #5317 from tsiegleauq/set_presence_on_userlist
...
Allow set present on user list if config was set
2020-04-20 17:13:48 +02:00
Sean
70aadcdd28
Merge pull request #5307 from GabrielInTheWorld/no-found-button
...
Adds a 'not found'-button to search-value-selector
2020-04-20 14:52:46 +02:00