1. 02 Jun, 2022 1 commit
  2. 25 May, 2022 4 commits
    • KRISTJAN KRUUS's avatar
      Automatic merge from release -> develop · f98e5910
      KRISTJAN KRUUS authored
      * commit 'ad165f96':
        Pull request #201: RIHAKB-1095
        Revert "Pull request #199: RIHAKB-1100"
        Pull request #199: RIHAKB-1100
        project version up
      f98e5910
    • KRISTJAN KRUUS's avatar
      Pull request #201: RIHAKB-1095 · ad165f96
      KRISTJAN KRUUS authored
      Merge in RIHA/riha-browser from RIHAKB-1095 to release
      
      Squashed commit of the following:
      
      commit 0e5dc91a
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue May 17 15:28:39 2022 +0300
      
          Parandatud CSS stiilid
      
      commit 12537e61
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue May 17 13:52:06 2022 +0300
      
          Parandatud CSS stiilid
      
      commit 0e76ea03
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Mon May 9 16:00:31 2022 +0300
      
          test
      
      commit b7b40b92
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Mon May 9 15:45:22 2022 +0300
      
          float-end
      
      commit 5c3a75dc
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Mon May 9 15:34:25 2022 +0300
      
          fix float for new bootstrap version
      
      commit 24b94a6b
      Merge: cc5d18ed 9f453dfd
      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 cc5d18ed
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Fri May 6 15:42:16 2022 +0300
      
          Parandatud CSS stiilid
      
      commit 9f453dfd
      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 7ee2bfe4
          Author: makar <makar.shokarev@wisercat.net>
          Date:   Fri May 6 14:46:23 2022 +0300
      
              Parandatud CSS stiilid
      
          commit b3610355
          Author: Kristjan Kruus <kristjan.kruus@ria.ee>
          Date:   Fri May 6 09:44:28 2022 +0300
      
              README.md edited online with Bitbucket
      
          commit 447f48cd
          Author: Kristjan Kruus <kristjan.kruus@ria.ee>
          Date:   Fri May 6 09:43:55 2022 +0300
      
              ScenarioContext.java edited online with Bitbucket
      
          commit 86465bf0
          Author: Kristjan Kruus <kristjan.kruus@ria.ee>
          Date:   Fri May 6 09:41:23 2022 +0300
      
              README.md edited online with Bitbucket
      
          commit e0157d1d
          Author: makar <makar.shokarev@wisercat.net>
          Date:   Thu May 5 14:20:02 2022 +0300
      
              Parandatud selenium testid
      
      commit 7ee2bfe4
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Fri May 6 14:46:23 2022 +0300
      
          Parandatud CSS stiilid
      
      commit 647e3c1f
      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 b3610355
          Author: Kristjan Kruus <kristjan.kruus@ria.ee>
          Date:   Fri May 6 09:44:28 2022 +0300
      
              README.md edited online with Bitbucket
      
          commit 447f48cd
          Author: Kristjan Kruus <kristjan.kruus@ria.ee>
          Date:   Fri May 6 09:43:55 2022 +0300
      
              ScenarioContext.java edited online with Bitbucket
      
          commit 86465bf0
          Author: Kristjan Kruus <kristjan.kruus@ria.ee>
          Date:   Fri May 6 09:41:23 2022 +0300
      
              README.md edited online with Bitbucket
      
          commit e0157d1d
          Author: makar <makar.shokarev@wisercat.net>
          Date:   Thu May 5 14:20:02 2022 +0300
      
              Parandatud selenium testid
      
      commit b3610355
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Fri May 6 09:44:28 2022 +0300
      
          README.md edited online with Bitbucket
      
      commit 447f48cd
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Fri May 6 09:43:55 2022 +0300
      
          ScenarioContext.java edited online with Bitbucket
      
      commit 86465bf0
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Fri May 6 09:41:23 2022 +0300
      
          README.md edited online with Bitbucket
      
      commit e0157d1d
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Thu May 5 14:20:02 2022 +0300
      
          Parandatud selenium testid
      
      commit 4b3f97a0
      Merge: ea3d9f51 35e37d15
      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 '35e37d15':
            CSS stiilide parandus
            Parandatud tirvalisuse blokki stiilid. Vahetatud kõikide input'ite värvid
            Parandatud märksõnade stiilid.
      
      commit ea3d9f51
      Merge: d1f75263 1f6c5d33
      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 '1f6c5d33':
            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 35e37d15
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue May 3 11:24:18 2022 +0300
      
          CSS stiilide parandus
      
      commit f20a27c3
      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 d1f75263
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Mon May 2 12:43:34 2022 +0300
      
          Parandatud viga, mis tekkitas ngx-ui-switch
      
      commit a8fbee5b
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Mon May 2 12:14:46 2022 +0300
      
          Parandatud märksõnade stiilid.
      
      ... and 27 more commits
      ad165f96
    • KRISTJAN KRUUS's avatar
      Revert "Pull request #199: RIHAKB-1100" · c78cf92f
      KRISTJAN KRUUS authored
      This reverts commit aae547d7.
      c78cf92f
    • KRISTJAN KRUUS's avatar
      Pull request #199: RIHAKB-1100 · aae547d7
      KRISTJAN KRUUS authored
      Merge in RIHA/riha-browser from RIHAKB-1100 to release
      
      Squashed commit of the following:
      
      commit 1f6c5d33
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Wed Apr 13 16:35:15 2022 +0300
      
          spring-boot-starter-parent 2.6.6
      
      commit 77df96b0
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Wed Apr 13 15:20:56 2022 +0300
      
          Updated spring boot version to 2.6.6
      
      commit ec9cf052
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue Apr 12 16:14:43 2022 +0300
      
          Moved bean to another class
      
      commit f47f9ca4
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue Apr 12 14:46:44 2022 +0300
      
          Removing deprecated annotation
      
      commit bcbf8ab7
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Mon Apr 11 16:55:09 2022 +0300
      
          Updated all backend dependencies
      
      commit d9d8dbc7
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Fri Apr 8 09:45:07 2022 +0300
      
          Fixed standard system choosing css style
      
      commit 27248bdd
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Fri Apr 8 09:29:56 2022 +0300
      
          Fixing css styles
      
      commit e0d25fdf
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Thu Apr 7 13:30:28 2022 +0300
      
          Removed z-index
      
      commit 84c59868
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Wed Apr 6 17:20:27 2022 +0300
      
          Upgraded bootstrap version. Fixed errors
      
      commit c25c0285
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue Apr 5 16:41:36 2022 +0300
      
          Downgraded bootstrap version
      
      commit a11f92f6
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue Apr 5 14:11:00 2022 +0300
      
          Changed readme
      
      commit 7ea0bc41
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue Apr 5 13:00:15 2022 +0300
      
          Upgraded all dependencies in frontend
      
      commit 7d52fe8e
      Author: makar <makar.shokarev@wisercat.net>
      Date:   Tue Apr 5 10:16:39 2022 +0300
      
          Fixed ngs-ui-switch dependency error
      
      commit 193645d9
      Author: kristjankr <kristjan.kruus@ria.ee>
      Date:   Tue Mar 22 11:57:02 2022 +0200
      
          added missing dependencies
      
      commit a918d239
      Author: kristjankr <kristjan.kruus@ria.ee>
      Date:   Tue Mar 22 11:44:44 2022 +0200
      
          new yarn version
      
      commit cfcddcf7
      Author: kristjankr <kristjan.kruus@ria.ee>
      Date:   Tue Mar 22 11:39:57 2022 +0200
      
          dependency update
      
      commit 128ddaf3
      Author: kristjankr <kristjan.kruus@ria.ee>
      Date:   Tue Mar 22 11:10:49 2022 +0200
      
          Revert "upgrade dependencies"
      
          This reverts commit 18e80a04.
      
      commit d7fac944
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Tue Mar 22 10:52:34 2022 +0200
      
          typescript proper version
      
      commit d69b1d34
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Tue Mar 22 10:51:15 2022 +0200
      
          version up
      
      commit 95b7cc8f
      Author: Kristjan Kruus <kristjan.kruus@ria.ee>
      Date:   Tue Mar 22 10:49:19 2022 +0200
      
          typescript downgrade
      
      ... and 7 more commits
      aae547d7
  3. 17 May, 2022 3 commits
  4. 09 May, 2022 7 commits
  5. 06 May, 2022 8 commits
  6. 05 May, 2022 3 commits
    • makar's avatar
      Parandatud selenium testid · e0157d1d
      makar authored
      e0157d1d
    • KRISTJAN KRUUS's avatar
      Pull request #191: RIHAKB-1095 · 4b3f97a0
      KRISTJAN KRUUS authored
      Merge in RIHA/riha-browser from RIHAKB-1095 to develop
      
      * commit '35e37d15':
        CSS stiilide parandus
        Parandatud tirvalisuse blokki stiilid. Vahetatud kõikide input'ite värvid
        Parandatud märksõnade stiilid.
      4b3f97a0
    • KRISTJAN KRUUS's avatar
      Pull request #190: RIHAKB-1100 · ea3d9f51
      KRISTJAN KRUUS authored
      Merge in RIHA/riha-browser from RIHAKB-1100 to develop
      
      * commit '1f6c5d33':
        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
      ea3d9f51
  7. 03 May, 2022 1 commit
  8. 02 May, 2022 3 commits
  9. 13 Apr, 2022 2 commits
  10. 12 Apr, 2022 2 commits
  11. 11 Apr, 2022 1 commit
  12. 08 Apr, 2022 2 commits
  13. 07 Apr, 2022 1 commit
  14. 06 Apr, 2022 1 commit
  15. 05 Apr, 2022 1 commit