Skip to content
  • KRISTJAN KRUUS's avatar
    Pull request #201: RIHAKB-1095 · f21fc39a
    KRISTJAN KRUUS authored
    Merge in RIHA/riha-browser from RIHAKB-1095 to release
    
    Squashed commit of the following:
    
    commit b691e3d4
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Tue May 17 15:28:39 2022 +0300
    
        Parandatud CSS stiilid
    
    commit 16bffe60
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Tue May 17 13:52:06 2022 +0300
    
        Parandatud CSS stiilid
    
    commit 3d3b4853
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Mon May 9 16:00:31 2022 +0300
    
        test
    
    commit d5b0e169
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Mon May 9 15:45:22 2022 +0300
    
        float-end
    
    commit 4daaf835
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Mon May 9 15:34:25 2022 +0300
    
        fix float for new bootstrap version
    
    commit d0336adb
    Merge: 5c008c68 15328877
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Fri May 6 15:45:56 2022 +0300
    
        Merge remote-tracking branch 'origin/develop' into RIHAKB-1095
    
        # Conflicts:
        #	frontend/src/styles/form.scss
    
    commit 5c008c68
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Fri May 6 15:42:16 2022 +0300
    
        Parandatud CSS stiilid
    
    commit 15328877
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Fri May 6 15:00:54 2022 +0300
    
        Pull request #193: RIHAKB-1095
    
        Merge in RIHA/riha-browser from RIHAKB-1095 to develop
    
        Squashed commit of the following:
    
        commit d7705ba0
        Author: makar <makar.shokarev@wisercat.net>
        Date:   Fri May 6 14:46:23 2022 +0300
    
            Parandatud CSS stiilid
    
        commit 59d11eb1
        Author: Kristjan Kruus <kristjan.kruus@ria.ee>
        Date:   Fri May 6 09:44:28 2022 +0300
    
            README.md edited online with Bitbucket
    
        commit 35dbec7a
        Author: Kristjan Kruus <kristjan.kruus@ria.ee>
        Date:   Fri May 6 09:43:55 2022 +0300
    
            ScenarioContext.java edited online with Bitbucket
    
        commit 18f75c1d
        Author: Kristjan Kruus <kristjan.kruus@ria.ee>
        Date:   Fri May 6 09:41:23 2022 +0300
    
            README.md edited online with Bitbucket
    
        commit f3257f47
        Author: makar <makar.shokarev@wisercat.net>
        Date:   Thu May 5 14:20:02 2022 +0300
    
            Parandatud selenium testid
    
    commit d7705ba0
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Fri May 6 14:46:23 2022 +0300
    
        Parandatud CSS stiilid
    
    commit 2497b20b
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Fri May 6 09:45:04 2022 +0300
    
        Pull request #192: RIHAKB-1095
    
        Merge in RIHA/riha-browser from RIHAKB-1095 to develop
    
        Squashed commit of the following:
    
        commit 59d11eb1
        Author: Kristjan Kruus <kristjan.kruus@ria.ee>
        Date:   Fri May 6 09:44:28 2022 +0300
    
            README.md edited online with Bitbucket
    
        commit 35dbec7a
        Author: Kristjan Kruus <kristjan.kruus@ria.ee>
        Date:   Fri May 6 09:43:55 2022 +0300
    
            ScenarioContext.java edited online with Bitbucket
    
        commit 18f75c1d
        Author: Kristjan Kruus <kristjan.kruus@ria.ee>
        Date:   Fri May 6 09:41:23 2022 +0300
    
            README.md edited online with Bitbucket
    
        commit f3257f47
        Author: makar <makar.shokarev@wisercat.net>
        Date:   Thu May 5 14:20:02 2022 +0300
    
            Parandatud selenium testid
    
    commit 59d11eb1
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Fri May 6 09:44:28 2022 +0300
    
        README.md edited online with Bitbucket
    
    commit 35dbec7a
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Fri May 6 09:43:55 2022 +0300
    
        ScenarioContext.java edited online with Bitbucket
    
    commit 18f75c1d
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Fri May 6 09:41:23 2022 +0300
    
        README.md edited online with Bitbucket
    
    commit f3257f47
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Thu May 5 14:20:02 2022 +0300
    
        Parandatud selenium testid
    
    commit 90eab0cb
    Merge: 4ac7c72f 84b26187
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Thu May 5 10:22:52 2022 +0300
    
        Pull request #191: RIHAKB-1095
    
        Merge in RIHA/riha-browser from RIHAKB-1095 to develop
    
        * commit '84b26187':
          CSS stiilide parandus
          Parandatud tirvalisuse blokki stiilid. Vahetatud kõikide input'ite värvid
          Parandatud märksõnade stiilid.
    
    commit 4ac7c72f
    Merge: 81c6c5f4 52aeacad
    Author: Kristjan Kruus <kristjan.kruus@ria.ee>
    Date:   Thu May 5 10:22:38 2022 +0300
    
        Pull request #190: RIHAKB-1100
    
        Merge in RIHA/riha-browser from RIHAKB-1100 to develop
    
        * commit '52aeacad':
          spring-boot-starter-parent 2.6.6
          Updated spring boot version to 2.6.6
          Moved bean to another class
          Removing deprecated annotation
          Updated all backend dependencies
          Fixed standard system choosing css style
          Fixing css styles
          Removed z-index
          Upgraded bootstrap version. Fixed errors
          Downgraded bootstrap version
          Changed readme
          Upgraded all dependencies in frontend
          Fixed ngs-ui-switch dependency error
    
    commit 84b26187
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Tue May 3 11:24:18 2022 +0300
    
        CSS stiilide parandus
    
    commit ffb1150e
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Mon May 2 14:40:28 2022 +0300
    
        Parandatud tirvalisuse blokki stiilid. Vahetatud kõikide input'ite värvid
    
    commit 81c6c5f4
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Mon May 2 12:43:34 2022 +0300
    
        Parandatud viga, mis tekkitas ngx-ui-switch
    
    commit a68c4739
    Author: makar <makar.shokarev@wisercat.net>
    Date:   Mon May 2 12:14:46 2022 +0300
    
        Parandatud märksõnade stiilid.
    
    ... and 27 more commits
    f21fc39a