Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #943

Merged
merged 48 commits into from
Sep 11, 2024
Merged

Develop #943

merged 48 commits into from
Sep 11, 2024

Commits on Aug 27, 2024

  1. Added select all feature

    @mukund-egov
    mukund-egov committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    4e45e08 View commit details
    Browse the repository at this point in the history

  2. ISTE-374 Fix

    @Hari-egov
    Hari-egov committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    fc25682 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. [ISTE-262] - Saving meter reading after taxperiod validation

    @Taniya-eGov
    Taniya-eGov authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    b5cfa16 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Merge pull request #932 from egovernments/ISTE-262 

    [ISTE-262] - Saving meter reading after taxperiod validation
    @pradeepkumarcm-egov
    pradeepkumarcm-egov authored Aug 29, 2024
    Configuration menu
    Copy the full SHA
    aa75276 View commit details
    Browse the repository at this point in the history

  2. Added download all data in excel format functionality

    @mukund-egov
    mukund-egov committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    4a4edd6 View commit details
    Browse the repository at this point in the history

  3. Removed sample data

    @mukund-egov
    mukund-egov authored Aug 29, 2024
    Configuration menu
    Copy the full SHA
    c87638c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into ISTE-391

    @mukund-egov
    mukund-egov committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    675ffd1 View commit details
    Browse the repository at this point in the history

  5. resolved merge conflicts

    @mukund-egov
    mukund-egov committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e04d8c1 View commit details
    Browse the repository at this point in the history

  6. dropdown menu enhancement and showed all data

    @mukund-egov
    mukund-egov committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    47d9a6b View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/ISTE-391' into ISTE-391

    @mukund-egov
    mukund-egov committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    7ad0d59 View commit details
    Browse the repository at this point in the history

  8. Solved build issues

    @mukund-egov
    mukund-egov committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    fa78ad5 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Dashboard is accessible via iFrame

    @mukund-egov
    mukund-egov committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    90ae276 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #934 from egovernments/ISTE-374 

    ISTE-374 Fix
    @pradeepkumarcm-egov
    pradeepkumarcm-egov authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    cce2c6c View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/ISTE-374' into ISTE-372

    @mukund-egov
    mukund-egov committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    c4e5d5c View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. ISTE-374-FIX

    @Hari-egov
    Hari-egov committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    d4f9e46 View commit details
    Browse the repository at this point in the history

  2. ISTE-228-FIx

    @Hari-egov
    Hari-egov committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    ddfe4b1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #935 from egovernments/ISTE-228-Updated 

    Iste 228 updated
    @pradeepkumarcm-egov
    pradeepkumarcm-egov authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    610930c View commit details
    Browse the repository at this point in the history

  4. Added hyperliks for kibana dashboard

    @mukund-egov
    mukund-egov committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    44bb869 View commit details
    Browse the repository at this point in the history

  5. Update SearchUserForm.js

    @mukund-egov
    mukund-egov authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    01d948c View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. ISTE-374-UI Update

    @Hari-egov
    Hari-egov committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    dc17a90 View commit details
    Browse the repository at this point in the history

  2. updated code check

    @Hari-egov
    Hari-egov committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    f9684fc View commit details
    Browse the repository at this point in the history

  3. ternary update

    @Hari-egov
    Hari-egov committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    f245c46 View commit details
    Browse the repository at this point in the history

  4. check changes

    @Hari-egov
    Hari-egov committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    eda891b View commit details
    Browse the repository at this point in the history

  5. ISTE-432 Fix

    @Hari-egov
    Hari-egov committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5a367a6 View commit details
    Browse the repository at this point in the history

  6. Update index.js

    @mukund-egov
    mukund-egov authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    d7b34b2 View commit details
    Browse the repository at this point in the history

  7. Update index.js

    @mukund-egov
    mukund-egov authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    219c6f2 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Added debugging statement

    @mukund-egov
    mukund-egov committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    b7db8fa View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/ISTE-372' into ISTE-372

    @mukund-egov
    mukund-egov committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9a17f11 View commit details
    Browse the repository at this point in the history

  3. changed calculation logic for metered connection

    @Taniya1493
    Taniya1493 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    85158fe View commit details
    Browse the repository at this point in the history

  4. check minCharge is not zero condition

    @Taniya1493
    Taniya1493 committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    f6de718 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #937 from egovernments/ISTE-404 

    changed calculation logic for metered connection
    @pradeepkumarcm-egov
    pradeepkumarcm-egov authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    b0e23aa View commit details
    Browse the repository at this point in the history

  6. fixed extra files

    @mukund-egov
    mukund-egov committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    7e399be View commit details
    Browse the repository at this point in the history

  7. fixed extra files

    @mukund-egov
    mukund-egov committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    560d565 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Corrected css of iframe

    @mukund-egov
    mukund-egov committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    d514664 View commit details
    Browse the repository at this point in the history

  2. removed comment statements

    @mukund-egov
    mukund-egov authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    b2d7e9b View commit details
    Browse the repository at this point in the history

  3. solved i18text issue

    @mukund-egov
    mukund-egov committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    1ee9733 View commit details
    Browse the repository at this point in the history

  4. solved i18text issue

    @mukund-egov
    mukund-egov committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    9675567 View commit details
    Browse the repository at this point in the history

  5. ISTE-412 FIX

    @Hari-egov
    Hari-egov committed Sep 9, 2024
    Configuration menu
    Copy the full SHA
    8f20293 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2024

  1. Merge pull request #939 from egovernments/ISTE-412 

    Iste 412
    @pradeepkumarcm-egov
    pradeepkumarcm-egov authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    3509279 View commit details
    Browse the repository at this point in the history

  2. Pulled changes from develop

    @mukund-egov
    mukund-egov committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    6f9ecee View commit details
    Browse the repository at this point in the history

  3. Update app.py

    @mukund-egov
    mukund-egov authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    8987cd9 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #940 from egovernments/ISTE-372 

    Corrected Kibana Dashboard via Iframe and Added extra Columns in "Seach Department User" (ISTE-418)
    @pradeepkumarcm-egov
    pradeepkumarcm-egov authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    feb53b2 View commit details
    Browse the repository at this point in the history

  5. corrected a mistake

    @mukund-egov
    mukund-egov committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    3f60a72 View commit details
    Browse the repository at this point in the history

  6. div code filter added

    @Hari-egov
    Hari-egov committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    fa1b329 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #942 from egovernments/ISTE-372 

    Iste 372
    @debasishchakraborty-egovt
    debasishchakraborty-egovt authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    25c91ea View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into develop

    @Hari-egov
    Hari-egov authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    2a6dae2 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into ISTE-391

    @Hari-egov
    Hari-egov authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    992c9c3 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #936 from egovernments/ISTE-391 

    ISTE-391: Dropdown Menu Enhancement and Role Display Issue
    @debasishchakraborty-egovt
    debasishchakraborty-egovt authored Sep 11, 2024
    Configuration menu
    Copy the full SHA
    e5eec50 View commit details
    Browse the repository at this point in the history