1. 01 Aug, 2018 1 commit
  2. 03 Jul, 2018 2 commits
  3. 08 Jun, 2018 4 commits
    • Ashmi Banerjee's avatar
      Merge branch '3418' of https://git.fortiss.org/af3/af3.git into 3418 · 5f1be414
      Ashmi Banerjee authored
      Conflicts:
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editor/.ratings
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editorbinding/.ratings
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/.ratings
      	org.fortiss.af3.mira/model/.ratings
      	org.fortiss.af3.mira/src/org/fortiss/af3/mira/compose/.ratings
      	org.fortiss.af3.mira/src/org/fortiss/af3/mira/prototype/.ratings
      5f1be414
    • Ashmi Banerjee's avatar
      Merge remote-tracking branch 'origin/master' into 3418 · afd39cd0
      Ashmi Banerjee authored
      Conflicts:
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editor/.ratings
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editorbinding/.ratings
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editorbinding/AspectBindings.java
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/.ratings
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/AspectHandlers.java
      	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/RequirementHandler.java
      	org.fortiss.af3.mira/model/.ratings
      	org.fortiss.af3.mira/src/org/fortiss/af3/mira/compose/.ratings
      	org.fortiss.af3.mira/src/org/fortiss/af3/mira/compose/RequirementCompositor.java
      	org.fortiss.af3.mira/src/org/fortiss/af3/mira/prototype/.ratings
      afd39cd0
    • Vivek Nigam's avatar
      <mira> Safety Aspects · 8f93bf6b
      Vivek Nigam authored
      
      
      * corrected bug in model that caused errors while saving AF3 Project
      
      Issue-Ref: 3418
      Signed-off-by: Vivek Nigam's avatarVivek Nigam <nigam@fortiss.org>
      8f93bf6b
    • Vivek Nigam's avatar
      <mira/safetycases> Safety Aspects · cf0a76b8
      Vivek Nigam authored
      
      
      * Extracted variable
      * changed to Yellow
      * There is red code in it, but this seems to be from the master, i.e., I
      do not think I changed that code.
      
      Issue-Ref: 3418
      Signed-off-by: Vivek Nigam's avatarVivek Nigam <nigam@fortiss.org>
      cf0a76b8
  4. 07 Jun, 2018 33 commits