Dev min#19

Open

Debojyoti1915001 wants to merge 36 commits into

Commits on Jul 6, 2020

merlin/hourly: remove option choose in rate, add open_project router, define open_project model.
ImonCloud
committed
merlin/hourly: update open project model
ImonCloud
committed
merlin/hourly: test project open
ImonCloud
committed
merlin/hourly: add sub_data
ImonCloud
committed
merlin/hourly: add sub_data test
ImonCloud
committed
merlin/hourly: rollback router
ImonCloud
committed

Commits on Jul 7, 2020

merlin/hourly: backup new dev cycles and project router
ImonCloud
committed
merlin/hourly: update tracking and change Chinese to English
ImonCloud
committed

Commits on Jul 8, 2020

syhu/hourly: add: _model: 'account' usage
ImonCloud
committed
merlin/hourly: commit open project
ImonCloud
committed
merlin/hourly: salary sheet demo
ImonCloud
committed

Commits on Jul 13, 2020

merlin/hourly: create analysic view
ImonCloud
committed
merlin/hourly: set permission for each roie
ImonCloud
committed

Commits on Jul 22, 2020

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

Commits on Jul 23, 2020

sotatek/hourly: [Hourly] Modify different tab menu for each roles
ImonCloud
committed

Commits on Jul 28, 2020

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

Commits on Jul 29, 2020

Create new UI for dev cycles.
ImonCloud
committed

Commits on Jul 30, 2020

Merge pull request #4 from oliwave/dev
SotaTek-HungVu
authored
Modify admin and dev showing list
ImonCloud
committed
Merge branch 'dev' of https://github.com/imonology/hourly into dev
ImonCloud
committed

Commits on Jul 31, 2020

sotatek/hourly: [Tron] debug list project show role, update drop down menu data,
ImonCloud
committed

Commits on Aug 3, 2020

Make salary_filter UI
ImonCloud
committed
Fix the conflict when merge.
ImonCloud
committed

Commits on Aug 4, 2020

Merge pull request #5 from oliwave/dev
SotaTek-HungVu
authored
Update the salary calculation part.
ImonCloud
committed
Merge pull request #6 from oliwave/dev
SotaTek-HungVu
authored
[Tron] refactor data query logic
ImonCloud
committed
Merge branch 'dev' of https://github.com/imonology/hourly into dev
ImonCloud
committed
sotatek/hourly: [Tron] refactor data query logic
ImonCloud
committed

Commits on Aug 7, 2020

sotatek/hourly: [Tron] refactor salary_filter and salart_list
ImonCloud
committed

Commits on Aug 10, 2020

sotatek/hourly: [Tron] refactor salary_filter filter by project
ImonCloud
committed

Commits on Dec 8, 2021

last changes by Tron
ImonCloud
committed

Commits on Dec 15, 2021

fix: organization display
ImonCloud
committed
conflict solved
Debojyoti1915001
committed

Commits on Dec 18, 2021

update scalra-flexform
Debojyoti1915001
committed