Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 141
TitelFeature/ll 155 reorganize js resources
Beschreibung
Statusmerged
Created at 2019-12-18T16:24:15.684Z
Updated at 2020-02-06T10:33:35.870Z
Source branchfeature/LL-155--reorganize-js-resources
Target branchdevelop
AuthorZoltan Schnepf
AssigneeSascha Immig

Discussion notes

added 1 commit
  • 7e819257 - added comments to code.
Compare with previous version		 Sascha Immig 2020-01-07T14:38:38.370Z
added 1 commit
  • c0cc0640 - WIP: moved vue components from bootstrap.js to app.js
Compare with previous version		 Sascha Immig 2020-01-13T09:34:41.731Z
marked as a **Work In Progress** from c0cc06409a8bcc2fa596173866e8054d8745c85b Sascha Immig 2020-01-13T09:34:41.939Z
added 2 commits
  • 645506d1 - removed "trainingBackwardsLink from frontend;
  • fe090cb8 - resorted Code
Compare with previous version		 Sascha Immig 2020-01-13T12:50:29.834Z
added 1 commit
  • 78a513e7 - moved plyfill, axios and csrf token from bootstrap to app.js. did the same for…
Compare with previous version		 Sascha Immig 2020-01-13T13:03:28.792Z
added 44 commits
  • 78a513e7...1b6b0463 - 43 commits from branch develop
  • ef7f44c7 - Merge branch 'develop' into feature/LL-155--reorganize-js-resources
Compare with previous version		 Sascha Immig 2020-01-14T12:18:27.853Z
added 2 commits
  • 750c2803 - code cosmetics
  • 0edc441a - WIP: aligned the codestructure of both bootstrap.js with each other. Added csrf token to backend
Compare with previous version		 Sascha Immig 2020-01-16T10:53:48.274Z
added 1 commit
  • 305a94df - WIP: removed admin folder for js
Compare with previous version		 Sascha Immig 2020-01-16T14:36:16.010Z
added 1 commit
  • 34392aa7 - fixed login
Compare with previous version		 Sascha Immig 2020-01-16T15:16:13.383Z
added 1 commit
  • 55a50704 - fixed token error (backend) and aligned head sections with each other (fontend/backend)
Compare with previous version		 Sascha Immig 2020-01-20T08:16:16.526Z
added 18 commits
  • 55a50704...fef31cbc - 17 commits from branch develop
  • 688717ad - Merge branch 'develop' into 'feature/LL-155--reorganize-js-resources'
Compare with previous version		 Sascha Immig 2020-02-06T10:02:57.937Z
unmarked as a **Work In Progress** Sascha Immig 2020-02-06T10:03:16.360Z
added 1 commit
  • 4ee3fd90 - exchanged require for import on bootstrap.js and custom.js
Compare with previous version		 Sascha Immig 2020-02-06T10:20:29.845Z
enabled an automatic merge when the pipeline for 4ee3fd902bda04bf0c23aefde1c293468d00535a succeeds Sascha Immig 2020-02-06T10:20:36.642Z
mentioned in commit 5b099813bd3ecce7a7a0f3ef62906d4686953e48 Sascha Immig 2020-02-06T10:33:35.069Z
merged Sascha Immig 2020-02-06T10:33:35.937Z

Merge Commits

Title Id Author Created at Message
WIP: aligned the codestructure of both bootstrap.js with each other. Added csrf token to backend 0edc441ac8ea1a134aec2f93d34040cb2ccd242a TUV\immigs 2020-01-16T10:31:33.000Z WIP: aligned the codestructure of both bootstrap.js with each other. Added csrf token to backend
WIP: removed admin folder for js 305a94df41b1392a3244f1aa6a5b85cf6b1bfa8e TUV\immigs 2020-01-16T14:32:41.000Z WIP: removed admin folder for js
fixed login 34392aa72b7c27b37336506b617bf8abaedd90c6 TUV\immigs 2020-01-16T15:15:53.000Z fixed login
exchanged require for import on bootstrap.js and custom.js 4ee3fd902bda04bf0c23aefde1c293468d00535a TUV\immigs 2020-02-06T10:18:56.000Z exchanged require for import on bootstrap.js and custom.js
fixed token error (backend) and aligned head sections with each other (fontend/backend) 55a50704f4b3ab2557db3002d875c14b223da465 TUV\immigs 2020-01-20T08:15:50.000Z fixed token error (backend) and aligned head sections with each other (fontend/backend)
removed "trainingBackwardsLink from frontend; 645506d12056559e4c8f7cb9856555c60ba33a33 TUV\immigs 2020-01-13T12:49:33.000Z removed "trainingBackwardsLink from frontend; removed unused vue componentes from frontend;
Merge branch 'develop' into 'feature/LL-155--reorganize-js-resources' 688717ad0cd3e5732ca3bd2357143ff5fc68d756 Sascha Immig 2020-02-06T10:02:54.000Z Merge branch 'develop' into 'feature/LL-155--reorganize-js-resources' # Conflicts: # resources/sass/_variables.scss
code cosmetics 750c2803aa57e9e912a12b175558645bdaf2ea4b TUV\immigs 2020-01-16T09:58:59.000Z code cosmetics
moved plyfill, axios and csrf token from bootstrap to app.js. did the same for… 78a513e7341a81a2f7a9dc863d3b70584d54982a TUV\immigs 2020-01-13T13:03:15.000Z moved plyfill, axios and csrf token from bootstrap to app.js. did the same for the backend scripts; added comments and resorting to backend scripts
added comments to code. 7e8192571fe5ad5572bb0ab081d19df7731663cc TUV\immigs 2020-01-07T14:38:21.000Z added comments to code.
WIP a1dff74bbf0c7a9195fe8a12a4f7d15e6ea987e4 TUV\immigs 2019-12-09T14:11:44.000Z WIP
moved creditPointCheckout and trainings progress a517e9b66375027fc9c9d912e98299e44bb1434e TUV\immigs 2019-12-09T14:49:04.000Z moved creditPointCheckout and trainings progress
WIP: moved vue components from bootstrap.js to app.js c0cc06409a8bcc2fa596173866e8054d8745c85b TUV\immigs 2020-01-13T09:33:10.000Z WIP: moved vue components from bootstrap.js to app.js
Merge branch 'develop' into feature/LL-155--reorganize-js-resources d4a93fe87420717291efbc9daa7ed37f4fd6efed zschnepf 2019-12-18T15:29:57.000Z Merge branch 'develop' into feature/LL-155--reorganize-js-resources
Merge branch 'develop' into feature/LL-155--reorganize-js-resources ef7f44c75e39f402ef348b8f9acbd8f0b2e8f98d TUV\immigs 2020-01-14T12:18:12.000Z Merge branch 'develop' into feature/LL-155--reorganize-js-resources
resorted Code fe090cb8320dd843a59a421bf7cc1c591e322b8e TUV\immigs 2020-01-13T12:50:17.000Z resorted Code