Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 308
TitelLL-648 overwork reminders
Beschreibung
Statusmerged
Created at 2020-11-17T09:19:29.001Z
Updated at 2020-11-17T10:50:52.763Z
Source branchfeature/LL-648-overwork-reminders
Target branchdevelop
AuthorSascha Immig
AssigneeSascha Immig

Discussion notes

added 149 commits
  • 318ee290...b7194bd6 - 147 commits from branch develop
  • 9dbcac99 - Merge branch 'develop' into feature/LL-648-overwork-reminders
  • 6218bdd5 - fixed scrolling
Compare with previous version
Sascha Immig 2020-11-17T10:39:47.302Z
enabled an automatic merge when the pipeline for 6218bdd5ee14634ef4da7cb559ab98541d476749 succeeds Sascha Immig 2020-11-17T10:40:55.578Z
merged Sascha Immig 2020-11-17T10:50:52.900Z
mentioned in commit 9dfee8b067dcfa3dec072d8e938397af9c95b8cd Sascha Immig 2020-11-17T10:50:53.047Z

Merge Commits

Title Id Author Created at Message
when selectin a reminder template subject is taken from template as well 0b45f33f925e92b670516ee374d6d4e6d8e7e0d5 TUV\gabrielg 2020-11-10T09:51:46.000Z when selectin a reminder template subject is taken from template as well
Overview with Sascha 0fdf91cb7adaeb381206f4e01859a8ddbc0cd9f8 TUV\gabrielg 2020-11-09T13:41:17.000Z Overview with Sascha
fixed vue problem in show reminder template view 13c273ae0e32f50c66b21fff3ea04d33b7bf6267 TUV\gabrielg 2020-11-09T15:35:55.000Z fixed vue problem in show reminder template view
added enhanced help for placeholders 181ceae19f3c630f9ba5470bf7ae20902bbc4181 TUV\immigs 2020-11-16T22:41:15.000Z added enhanced help for placeholders
run php-cs-fixer 245db2aa5597a4591244b4f85662ec858c1bd4c6 TUV\gabrielg 2020-11-10T12:03:25.000Z run php-cs-fixer
Merge branch 'feature/LL-648-overwork-reminders' of… 30cb9feb2cd60401b3367ec655cf0b57550a16b3 TUV\gabrielg 2020-11-17T08:01:08.000Z Merge branch 'feature/LL-648-overwork-reminders' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-648-overwork-reminders
tweaked column 318ee29021d223bf1a2a7fe0dc4131b84306e31d TUV\immigs 2020-11-17T08:09:57.000Z tweaked column
+ trigger form field now has a label fitting to type 32e4f396b6b8cd1880f7afeaa16b934c2241a2a2 TUV\gabrielg 2020-11-16T16:58:20.000Z + trigger form field now has a label fitting to type + values of diffent types are stored separately and are restored when switch back to that type + adding a new reminder scrolls down to page end
give templating access to $assignments 34ba4e1fc38617059106fc36ea1ae0f9c7d9ad22 TUV\gabrielg 2020-10-30T11:10:34.000Z give templating access to $assignments
+ modified class that is responsibe for rendering trainings in training… 3f59ecfd5d4c46b843ff3be25cc6ac161c0a834b TUV\gabrielg 2020-11-10T08:29:51.000Z + modified class that is responsibe for rendering trainings in training reminder, so that .first and .last can be used at the beginning .all is used implicitely and all available attributes are sbake case now + added __toString Method for implicite rendering
optimized translations 406153ddb5a339711bd3514ac9e49e9d62755eb2 TUV\immigs 2020-11-16T15:45:15.000Z optimized translations
fixed time zone problem 48512a14da2f8d1aa05a702e8e5128fde0699889 TUV\gabrielg 2020-11-17T08:00:04.000Z fixed time zone problem
Merge branch 'feature/LL-648-overwork-reminders' of… 5c0d779108bf5ad5fbddc4382d2c7a9b5516e9a2 TUV\gabrielg 2020-11-16T16:59:25.000Z Merge branch 'feature/LL-648-overwork-reminders' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-648-overwork-reminders
fixed scrolling 6218bdd5ee14634ef4da7cb559ab98541d476749 TUV\immigs 2020-11-17T10:39:32.000Z fixed scrolling
Added parameters 6613c24d5d6cce6ccba65781a2dcff55a1832b7f TUV\gabrielg 2020-10-30T17:04:09.000Z Added parameters {{ trainings.first }} {{ trainings.last }} {{ trainings.all }} {{ trainings.withDueDate.first }} {{ trainings.withDueDate.last }} {{ trainings.withDueDate.all }} ... {{ trainings.withDueDate.withDaysLeft.withLinkButton.first }} {{ trainings.withDueDate.withDaysLeft.withLinkButton.last }} {{ trainings.withDueDate.withDaysLeft.withLinkButton.all }}
Merge branch 'feature/LL-648-overwork-reminders' of… 67eb5b5a1a8246749e9483f3584d2c595fc36d9c TUV\immigs 2020-11-16T22:43:38.000Z Merge branch 'feature/LL-648-overwork-reminders' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-648-overwork-reminders
corrected translation 8d1009d2950c7d1a246076ccc5503752727aa8ff TUV\immigs 2020-11-16T14:47:08.000Z corrected translation
Merge branch 'develop' into feature/LL-648-overwork-reminders 9dbcac99399d01e94bba415ffd69cb04ccb2a1a6 TUV\immigs 2020-11-17T09:33:57.000Z Merge branch 'develop' into feature/LL-648-overwork-reminders # Conflicts: # app/Models/TrainingReminder.php # resources/lang/de.json
added period at the ent c361dff40b633806a81a411e451a9d9e1b267b9b TUV\immigs 2020-11-16T14:49:36.000Z added period at the ent
added attribute url to training f19a4b4a027083f848018a2272f0aa0f508e9185 TUV\gabrielg 2020-11-10T07:48:33.000Z added attribute url to training