8000 Comparing 1.5.1...1.5.2 · saeloun/miru-web · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: saeloun/miru-web
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.5.1
Choose a base ref
...
head repository: saeloun/miru-web
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.5.2
Choose a head ref
  • 17 commits
  • 54 files changed
  • 7 contributors

Commits on Mar 27, 2024

  1. bump version to 1.5.2

    “Apoorv committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    af4d913 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Can't apply to same holiday again (#1774)

    @prasanthchaduvula
    prasanthchaduvula authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    be592ae View commit details
    Browse the repository at this point in the history

  2. Fix validation: two holiday on same day (#1770) 

    * run validation only on create

* Resolved the conflicts

---------

Co-authored-by: “Apoorv <“tiwari.apoorv1316@gmail.com”>
Co-authored-by: prasanthchaduvula <chaduvulaprasanth1998@gmail.com>
    @apoorv1316 @prasanthchaduvula
    3 people authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    e5a60cd View commit details
    Browse the repository at this point in the history

  3. Mobile client page changes (#1773) 

    basic changes for mobile view

Co-authored-by: Shruti Apte <shruti@saeloun.com>
    @Shruti-Apte
    Shruti-Apte and Shruti Apte authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    b803496 View commit details
    Browse the repository at this point in the history

  4. Updated Leaves & Holidays balance cards according to the design (#1776) 

    * updated leaves and holidays header

* updated leaves & holidays balance text

* Updated sidebar Leave Management with Leaves & Holidays

* Updated timeoff entries services with holidays label

* Updated label on leave block on client side
    @prasanthchaduvula
    prasanthchaduvula authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    7ab72da View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Remove clients from team page (#1777) 

    Co-authored-by: Nishant Samel <nishant@saeloun.com>
    @nisusam
    nisusam and Nishant Samel authored Mar 29, 2024
    Configuration menu
    Copy the full SHA
    764e2ec View commit details
    Browse the repository at this point in the history

Commit 10000 s on Apr 4, 2024

  1. Remove invitation pending clients from team page (#1787) 

    Co-authored-by: Nishant Samel <nishant@saeloun.com>
    @nisusam
    nisusam and Nishant Samel authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    5e70686 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. Remove text box if no results are found in search (#1785) 

    remove box

Co-authored-by: “Apoorv <“tiwari.apoorv1316@gmail.com”>
    @apoorv1316
    apoorv1316 and “Apoorv authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    00c8fe7 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Fixed PTO calculations (#1781) 

    * Fixed PTO calculations

* added calculations according defined leaves

* added a service to calculate total duration of defined leaves service

* Updated timeoff entries services

* Fixed and updated the timeoff_entries index_service_spe
    @prasanthchaduvula
    prasanthchaduvula authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    3647f53 View commit details
    Browse the repository at this point in the history

  2. Remove unused and invalid code (#1791)

    @nisusam
    nisusam authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    683fdd6 View commit details
    Browse the repository at this point in the history

  3. create invitation presenter (#1772) 

    * create invitation presenter

* use jbuilder for update team action

* send deleted id for invitation

* send updated invitation object

* send full name in team update

* use helper for avatar

* refactor and review comments

* show false for pending invite

* fix test

---------

Co-authored-by: “Apoorv <“tiwari.apoorv1316@gmail.com”>
    @apoorv1316
    apoorv1316 and “Apoorv authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    8000
    f60a0ec View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Get total duration group by filters (#1780) 

    * group total duration

* fix join clause

* fix failing specs

* fix rubocop

* send id in es data

* fix tests

---------

Co-authored-by: “Apoorv <“tiwari.apoorv1316@gmail.com”>
    @apoorv1316
    apoorv1316 and “Apoorv authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    42de04f View commit details
    Browse the repository at this point in the history

  2. Total duration bug on time entry reports fixed (#1789) 

    * group total duration

* fix join clause

* fix failing specs

* fix rubocop

* total duration made consistant on all pages

* send id in es data

* label logic removed

---------

Co-authored-by: Apoorv <“tiwari.apoorv1316@gmail.com”>
Co-authored-by: Shruti Apte <shruti@saeloun.com>
Co-authored-by: Apoorv Tiwari <tiwari.apoorv1316@gmail.com>
    @Shruti-Apte @apoorv1316
    4 people authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    71a2443 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Make phone numbers non mandatory (#1793) 

    * Make phone numbers non mandatory

* Make company phone number non-mandatory

---------

Co-authored-by: Nishant Samel <nishant@saeloun.com>
    @nisusam
    nisusam and Nishant Samel authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    255a3aa View commit details
    Browse the repository at this point in the history

  2. Refresh page after adding/editing team member (#1750) 

    * refresh list when add/edit/delete team member

* create invitation presenter

* use jbuilder for update team action

* send deleted id for invitation

* send updated invitation object

* send full name in team update

* worked on review comments

* frontend changes for updated status logic: status= true means added team member

* removed unnecessary code

* common logic extracted in function

---------

Co-authored-by: Shruti Apte <shruti@saeloun.com>
Co-authored-by: “Apoorv <“tiwari.apoorv1316@gmail.com”>
    @Shruti-Apte
    3 people authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    6b91123 View commit details
    Browse the repository at this point in the history

  3. Updated design of filters on Leave management page (#1794) 

    * Updated timeoff entries index service with labels

* Updated timeoff entries index spec

* Updated leavel managment cards with labels

* Added leave management filters to view selected leaves

* If filter is applied for a type of leave, added shadow to the card to highlighted

* added box shadow, border and opacity on selection and hover on card

* added box shadow, border and opacity on selection and hover on card
    @prasanthchaduvula
    prasanthchaduvula authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    be0329c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release/1.5.2'

    @apoorv1316
    apoorv1316 committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    cc19dd5 View commit details
    Browse the repository at this point in the history
Loading
0