Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 652
TitelLL-1221 integration of rebrush phase one
BeschreibungBranch läuft auf LL-1132, da die Arbeiten schon älter sind als das Integrations-Ticket LL-1221. Bitte wenn der MR i.O. ist Ticket LL-1221 in Jira schließen, nicht LL-1132.
Statusmerged
Created at 2022-08-11T16:23:44.653Z
Updated at 2022-08-12T12:24:03.450Z
Source branchfeature/LL-1132--rebrush-phase-one
Target branchdevelop
AuthorSascha Immig
AssigneeGregor Gabriel

Discussion notes

added 1 commit
  • 9ed776e7 - corrected the test.
Compare with previous version		 Sascha Immig 2022-08-11T18:57:23.292Z
added 1 commit
  • 74ce5f89 - optimized shadows
Compare with previous version		 Sascha Immig 2022-08-11T20:24:40.827Z
added 1 commit
  • 05b180e5 - fixed controller and optimized test
Compare with previous version		 Sascha Immig 2022-08-12T06:48:00.184Z
changed title from **{-Feature/ll 1132 -} rebrush phase one** to **{+LL-1221 integration of+} rebrush phase one** Sascha Immig 2022-08-12T09:10:21.699Z
changed the description Sascha Immig 2022-08-12T09:10:21.745Z
added 58 commits
  • 05b180e5...c64815ec - 57 commits from branch develop
  • d35e8c25 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version		 Gregor Gabriel 2022-08-12T09:16:55.876Z
added 1 commit
  • a6c38c69 - removed utf8 Bom
Compare with previous version		 Gregor Gabriel 2022-08-12T09:32:52.613Z
added 1 commit
  • 3d68ee84 - added missing css class
Compare with previous version		 Gregor Gabriel 2022-08-12T10:27:26.679Z
added 1 commit
  • 832328d1 - added layout for password reset
Compare with previous version		 Sascha Immig 2022-08-12T10:29:40.315Z
added 1 commit
  • 84a0b249 - second part of layout reset
Compare with previous version		 Sascha Immig 2022-08-12T10:52:49.904Z
added 1 commit
  • 4a9d66e9 - fixed header in training details (backend).
Compare with previous version		 Sascha Immig 2022-08-12T12:09:41.524Z
merged Gregor Gabriel 2022-08-12T12:24:03.542Z
mentioned in commit 3a7390128475f32bb9d7197190fab89d455365db Gregor Gabriel 2022-08-12T12:24:03.819Z

Merge Commits

Title Id Author Created at Message
use local fork of charts package to get the pipeline running 04801d654891b2a410795d29db0c0b80a893c6d2 TUV\immigs 2022-08-11T16:11:11.000Z use local fork of charts package to get the pipeline running
fixed controller and optimized test 05b180e573a5aed71cb0bd0f7d282028beb5c989 TUV\immigs 2022-08-12T06:47:50.000Z fixed controller and optimized test
fixed errors 0da84fdbf4b7e6c4e901ae9cc5cfdeecc0cebb94 TUV\immigs 2022-08-11T07:33:38.000Z fixed errors
finalized consolidation of forms: 3308f9f3dfb4491f531080b33a8d6393194e4b3d TUV\immigs 2022-08-11T06:38:14.000Z finalized consolidation of forms: - changed IDs für registration inputs - altered controller - changed called form for route /register - removed old blade
added missing css class 3d68ee84d3f22fa260221bc20b29776f2b4b17d0 TUV\gabrielg 2022-08-12T10:27:01.000Z added missing css class
fixed header in training details (backend). 4a9d66e9eab92a512c18b84f19502f1577b7358a TUV\immigs 2022-08-12T12:09:27.000Z fixed header in training details (backend).
optimized shadows 74ce5f8907d883f4d760ae78397ce7c141865f4a TUV\immigs 2022-08-11T20:24:29.000Z optimized shadows
added new shaword to cards and removed default border. 7aa8365f48f18e6df2c4a003543d96b983bf6033 TUV\immigs 2022-08-11T15:51:41.000Z added new shaword to cards and removed default border.
added new .linked-card which can contain a .card-hover-panel that is shown on mouse over. 7ca00cb1abb100059ca8a17e8483ca8921e42c73 TUV\immigs 2022-08-11T15:25:54.000Z added new .linked-card which can contain a .card-hover-panel that is shown on mouse over. info: linked cards make use of the class .ctretched-link on the card-header so make the whole card clickable. linked-card will replace clickable-card.
added layout for password reset 832328d1a090f35dcae42958b9bfada615aa4f73 TUV\immigs 2022-08-12T10:29:27.000Z added layout for password reset
second part of layout reset 84a0b24928b053f3c0047cdf20c5bb4c2cc8d538 TUV\immigs 2022-08-12T10:51:03.000Z second part of layout reset
optimized sizing. 88ee5d1f428fc0d199fd4e6b0b1202b423268b61 TUV\immigs 2022-08-10T09:54:34.000Z optimized sizing.
corrected the test. 9ed776e741f3a01ef2b9975bb8044d58e9931c7c TUV\immigs 2022-08-11T18:56:56.000Z corrected the test.
moved confirmation alert to the top of the page and fixed label for mail 9efe5d46c13d4a38ffe5b8c15561ce6046c8cdb7 TUV\immigs 2022-08-10T13:53:36.000Z moved confirmation alert to the top of the page and fixed label for mail
removed utf8 Bom a6c38c698e6ca1faa41a4d34d5e3fd67caa2ae7c TUV\gabrielg 2022-08-12T09:32:46.000Z removed utf8 Bom
fixed passwordField: is the id was changed, der labels were no longe connected to the inputs aade044d128f7070e7225582f2358c4ff898c576 TUV\immigs 2022-08-10T13:52:42.000Z fixed passwordField: is the id was changed, der labels were no longe connected to the inputs
corrections for backend adbd8d9896adf96bf4ee8462d5f986194183ff9b TUV\immigs 2022-07-28T13:32:32.000Z corrections for backend
optimized spaceing of card-body cdd5cf6105dddee9e4fe4c0396650ad9ec5db238 TUV\immigs 2022-08-11T15:22:14.000Z optimized spaceing of card-body
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… d35e8c25d9a64ccc215618be369f356e0c3862f7 TUV\gabrielg 2022-08-12T09:16:48.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1132--rebrush-phase-one # Conflicts: # resources/lang/de.json
removed old styles for login and register and moved new styles to _auth.scss. feed6bdaeb92eb4497702b62795a5d27d94d3b08 TUV\immigs 2022-08-10T09:41:01.000Z removed old styles for login and register and moved new styles to _auth.scss. Splitted keynote style into separae stypes for keynote and checkmarks. This allows to reuse the checkmarks.