Commit Graph

601 Commits

Author SHA1 Message Date
Emanuel Schütze
1968a83123
Merge pull request #4417 from MaximilianKrambach/agendaDetail
fix agenda editing button
2019-02-27 22:18:44 +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
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
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
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
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
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
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
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
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
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
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
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
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
Sean Engelhardt
53ea73ccde Add "No." as translateable
To display user numbers, No. is now translateable
2019-02-20 16:17:05 +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
29ba4a61e6 Updated translations 2019-02-19 21:32:24 +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
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
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
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
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
Maximilian Krambach
2ba9aca7ac Activate polyfills for supporting IE11 and Edge 2019-02-15 22:26:54 +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
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
Emanuel Schütze
ff407468f0 Update translations 2019-02-14 22:17:52 +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
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