Code

Dev min#19

Code

Open

Debojyoti1915001 wants to merge 36 commits intomasterimonology/hourly:masterfrom dev-minimonology/hourly:dev-minCopy head branch name to clipboard

+19,557-3,164

Commits

Commits on Jul 6, 2020

• merlin/hourly: remove option choose in rate, add open_project router, define open_project model.

  

  ImonCloud

  committed
  0c6b8a3

• merlin/hourly: update open project model

  

  ImonCloud

  committed
  9c9835a

• merlin/hourly: test project open

  

  ImonCloud

  committed
  6477292

• merlin/hourly: add sub_data

  

  ImonCloud

  committed
  ad6e42f

• merlin/hourly: add sub_data test

  

  ImonCloud

  committed
  fe4365f

• merlin/hourly: rollback router

  

  ImonCloud

  committed
  598ee78

Commits on Jul 7, 2020

• merlin/hourly: backup new dev cycles and project router

  

  ImonCloud

  committed
  26dda77

• merlin/hourly: update tracking and change Chinese to English

  

  ImonCloud

  committed
  a949f73

Commits on Jul 8, 2020

• syhu/hourly: add: _model: 'account' usage

  

  ImonCloud

  committed
  2c7dc47

• merlin/hourly: commit open project

  

  ImonCloud

  committed
  2999908

• merlin/hourly: salary sheet demo

  

  ImonCloud

  committed
  c4ab7a2

Commits on Jul 13, 2020

• merlin/hourly: create analysic view

  

  ImonCloud

  committed
  8d75a2d

• merlin/hourly: set permission for each roie

  

  ImonCloud

  committed
  83850f0

Commits on Jul 22, 2020

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

  

  ImonCloud

  committed
  3c59b15

• add: postcss.config

  

  ImonCloud

  committed
  bf103ad

Commits on Jul 23, 2020

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

  

  ImonCloud

  committed
  6805251

Commits on Jul 28, 2020

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

  

  ImonCloud

  committed
  843d266

Commits on Jul 29, 2020

• Create new UI for dev cycles.

  

  ImonCloud

  committed
  140fde6

Commits on Jul 30, 2020

• Merge pull request #4 from oliwave/dev

  Show description for fe152b8
  

  SotaTek-HungVu

  authored
  fe152b8

• Modify admin and dev showing list

  

  ImonCloud

  committed
  87c03d0

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

  Show description for 8a676e5
  

  ImonCloud

  committed
  8a676e5

Commits on Jul 31, 2020

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

  

  ImonCloud

  committed
  a9fb1fa

Commits on Aug 3, 2020

• Make salary_filter UI

  

  ImonCloud

  committed
  52b1190

• Fix the conflict when merge.

  

  ImonCloud

  committed
  28eb3be

Commits on Aug 4, 2020

• Merge pull request #5 from oliwave/dev

  Show description for 48b1f38
  

  SotaTek-HungVu

  authored
  48b1f38

• Update the salary calculation part.

  

  ImonCloud

  committed
  d365d30

• Merge pull request #6 from oliwave/dev

  Show description for 702021b
  

  SotaTek-HungVu

  authored
  702021b

• [Tron] refactor data query logic

  

  ImonCloud

  committed
  da6c6cb

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

  Show description for 1a0c068
  

  ImonCloud

  committed
  1a0c068

• sotatek/hourly: [Tron] refactor data query logic

  

  ImonCloud

  committed
  bec605b

Commits on Aug 7, 2020

• sotatek/hourly: [Tron] refactor salary_filter and salart_list

  

  ImonCloud

  committed
  4e45585

Commits on Aug 10, 2020

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

  

  ImonCloud

  committed
  7c3daf8

Commits on Dec 8, 2021

• last changes by Tron

  

  ImonCloud

  committed
  15014ed

Commits on Dec 15, 2021

• fix: organization display

  

  ImonCloud

  committed
  d648fd9

• conflict solved

  Debojyoti1915001

  committed
  999dcc2

Commits on Dec 18, 2021

• update scalra-flexform

  Debojyoti1915001

  committed
  082f3f7