Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 408
TitelTreeview
BeschreibungDieser Merge Request zeigt alle Abteilungen in einer Treeview an. Abteilungen können über das Kontextmenu bearbeitet, angelegt und gelöscht werden. ![image](/uploads/a41b234c5344468883f830191c37f96c/image.png)
Statusmerged
Created at 2021-04-15T19:09:30.813Z
Updated at 2021-04-26T15:01:49.686Z
Source branchfeature/treeview
Target branchdevelop
AuthorMarcel Pociot
AssigneeGregor Gabriel

Discussion notes

added 1 commit
  • 341d05ff - Codestyle
Compare with previous version
Marcel Pociot 2021-04-15T20:58:38.696Z
added 2 commits
  • b8ef2f1a - CS Fixer
  • 8e37c541 - Re-sorted land and added translations from LL-626
Compare with previous version
Sascha Immig 2021-04-16T07:32:23.337Z
added 2 commits
  • bbb76596 - removed doubled translation and refreshed messages
  • 356c0c01 - code cosmetics and label correction
Compare with previous version
Sascha Immig 2021-04-16T12:44:59.203Z
added 2 commits
  • a34e8d7e - more text changes
  • 7cfc80a3 - updated jsTree version and changed styles
Compare with previous version
Sascha Immig 2021-04-19T14:36:28.593Z
added 2 commits
  • b1202f51 - added search field and optimized addition of new nodes
  • 8bdae417 - Fixed bug: lineheight was wrong on input while renaming node
Compare with previous version
Sascha Immig 2021-04-20T14:01:48.599Z
added 1 commit
  • 29d89498 - added limitation of tree in sub units
Compare with previous version
Sascha Immig 2021-04-21T07:36:12.835Z
added 114 commits
  • 29d89498...0a9e1420 - 113 commits from branch develop
  • b381d33a - Merge branch 'develop' into feature/treeview
Compare with previous version
Sascha Immig 2021-04-23T11:19:51.798Z
assigned to @gabrielg Sascha Immig 2021-04-26T11:48:09.860Z
added 1 commit
  • e9df2644 - activated sorting and prevented dragging to same parent
Compare with previous version
Sascha Immig 2021-04-26T12:13:12.230Z
added 1 commit
  • 241195b9 - fixed adding nodes to units in views with parent;
Compare with previous version
Sascha Immig 2021-04-26T13:45:01.515Z
added 1 commit
  • 048411ec - fixed rout method and other things
Compare with previous version
Gregor Gabriel 2021-04-26T14:51:27.017Z
merged Gregor Gabriel 2021-04-26T15:01:49.742Z
mentioned in commit 6124ba3020f4b2be6a4fe43e21b8f6ff92205396 Gregor Gabriel 2021-04-26T15:01:50.293Z

Merge Commits

Title Id Author Created at Message
fixed rout method and other things 048411ec987aeb720987db90297b6bbadc4bffa2 TUV\gabrielg 2021-04-26T14:51:22.000Z fixed rout method and other things
fixed adding nodes to units in views with parent; 241195b93fea039652cfe68d7405316a41f5cf94 TUV\immigs 2021-04-26T13:44:17.000Z fixed adding nodes to units in views with parent;
added limitation of tree in sub units 29d89498da136f25b968a5ff4ec6102ddbd3771a TUV\immigs 2021-04-21T07:35:56.000Z added limitation of tree in sub units
Codestyle 341d05ff07667ad837cc4e260ffccd315ee0f524 Marcel Pociot 2021-04-15T20:58:29.000Z Codestyle
code cosmetics and label correction 356c0c015635a16137be6f52cd844e9179adf877 TUV\immigs 2021-04-16T12:44:45.000Z code cosmetics and label correction
updated jsTree version and changed styles 7cfc80a32ed527133dfc581975b5c92793a3b91e TUV\immigs 2021-04-19T14:36:13.000Z updated jsTree version and changed styles
wip 8ac0e4fcaf2d557fbb0e08832cf65836648a6bc5 Marcel Pociot 2021-03-29T11:04:33.000Z wip
Fixed bug: lineheight was wrong on input while renaming node 8bdae417b80ab8f2992ebd54072cf5e30269100f TUV\immigs 2021-04-20T14:01:33.000Z Fixed bug: lineheight was wrong on input while renaming node
Re-sorted land and added translations from LL-626 8e37c541317019e8a4c68c3d381d8a24edf5afc1 TUV\immigs 2021-04-16T07:31:59.000Z Re-sorted land and added translations from LL-626
more text changes a34e8d7ece010dab3d17239b984be02e427b8361 TUV\immigs 2021-04-16T14:06:45.000Z more text changes
added search field and optimized addition of new nodes b1202f5104435e28e3ec389bd052853a7d48dd38 TUV\immigs 2021-04-20T14:00:33.000Z added search field and optimized addition of new nodes
Merge branch 'develop' into feature/treeview b381d33a2c3a4e7356f0fc5cc13b24a88036636e TUV\immigs 2021-04-23T11:19:21.000Z Merge branch 'develop' into feature/treeview # Conflicts: # resources/js/messages.js
CS Fixer b8ef2f1a5eba8972668abc57f4b8356fc37c10a0 TUV\immigs 2021-04-16T07:19:00.000Z CS Fixer
removed doubled translation and refreshed messages bbb76596932473c7f888395332851fff7fa543f5 TUV\immigs 2021-04-16T12:11:29.000Z removed doubled translation and refreshed messages
Add treeview bdb36d481085dd717d78e08fc910ce125ae38019 Marcel Pociot 2021-04-15T19:07:27.000Z Add treeview
Merge branch 'develop' into treeview cbdaaf5598a445f735a326853d91c12081aee046 Marcel Pociot 2021-04-15T13:50:11.000Z Merge branch 'develop' into treeview
activated sorting and prevented dragging to same parent e9df2644f531761a5376ab7ff8b3d266dece5631 TUV\immigs 2021-04-26T12:08:12.000Z activated sorting and prevented dragging to same parent