Code

fix#18

Code

Merged

ziliuziliu merged 23 commits intoo-ligei:developo-ligei/TimeManagement:developfrom ShanSimu:developCopy head branch name to clipboardSep 23, 2020

+117-152

Commits

Commits on Sep 14, 2020

• Merge pull request #1 from o-ligei/master

  Show description for 788cb16
  ShanSimu

  authored
  788cb16

  Copy full SHA for 788cb16

Commits on Sep 16, 2020

• Merge branch 'master' of https://github.com/o-ligei/TimeManagement

  

  ShaoJieCui

  committed
  a97ba4e

  Copy full SHA for a97ba4e

Commits on Sep 19, 2020

• feat: unfinished while list

  

  ShaoJieCui

  committed
  6547a98

  Copy full SHA for 6547a98

Commits on Sep 20, 2020

• Merge branch 'develop' into develop

  ShanSimu

  authored
  8824c72

  Copy full SHA for 8824c72

• Merge branch 'develop' into develop

  ShanSimu

  authored
  4444227

  Copy full SHA for 4444227

Commits on Sep 21, 2020

• feat: task success activity

  

  ShaoJieCui

  committed
  f3b1422

  Copy full SHA for f3b1422

• fix:task succuess activity

  

  ShaoJieCui

  committed
  6366d11

  Copy full SHA for 6366d11

• fix：white list

  

  ShaoJieCui

  committed
  3abbbf9

  Copy full SHA for 3abbbf9

• feat:screen saver activity

  

  ShaoJieCui

  committed
  6cdf13a

  Copy full SHA for 6cdf13a

• Merge branch 'develop' of https://github.com/ShaoJieCui/TimeManagement into develop

  

  ShaoJieCui

  committed
  2652768

  Copy full SHA for 2652768

• Merge branch 'develop' into develop

  ShanSimu

  authored
  6ef84c6

  Copy full SHA for 6ef84c6

• Merge branch 'develop' of https://github.com/o-ligei/TimeManagement into o-ligei-develop

  ShanSimu

  committed
  6e03077

  Copy full SHA for 6e03077

• confict

  ShanSimu

  committed
  9275745

  Copy full SHA for 9275745

• Merge branch 'o-ligei-develop' into develop

  ShanSimu

  committed
  2c08d37

  Copy full SHA for 2c08d37

• fix:for the stupid name

  ShanSimu

  committed
  a163cea

  Copy full SHA for a163cea

Commits on Sep 22, 2020

• fix:white list layout

  ShanSimu

  committed
  27d8f98

  Copy full SHA for 27d8f98

• feat:task list

  ShanSimu

  committed
  af13359

  Copy full SHA for af13359

• Merge branch 'develop' of https://github.com/o-ligei/TimeManagement into oligei-develop

  ShanSimu

  committed
  764c1a6

  Copy full SHA for 764c1a6

• Merge branch 'oligei-develop' into develop

  ShanSimu

  committed
  0192ec0

  Copy full SHA for 0192ec0

Commits on Sep 23, 2020

• Merge branch 'develop' of https://github.com/o-ligei/TimeManagement into o-ligei-develop

  ShanSimu

  committed
  6e4af83

  Copy full SHA for 6e4af83

• Merge branch 'o-ligei-develop' into develop

  ShanSimu

  committed
  f24cdb0

  Copy full SHA for f24cdb0

• fix:layout and strings

  ShanSimu

  committed
  2968e82

  Copy full SHA for 2968e82

• Merge branch 'develop' into develop

  ShanSimu

  authored
  a40b9fb

  Copy full SHA for a40b9fb