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

707 Commits

Author SHA1 Message Date
GabrielMeyer
76d760bd41 Replaces the old angular2tree with a custom drag&drop tree 
Calculates the direction of the moving.

Finishes the moving of nodes in same level

Adds some style

Sets the padding dynamically

Adds placeholder depends on the horizontal movement

Set the placeholder at the correct place, so the user can see, where he will drop the moved node

Finishes moving of nodes

- Old parents change their option to expand.
- New parents change their option to expand.
- If the user moves a node between nodes with a higher level, the node will be moved to the next index with same or lower level.

Fixes the visibility of moved node

- If the new parent is not visible, the moved node will not be seen.

If the user moves an expanded node, the new parent should expanded, too, if it's not already.

Sending successfully data to the server

- Sorting the items

Handles moving nodes between parent and children

- If the user moves a node between a parent and its children, the children will be relinked to the moved node as their new parent.

Replaces the old `sorting-tree` to a new one

- The new `sorted-tree` replaces the old `sorting-tree`.
- The old package `angular-tree-component` was removed.
- The user will only see the buttons to save or cancel his changes, if he made changes.
- The buttons, that do not work currently, were removed.

Adds a guard to check if the user made changes.

- If the user made changes but he has not saved them, then there is a dialog that will prompt to ask for confirmation.

Before cancelling the changes the user has to confirm this.
 2019-03-19 13:19:35 +01:00
Tobias Hößl
5d9128403a
Bugfix: Diff 2019-03-17 20:31:25 +01:00
FinnStutzenstein
6cb4b9a691 Add amendments as dependencies in ViewMotion 2019-03-17 18:01:10 +01:00
Emanuel Schütze
1c02d5f496
Merge pull request #4513 from CatoTH/OS3-Bugfix-Amendment-Diff-Extraction 
Bugfix in motion's diff-view: correct amendment diff
 2019-03-16 20:43:54 +01:00
Tobias Hößl
1764447704
Bugfix in motion's diff-view: correct amendment diff 2019-03-16 14:07:05 +01:00
Tobias Hößl
e62648c719
Bugfixes: Highlighting wo CRs, better scrolling 2019-03-16 13:34:55 +01:00
Emanuel Schütze
e03ec00567
Merge pull request #4512 from FinnStutzenstein/fixOpenSlidesServiceOnLogin 
Fixed errors on login
 2019-03-16 12:11:44 +01:00
FinnStutzenstein
cd7b700aea Fixed errors on login 2019-03-15 15:29:02 +01:00
Maximilian Krambach
9c67b1c773 sorting from inside base repositories 
Authors: FinnStutzenstein, MaximilianKrambach, tsiegleauq
 2019-03-15 08:12:50 +01:00
Sean Engelhardt
5d35a0fa5f Fix certain permission checks 
Fixed permissions in topic detail, agenda list and user detail.
Fixes Z-Level of head bar and mat-spinner.
 2019-03-14 17:50:33 +01:00
Sean Engelhardt
d4e10702cc Cleanup Repos 
Add an getViewModelListBehaviorSubject that simplifies
how to get most model lists in the view

unified update, delete and create methods and removed redundant code from the repos
(where it was possible)

cleaned up the motion detail to not directly use the DataStore

Add information about the "main model" to all ViewModels, to call the
correct constructor in the BaseRepo
 2019-03-14 10:46:33 +01:00
Sean
ae3ce54f57 workflow table state sort 
Sorts the Workflow table to be more predictable

Adds new shared SCSS table rules.
Adds a default with as 100% (there have never been half tables)
Overwrites the rules for sticky tables
 2019-03-13 15:54:35 +01:00
Sean
7734a502d8
Merge pull request #4502 from FinnStutzenstein/fixRedirectionOnDelayedWhoAmI 
Fixed redirection on login subpages (fixed #4474)
 2019-03-13 15:31:21 +01:00
Finn Stutzenstein
6d66ec5b5d
Merge pull request #4493 from FinnStutzenstein/baseComponent 
Cleanup optional parameter from BaseComponent
 2019-03-12 12:41:09 +01:00
FinnStutzenstein
e6ec164fe9 Fixed redirection on login subpages (fixed #4474) 2019-03-12 12:01:05 +01:00
Emanuel Schütze
b30340b72f
Merge pull request #4497 from tsiegleauq/motionslides-linenumber-height 
Fix motion slide line number alignment
 2019-03-11 14:25:01 +01:00
Sean
35b27b967f Fix motion line number alignment 2019-03-11 13:56:25 +01:00
FinnStutzenstein
eb4537c1bf rework login system (again) 2019-03-11 13:45:17 +01:00
Emanuel Schütze
e13a849c19
Merge pull request #4498 from tsiegleauq/fix-path-matching 
Fix path matching
 2019-03-11 13:23:03 +01:00
Sean
245f3a5a27 Fix path matching 
Fixed an error where navigation to not-lazy-loaded was prevented by full
path-matching.
Was preventing the sites for Search, Legal Notice and PP to show up
 2019-03-11 12:33:55 +01:00
Emanuel Schütze
5139fe8365 Updated tranlstions 2019-03-11 12:28:34 +01:00
Emanuel Schütze
d251bd15e6
Merge pull request #4492 from tsiegleauq/history-filter 
Fix history history filter for null
 2019-03-11 12:25:37 +01:00
Emanuel Schütze
8ce8286ea2
Merge pull request #4494 from tsiegleauq/agenda-filter-opendone 
Fix agenda status filter
 2019-03-11 12:23:24 +01:00
Emanuel Schütze
3684701ab6
Merge pull request #4495 from FinnStutzenstein/viewItemTitle 
ViewItem title (fixes #4464)
 2019-03-11 12:21:21 +01:00
FinnStutzenstein
aa81bf38c3 ViewItem title (fixes #4464) 2019-03-11 11:21:34 +01:00
Sean
8ca1a4256c Fix agenda status filter 
Fixes an issue where the status filter in the agenda list did not do
nothing
 2019-03-11 11:04:29 +01:00
FinnStutzenstein
64eab79d3b Cleanup optionalparameter from BaseComponent 2019-03-11 10:49:57 +01:00
Sean
4e62e9253e Fix history history filter for null 
Fixes an issue where the history filter was throwing an error
if there were deleted objectsy
 2019-03-11 10:29:12 +01:00
Finn Stutzenstein
d10dfb0915
Merge pull request #4469 from MaximilianKrambach/speakertime 
clarifying duration service usage
 2019-03-11 08:07:41 +01:00
Emanuel Schütze
0419ea629f
Merge pull request #4487 from CatoTH/OS3-Bugfix-Amendment-Status-Handling 
Bugfix: Amendment statuses
 2019-03-09 23:14:29 +01:00
Tobias Hößl
6b685924d9 Bugfix: Amendment statuses 2019-03-09 22:48:21 +01:00
Emanuel Schütze
1ecc7f4baa
Merge pull request #4485 from tsiegleauq/user-detail-template-fixes 
User detail template fixes
 2019-03-09 22:06:15 +01:00
Emanuel Schütze
f4b798d6a2
Merge pull request #4479 from FinnStutzenstein/losSpeakerCount 
(current) list of speakers: show amount of waiting speakers
 2019-03-09 21:54:59 +01:00
Emanuel Schütze
cee7c39c7d
Merge pull request #4481 from tsiegleauq/speaker-list-perms 
Prevent drag and final versions without perms
 2019-03-09 21:49:08 +01:00
Emanuel Schütze
a26c44ca73
Merge pull request #4483 from tsiegleauq/motion-block-perms 
Motion block permission fixes
 2019-03-09 21:41:12 +01:00
Sean Engelhardt
6acecccc6e Motion block permission fixes 
Adds fixes to motion block permission checks.
Users with "Can See motion"
Can see motion blocks in list view

The menu-column in motion blocks list will be completely hidden
without "Motion Can Manage" permissions

In motion block list view, the motion will be displayed with
identifier rather than just the title
 2019-03-09 21:22:56 +01:00
Emanuel Schütze
fc7a3a7f51
Merge pull request #4486 from tsiegleauq/amendment-wizzard-fixes 
Fix amendment creation
 2019-03-08 20:56:43 +01:00
Emanuel Schütze
5e7c604c4b
Merge pull request #4480 from FinnStutzenstein/sortMotionBlocksOnSlide 
Sort motions on the motion block slide
 2019-03-08 20:49:18 +01:00
Sean Engelhardt
07d3ea4c25 Fix amendment creation 
Categories and blocks not appear after (paragraph based) amendment
creation.
Reason for amendments is now required if the config was set
accordingly
 2019-03-08 16:45:45 +01:00
Emanuel Schütze
07c723a7dc
Merge pull request #4475 from FinnStutzenstein/addTextDecorationToHtmlWhitelist 
Add text-decoration to bleach whitelist
 2019-03-08 16:19:32 +01:00
FinnStutzenstein
d90e88fa53 Sort motions on the motion block slide 2019-03-08 16:16:05 +01:00
FinnStutzenstein
66ebdc4f8a Add text-decoration to bleach whitelist, fix tinymce toolbar 2019-03-08 15:11:55 +01:00
Sean Engelhardt
62e3256c54 User detail template fixes 
Adds a new template to user detail, to show user information in multiple
lines

Also adds a new feature to the headbar. Long titles (over title slot) will
break using ellipsis
 2019-03-08 14:51:48 +01:00
Emanuel Schütze
3490ff3ca4
Merge pull request #4477 from FinnStutzenstein/projectorScroll 
projector scroll and contdown offset
 2019-03-08 14:32:42 +01:00
FinnStutzenstein
5fff7d24ec projector scroll and contdown offset 2019-03-08 13:17:43 +01:00
Emanuel Schütze
0290449b8b
Merge pull request #4452 from FinnStutzenstein/reworkPersonalNotes 
rework personal notes
 2019-03-08 12:45:54 +01:00
FinnStutzenstein
f198a21543 rework personal notes 2019-03-08 12:09:53 +01:00
Emanuel Schütze
40e5ea0a1d
Merge pull request #4473 from FinnStutzenstein/themeInLoginData 
Added theme to login data
 2019-03-08 12:01:32 +01:00
Sean Engelhardt
985fe9cc8b Prevent drag and final versions without perms 
Fixes an issue where users without manage rights
were able to use the drag and drop feature of the
list of speakers.
Also hides "modified final version" prints without
sufficient permissions.

Alters OSPerms to support "and" operators,
so "perm" and "other condition" is now possible
 2019-03-08 11:53:25 +01:00
FinnStutzenstein
f60e66c1a8 (current) list of speakers: show amount of waiting speakers 2019-03-08 11:15:53 +01:00
Sean Engelhardt
6a421f8f6b Add more motion modules 
Seperates the previously large motion module in various smaller
and very small feature modules.
Motion Detail, and all direct dependancies to Motion Detail
is now an own module.
This significantly increases the response time of openslides 3
 2019-03-08 10:43:54 +01:00
FinnStutzenstein
a1018e62e2 Added theme to login data 2019-03-08 09:19:05 +01:00
Emanuel Schütze
70191ce455
Merge pull request #4470 from FinnStutzenstein/motionSLideRecommendationFix 
Replace recommendation on client and server for motion slide
 2019-03-07 16:55:53 +01:00
Maximilian Krambach
9cdc909d25 fix legalnotice and privacy z-index issue 2019-03-07 15:06:41 +01:00
FinnStutzenstein
ed4b1c80f1 Replace recommendation on client and server for motion slide 2019-03-07 08:52:33 +01:00
Maximilian Krambach
e05874cf6f clarifying duration service usage 2019-03-06 16:54:00 +01:00
Maximilian Krambach
21893f00b8 disable some unnecessary ripples in motion detail view 2019-03-06 15:35:27 +01:00
Jochen Saalfeld
dcccfb41b5
Merge pull request #4462 from FinnStutzenstein/fixIsStable 
Fixed SW registration issues due to pending mikrotasks
 2019-03-06 15:09:43 +01:00
Maximilian Krambach
0ddded4a86 csv example export refactor 
- make csv example data respect config separators
- refactor at a more central place
 2019-03-06 11:03:51 +01:00
Emanuel Schütze
ad653de915
Merge pull request #4450 from FinnStutzenstein/offlineOperator 
offline operator
 2019-03-06 09:24:52 +01:00
FinnStutzenstein
b0d4851651 Fix inSomeGroups for the superadmin, delete empty comments 2019-03-06 08:35:00 +01:00
FinnStutzenstein
e1fcda7890 Fixed SW registration issues due to pending mikrotasks 2019-03-06 08:15:19 +01:00
FinnStutzenstein
0c6a7b9c4b offline operator 2019-03-06 07:50:54 +01:00
Emanuel Schütze
118b853a91
Merge pull request #4458 from tsiegleauq/foce-service-worker 
Add Service Work(e|a)r(round)
 2019-03-05 15:03:40 +01:00
Emanuel Schütze
1fecf941c8
Merge pull request #4459 from FinnStutzenstein/fixUpdatingMotions 
set allow_null for integerfields, when they are not required
 2019-03-05 15:02:26 +01:00
FinnStutzenstein
20e2639323 set allow_null for integerfields, when they are not required 2019-03-05 14:23:01 +01:00
Sean Engelhardt
3e4dffd7a4 Add Service Work(e|a)r(round) 
uses the promise in returned by .bootstrapModule
to register the serviceworker if required.
Seems to work reliable, even in unstable environments.
Requires production mode to comprehend.
(at least ng build --prod)
 2019-03-05 14:06:36 +01:00
GabrielMeyer
85f9897f42 Fixes clicking on the group-cell to change settings 
Now, the user can click on the whole group-cell to change some settings like groups, gender and member-number.
 2019-03-05 12:43:53 +01:00
Emanuel Schütze
4349f2eb11
Merge pull request #4449 from MaximilianKrambach/tinyMCE_blur 
change config update behavior for editors
 2019-03-04 22:16:27 +01:00
Emanuel Schütze
d081b90ff1
Merge pull request #4451 from FinnStutzenstein/moreSearch 
Search in related objects
 2019-03-04 21:56:37 +01:00
Emanuel Schütze
d071bb1d47
Merge pull request #4454 from emanuelschuetze/motion-detail-layout-fix 
Reduce height of controls to fix linenumbering layout.
 2019-03-04 21:38:56 +01:00
Emanuel Schütze
176fb9943d Reduce height of controls to fix linenumbering layout. 
in motion detail view with outside numbering
 2019-03-04 15:27:19 +01:00
Emanuel Schütze
22783f876b Fixed linenumbering error on building motion pdf (checks if element is null). 2019-03-04 15:02:06 +01:00
FinnStutzenstein
9198058bd7 Search in related objects 2019-03-04 13:36:34 +01:00
Maximilian Krambach
cc5e38faad change config update behavior for editors 
tinyMCE editors will not update after a timeout, but when focus changes
or the editor is destroyed
 2019-03-04 11:50:07 +01:00
Emanuel Schütze
ff410a4954 Minor projector css/wording changes 2019-03-01 14:52:29 +01:00
Emanuel Schütze
40de87c5b4
Merge pull request #4444 from FinnStutzenstein/stableElementsCleanup 
clean up stable projectorelements, if they have an error
 2019-03-01 14:03:19 +01:00
Emanuel Schütze
6e4a110116 List of speakers template 2019-03-01 13:17:30 +01:00
FinnStutzenstein
d0e6681aad One global clos reference. More projector buttons for the clos view 2019-03-01 13:17:26 +01:00
FinnStutzenstein
43f084438d clean up stable projectorelements, if they have an error 2019-03-01 13:03:55 +01:00
FinnStutzenstein
d3773bc8e8 set the clock color to the header color of the projector 2019-03-01 12:06:46 +01:00
Finn Stutzenstein
69fe4632f4
Merge pull request #4419 from MaximilianKrambach/countdown 
countdown: new title field, description made optional
 2019-03-01 12:02:50 +01:00
Maximilian Krambach
44d16eb244 countdown: new title field, description optional 2019-03-01 11:22:09 +01:00
Maximilian Krambach
b704a3b09f consolidate state css colors 2019-03-01 11:11:13 +01:00
Emanuel Schütze
08e076f4a4
Merge pull request #4438 from FinnStutzenstein/addItemNumberToTopicTitle 
Add item number to topic title
 2019-03-01 10:50:53 +01:00
FinnStutzenstein
3f77cc7b24 Add item number to topic title, hide clos slide for one projector 2019-03-01 10:26:52 +01:00
FinnStutzenstein
384597afb9 motion projection mode is optional and sensitive for the config 2019-03-01 10:08:57 +01:00
Emanuel Schütze
4de14f4100 Updated translations 2019-02-28 22:46:38 +01:00
Emanuel Schütze
2257991aba Projector detail template improvements 2019-02-28 22:15:07 +01:00
Sean Engelhardt
587a0fe443 Clean projector detail interface 
Alters the projector detail interface to provide better usability.
Alters the dragging slightly to have a nice preview and smoother
transitions.
 2019-02-28 22:14:33 +01:00
Maximilian Krambach
4e3948a24d fix unsetting some values 
- Category prefix
- category in motion multiSelect
 2019-02-28 19:06:32 +01:00
Emanuel Schütze
0c1abe561b
Merge pull request #4433 from tsiegleauq/speaker-repo 
Speaker repo
 2019-02-28 16:21:14 +01:00
Emanuel Schütze
8c68e93596
Merge pull request #4434 from MaximilianKrambach/stopProopagation 
fix click events in user + mediafile views
 2019-02-28 16:18:10 +01:00
Maximilian Krambach
feca9e4a18 fix click events in user + mediafile views 
stopped propagation on soome buttons and menus
 2019-02-28 16:05:28 +01:00
Emanuel Schütze
51026286cb
Merge pull request #4429 from FinnStutzenstein/clearRepositories 
clear repositories and extra DS clear on logout
 2019-02-28 15:59:12 +01:00
Emanuel Schütze
24008da0df
Merge pull request #4430 from FinnStutzenstein/fixSlideMargin 
Fix slide container margin
 2019-02-28 15:36:11 +01:00
FinnStutzenstein
7dee5acc7e Fix slide container margin 2019-02-28 15:23:43 +01:00
Sean Engelhardt
03c590c66d Speaker repo 
Add an own repository service to manage speakers
 2019-02-28 14:26:31 +01:00
Maximilian Krambach
036ce4f02c permission for admins to reset passwords 2019-02-28 11:29:58 +01:00
FinnStutzenstein
3432c66d4d clear repositories and extra DS clear on logout 2019-02-28 11:04:19 +01:00