Skip to content
Snippets Groups Projects
Select Git revision
  • master default
1 result
You can move around the graph by using the arrow keys.
Created with Raphaël 2.2.010Mar98321Mar28Feb5AugMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopmastermasterendret i glances.confMerge conflict error handlingRevisionsFixed merge conflictAdded end point with test for editUser methodsSettings.jsCalctest.javaCalc.java ble endret Throw illegal tingenMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopEdit database.java and setting.jsMergingA few changessetting.js editMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopsetting.jsMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopAdded password hash testMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopforrige commit failaMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopFixed merge conflict in hashPassword- method in UserDAOMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopsettings.jsRevision in calculatorMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopAdded method for hashing passwordFikset js script for oppdatere infoAdded method for generating salt and testingMerge branch 'master' of https://gitlab.stud.idi.ntnu.no/magnusrf/devops-workshopImplementedsmå endring i htmlhtml + js oppgave 3 halveis gjortTullTUllFixed merge conflict in calculate methodImproved response from calculator with ExeptionsUpdated message when calc input is wrongFixed testCalculate() method in CalculatorResourceTestFixed merge conflict in TestGetUsers and testGetUserByUsername