Commit Graph

6349 Commits

Author SHA1 Message Date
Emanuel Schütze 2a35a6010a
Merge pull request #4399 from MaximilianKrambach/bulkUser
bulk import of users
2019-02-26 22:24:53 +01:00
Maximilian Krambach be83d9b0aa bulk import of users 2019-02-26 22:05:38 +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