ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,961 Commits 6 Branches 42 Tags 64 MiB
aa77b878c2
Commit Graph

7961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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