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

6561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sean
de3681454f
Merge pull request #4533 from tsiegleauq/speaker-item-sorting 
Add manual sorting to Speaker list
 2019-03-25 15:28:50 +01:00
Sean
527c31f9aa
Merge pull request #4536 from GabrielInTheWorld/fix-hammer 
Includes `hammerjs`.
 2019-03-25 15:28:14 +01:00
GabrielMeyer
cd2907381b Includes hammerjs. 2019-03-25 14:41:47 +01:00
Sean Engelhardt
c0a2072cc2 Add manual sorting to Speaker list 
Also create CSS Theme file to prevent side effects from theming
 2019-03-25 13:34:10 +01:00
Sean
279b8b1d25
Merge pull request #4524 from GabrielInTheWorld/util-fixes 
Adds listener to the pagination
 2019-03-25 10:09:01 +01:00
Sean
dbe26df610
Merge pull request #4511 from tsiegleauq/clean-the-repocleanup 
Cleanup the repo-cleanup
 2019-03-25 10:05:24 +01:00
Sean Engelhardt
3cd58aa6c5 Cleanup the repo-cleanup 
Adds a "patch" function to allow more modles to send patches with minimal data
rather than just the whole model.

Re-Adds the throwing of some errors to prevent developers from calling
methods that should not be called
 2019-03-25 09:45:12 +01:00
Emanuel Schütze
0532a23219
Merge pull request #4530 from emanuelschuetze/translation-20190322 
Updated translations
 2019-03-22 17:05:56 +01:00
Emanuel Schütze
fdfb3b9088 Updated translations 2019-03-22 16:13:33 +01:00
Emanuel Schütze
16159fb60d
Merge pull request #4529 from emanuelschuetze/fixCSS 
Fixed CSS styling error
 2019-03-22 16:06:32 +01:00
Emanuel Schütze
0cc59c6596 Fixed CSS styling error 2019-03-22 15:47:22 +01:00
Emanuel Schütze
faa0a6077e
Merge pull request #4527 from tsiegleauq/list-of-speakers-template 
Add prettier list of speakers
 2019-03-22 15:30:22 +01:00
Sean Engelhardt
ab19d66022 Add prettier list of speakers 
Also cleans up some CSS and unifies some Drag-N-Drop Component
styles.
 2019-03-22 13:25:03 +01:00
GabrielMeyer
6e628ea4cd Adds listener to the pagination 
- Subscription to change events from pagination are used to set the made settings initial.
 2019-03-22 13:05:03 +01:00
Emanuel Schütze
5c0be51c7e
Merge pull request #4525 from GabrielInTheWorld/correct-rendering-text 
Sanitizing the inner html text.
 2019-03-22 11:52:26 +01:00
GabrielMeyer
fca92ef9e2 Sanitizing the inner html text. 2019-03-21 17:39:57 +01:00
Emanuel Schütze
0527b814bc
Merge pull request #4522 from emanuelschuetze/improvements 
Minor layout improvements
 2019-03-21 15:38:50 +01:00
Emanuel Schütze
b9a3308b60
Merge pull request #4523 from tsiegleauq/motion-amendment-fixes 
Add motion to motion change observation
 2019-03-21 15:38:31 +01:00
Sean Engelhardt
b472a3851b Add motion to motion change observation 
Also fixes an some navigation for motion and amendments
 2019-03-21 11:31:02 +01:00
Emanuel Schütze
e54d0cf087 Minor layout improvements 
- Improved motion block slide layout
- Increase width of statute paragraph title form field
- hide identifier in motion form for unprivileged users/submitters
 2019-03-20 22:00:35 +01:00
Emanuel Schütze
63a2c6b05b
Merge pull request #4520 from tsiegleauq/websocket-fixes 
Fix websocket connection for port 80
 2019-03-20 15:08:01 +01:00
Sean Engelhardt
56289af867 Fix websocket connection for port 80 
port 80 was interpretet as <IP>:/ws before.
Certain browser did not like the colon...
 2019-03-20 14:44:35 +01:00
Emanuel Schütze
fbbd5fa135
Merge pull request #4516 from normanjaeckel/FixCommands 
Fixed commands.
 2019-03-20 13:19:09 +01:00
Emanuel Schütze
68175b8cb7
Merge pull request #4519 from tsiegleauq/list-z-levels 
Fix some z-level related issues
 2019-03-20 13:13:15 +01:00
Emanuel Schütze
a3ed1ae00c
Merge pull request #4518 from normanjaeckel/NewPermInternalMotions 
Added new permission to see motions in internal state (so called auth…
 2019-03-20 13:03:48 +01:00
Sean
460c99e683
Merge pull request #4515 from emanuelschuetze/fixStatuteAmendment 
Fixed statute amendment detection in motion form
 2019-03-20 12:56:12 +01:00
Norman Jäckel
16cde2cd96 Added new permission to see motions in internal state (so called authorized users). 2019-03-20 12:47:26 +01:00
Sean Engelhardt
ca18d59ac3 Fix some z-level related issues 
Fixes some z-layer effects
 2019-03-20 12:45:34 +01:00
Norman Jäckel
35198f6e64 Fixed commands. 2019-03-20 08:50:57 +01:00
Norman Jäckel
94080df663
Merge pull request #4517 from emanuelschuetze/fixComments 
Fixed permission check for manage comments
 2019-03-20 08:47:11 +01:00
Emanuel Schütze
a20803401f Fixed permission check for manage comments 2019-03-19 21:26:28 +01:00
Emanuel Schütze
d62f1538ab
Merge pull request #4489 from GabrielInTheWorld/tree-sort-agenda 
Replaces the DragDrop-Tree
 2019-03-19 19:46:03 +01:00
Sean
5fbf682754
Merge pull request #4472 from tsiegleauq/countdown-control-component 
Add Countdowns in projector detail
 2019-03-19 17:52:08 +01:00
Sean Engelhardt
183d2738e0 Add Countdowns in projector detail 
Adds Pretty countdown controls, detetion and edit in
Projector template.

Countdown list was removed
 2019-03-19 17:20:38 +01:00
Emanuel Schütze
dfab9730dc Fixed statute amendment detection in motion form 2019-03-19 16:49:45 +01:00
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
Emanuel Schütze
5d045a894a
Merge pull request #4514 from CatoTH/amendmentsInViewMotion 
Add amendments as dependencies in ViewMotion [2]
 2019-03-17 22:04:22 +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
Emanuel Schütze
5482157536
Merge pull request #4510 from CatoTH/OS3-Line-Highlighting-Bugfixes 
Bugfixes: Highlighting wo CRs, better scrolling
 2019-03-16 20:39:39 +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
Sean
398ffc30ea
Merge pull request #4411 from MaximilianKrambach/sort_alternative 
fix sort performance issues for dropdowns
 2019-03-15 09:58:32 +01:00
Maximilian Krambach
9c67b1c773 sorting from inside base repositories 
Authors: FinnStutzenstein, MaximilianKrambach, tsiegleauq
 2019-03-15 08:12:50 +01:00
Emanuel Schütze
ccc81df434
Merge pull request #4509 from tsiegleauq/more-user-permission-fixes 
Fix certain permission checks
 2019-03-14 18:22:29 +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
09ddc83d30
Merge pull request #4508 from tsiegleauq/cleanup-motion-detail-ds-repos 
Cleanup Repos
 2019-03-14 11:40:56 +01:00