Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 279
TitelFeature/ll 559 fix certificate access
Beschreibung
Statusmerged
Created at 2020-10-08T09:41:39.336Z
Updated at 2020-10-12T10:52:57.011Z
Source branchfeature/LL-559-fix-certificate-access
Target branchdevelop
AuthorGregor Gabriel
AssigneeSascha Immig

Discussion notes

added 1 commit
  • 124a5dbc - added fixes for LL-615
Compare with previous version
Gregor Gabriel 2020-10-08T11:06:16.131Z
Bitte engloischen Text mit übersetzen. Wird "latest certificates" noch anderweitig genutzt, bitte eigenen Eintrag anlegen Sascha Immig 2020-10-08T19:27:42.248Z
aktuell steht der Titel doppelt drin... (einmal title und einmal display_title) Sascha Immig 2020-10-08T19:33:56.301Z
changed this line in version 3 of the diff Gregor Gabriel 2020-10-09T06:00:29.765Z
added 1 commit
  • 0ec60089 - renamed translation key "Latest certificates" to "Last completed training"
Compare with previous version
Gregor Gabriel 2020-10-09T06:00:30.148Z
added 1 commit
  • 9a7536b2 - + if user calls catalog detail site for training, booking button is only…
Compare with previous version
Gregor Gabriel 2020-10-09T07:24:46.132Z
wie besprochen: nur Link auf "Meine Trainings" Sascha Immig 2020-10-09T09:15:45.956Z
"col-md-1" durch "col-auto" ersetzen sollte das Problem der unterlaufens beheben. Sascha Immig 2020-10-09T09:16:42.675Z
wie besprochen: wir verlinken immer das eigene Training (meine Trainings) und lassen den Link weg, wenn das Training "abgelaufen" ist. Sascha Immig 2020-10-09T09:18:46.065Z
added 1 commit
  • ebfafbc2 - + added computed attribute active to model TrainingAssignment
Compare with previous version
Gregor Gabriel 2020-10-09T09:43:48.422Z
Dopplung ist jetzt raus Gregor Gabriel 2020-10-09T09:45:16.598Z
falsche Codestelle Gregor Gabriel 2020-10-09T09:53:06.191Z
wird gemacht Gregor Gabriel 2020-10-09T09:55:02.822Z
resolved all discussions Gregor Gabriel 2020-10-09T09:55:03.710Z
changed this line in version 6 of the diff Gregor Gabriel 2020-10-09T09:57:51.682Z
resolved all discussions Gregor Gabriel 2020-10-09T09:57:51.781Z
added 1 commit
  • f31b3464 - fixed problematic overflow
Compare with previous version
Gregor Gabriel 2020-10-09T09:57:51.960Z
resolved all discussions Gregor Gabriel 2020-10-09T10:33:31.698Z
added 26 commits
  • f31b3464...a61ea42a - 25 commits from branch develop
  • 1251a24f - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version
Gregor Gabriel 2020-10-09T10:33:31.870Z
merged Sascha Immig 2020-10-12T10:52:57.094Z
mentioned in commit 17caa1256a79377a0ad765a259af63adc4e635ed Sascha Immig 2020-10-12T10:52:57.405Z

Merge Commits

Title Id Author Created at Message
+ made sure links are proper 0e3e6892cfbcba7bfaae0a430bfc54bafbf5bb8a TUV\gabrielg 2020-10-07T15:32:21.000Z + made sure links are proper + hide action column on no subscription
+ changed test from "Zuletzt erreichte Bescheinigungen" to "Zuletzt abgeschlossene Unterweisungen" 0e638789df6903a9a3656ff2fddeb9667de567c3 TUV\gabrielg 2020-10-08T09:39:29.000Z + changed test from "Zuletzt erreichte Bescheinigungen" to "Zuletzt abgeschlossene Unterweisungen"
renamed translation key "Latest certificates" to "Last completed training" 0ec60089b7a2081a0ceda0c5e9e980f1cdd71a61 TUV\gabrielg 2020-10-09T06:00:13.000Z renamed translation key "Latest certificates" to "Last completed training"
added fixes for LL-615 124a5dbc0da37f322a29c4153b631bd4d80c197b TUV\gabrielg 2020-10-08T11:05:59.000Z added fixes for LL-615
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 1251a24fb9f94ac5fefaae6cac8b63ad1c935694 TUV\gabrielg 2020-10-09T10:33:13.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-559-fix-certificate-access # Conflicts: # resources/views/trainings/includes/quickbuttons.blade.php
+ if user calls catalog detail site for training, booking button is only… 9a7536b2827e14231ae28db9973e79776e2066c0 TUV\gabrielg 2020-10-09T07:24:29.000Z + if user calls catalog detail site for training, booking button is only presented if user has privileges to book
+ added computed attribute active to model TrainingAssignment ebfafbc29fce30f141581e6e30f36ca6404343b4 TUV\gabrielg 2020-10-09T09:43:30.000Z + added computed attribute active to model TrainingAssignment + restrict link to training in certified trainings list to active training assignments
fixed problematic overflow f31b34640c23e1fbdae063fed93f5fe758cb003a TUV\gabrielg 2020-10-09T09:57:42.000Z fixed problematic overflow