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

Dev min #19

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Dev min #19

wants to merge 36 commits into from

Commits on Jul 6, 2020

  1. merlin/hourly: remove option choose in rate, add open_project router,… 

    … define open_project model.
    ImonCloud committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    0c6b8a3 View commit details
    Browse the repository at this point in the history

  2. merlin/hourly: update open project model

    ImonCloud committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    9c9835a View commit details
    Browse the repository at this point in the history

  3. merlin/hourly: test project open

    ImonCloud committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    6477292 View commit details
    Browse the repository at this point in the history

  4. merlin/hourly: add sub_data

    ImonCloud committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    ad6e42f View commit details
    Browse the repository at this point in the history

  5. merlin/hourly: add sub_data test

    ImonCloud committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    fe4365f View commit details
    Browse the repository at this point in the history

  6. merlin/hourly: rollback router

    ImonCloud committed Jul 6, 2020
    Configuration menu
    Copy the full SHA
    598ee78 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2020

  1. merlin/hourly: backup new dev cycles and project router

    ImonCloud committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    26dda77 View commit details
    Browse the repository at this point in the history

  2. merlin/hourly: update tracking and change Chinese to English

    ImonCloud committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    a949f73 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2020

  1. syhu/hourly: add: _model: 'account' usage

    ImonCloud committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    2c7dc47 View commit details
    Browse the repository at this point in the history

  2. merlin/hourly: commit open project

    ImonCloud committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    2999908 View commit details
    Browse the repository at this point in the history

  3. merlin/hourly: salary sheet demo

    ImonCloud committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    c4ab7a2 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2020

  1. merlin/hourly: create analysic view

    ImonCloud committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    8d75a2d View commit details
    Browse the repository at this point in the history

  2. merlin/hourly: set permission for each roie

    ImonCloud committed Jul 13, 2020
    Configuration menu
    Copy the full SHA
    83850f0 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2020

  1. add postcss config, fix: scalra, flexform versions to be stable

    ImonCloud committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    3c59b15 View commit details
    Browse the repository at this point in the history

  2. add: postcss.config

    ImonCloud committed Jul 22, 2020
    Configuration menu
    Copy the full SHA
    bf103ad View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2020

  1. sotatek/hourly: [Hourly] Modify different tab menu for each roles

    ImonCloud committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    6805251 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. sotatek/hourly: [Model] query data from models with option.form method

    ImonCloud committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    843d266 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2020

  1. Create new UI for dev cycles.

    ImonCloud committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    140fde6 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2020

  1. Merge pull request #4 from oliwave/dev 

    Create new UI for dev cycles.
    SotaTek-HungVu authored Jul 30, 2020
    Configuration menu
    Copy the full SHA
    fe152b8 View commit details
    Browse the repository at this point in the history

  2. Modify admin and dev showing list

    ImonCloud committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    87c03d0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' of https://github.com/imonology/hourly into dev 

    modify admin and dev showing list
    ImonCloud committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    8a676e5 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. sotatek/hourly: [Tron] debug list project show role, update drop down… 

    … menu data,
    ImonCloud committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    a9fb1fa View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2020

  1. Make salary_filter UI

    ImonCloud committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    52b1190 View commit details
    Browse the repository at this point in the history

  2. Fix the conflict when merge.

    ImonCloud committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    28eb3be View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. Merge pull request #5 from oliwave/dev 

    Make salary filter UI.
    SotaTek-HungVu authored Aug 4, 2020
    Configuration menu
    Copy the full SHA
    48b1f38 View commit details
    Browse the repository at this point in the history

  2. Update the salary calculation part.

    ImonCloud committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    d365d30 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from oliwave/dev 

    Update the salary calculation part.
    SotaTek-HungVu authored Aug 4, 2020
    Configuration menu
    Copy the full SHA
    702021b View commit details
    Browse the repository at this point in the history

  4. [Tron] refactor data query logic

    ImonCloud committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    da6c6cb View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of https://github.com/imonology/hourly into dev 

    [Tron] Refactor data query logic
    ImonCloud committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    1a0c068 View commit details
    Browse the repository at this point in the history

  6. sotatek/hourly: [Tron] refactor data query logic

    ImonCloud committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    bec605b View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. sotatek/hourly: [Tron] refactor salary_filter and salart_list

    ImonCloud committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    4e45585 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2020

  1. sotatek/hourly: [Tron] refactor salary_filter filter by project

    ImonCloud committed Aug 10, 2020
    Configuration menu
    Copy the full SHA
    7c3daf8 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2021

  1. last changes by Tron

    ImonCloud committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    15014ed View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. fix: organization display

    ImonCloud committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    d648fd9 View commit details
    Browse the repository at this point in the history

  2. conflict solved

    @Debojyoti1915001
    Debojyoti1915001 committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    999dcc2 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2021

  1. update scalra-flexform

    @Debojyoti1915001
    Debojyoti1915001 committed Dec 18, 2021
    Configuration menu
    Copy the full SHA
    082f3f7 View commit details
    Browse the repository at this point in the history