Commit Graph

1147 Commits

Author SHA1 Message Date
tianshujie
839d71137a * Fix the error of product dashboard block. 2021-12-31 10:19:25 +08:00
hufangzhou
4b2890c766 * Add the new version. 2021-12-24 15:01:04 +08:00
hufangzhou
f02258f8e1 * Fix bug #17919. 2021-12-24 13:16:23 +08:00
hufangzhou
1aeccfed43 * Fix bug #17919. 2021-12-24 10:47:30 +08:00
zhujinyong
411b060895 + Create demo data for api. 2021-12-21 09:36:25 +08:00
liyuchun
4ecc85aa0e Merge branch 'devops16' 2021-12-13 12:12:37 +08:00
hufangzhou
68a534b137 * Fix bug #17269, bug #16975. 2021-12-08 17:16:22 +08:00
李玉春
3f2793e5bd Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
2021-12-07 08:50:57 +00:00
王怡栋
cf280763b2 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803

(cherry picked from commit ff06288dc8)

b11dd3af  * Finish task #45491.
2021-12-07 08:49:16 +00:00
王怡栋
ff06288dc8 Merge branch 'sprint/devops16_liyuchun_45491' into 'master'
* Finish task #45491.

See merge request easycorp/zentaopms!803
2021-12-07 08:21:33 +00:00
liyuchun
b11dd3af4e * Finish task #45491. 2021-12-07 16:15:21 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明
9ddee1bcea * Fix bug #17008. 2021-12-02 13:53:56 +08:00
孙广明
1faf545954 * Remove unused code. 2021-12-02 13:10:55 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liumengyi
b264aa3199 * Fix bug 16807,16892. 2021-11-30 09:46:30 +08:00
liumengyi
aa86de638c * Fix bug #16907. 2021-11-30 09:43:20 +08:00
liumengyi
41d073f19d * Finish task #45157. 2021-11-29 10:37:56 +08:00
liumengyi
2cfb89f727 * Finish task #45157. 2021-11-29 09:47:04 +08:00
liumengyi
0c2b88ae38 * Finish task #45157. 2021-11-26 15:04:47 +08:00
liumengyi
df2f48128a * Finish task #45157. 2021-11-26 10:31:47 +08:00
liumengyi
2c8777ebe9 * Finish task #45157. 2021-11-26 10:26:43 +08:00
liumengyi
4d8b54a0b1 * Finish task #45157. 2021-11-26 10:08:56 +08:00
liumengyi
542369e382 * Finish task #45157. 2021-11-26 09:13:24 +08:00
liumengyi
508b73fea6 * Finish task #45157. 2021-11-26 09:09:48 +08:00
liumengyi
99b52e6b7e * Finish task #45157. 2021-11-26 08:59:55 +08:00
liumengyi
fb843381ca * Finish task #45157. 2021-11-26 08:55:04 +08:00
zhujinyong
e86878e5c6 * Fix tree of product and branch. 2021-11-25 14:49:15 +08:00
hufangzhou
6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
孙广明
612c6e0728 * Add weekly and holiday. 2021-11-08 09:07:16 +08:00
孙广明
d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
mayue
cb6a36fd4b * Fix bug #12047. 2021-11-04 08:54:25 +08:00
mayue
f123cdefc1 * Fix bug #12047. 2021-11-04 08:18:20 +08:00
王怡栋
076f328914 * add lang for zentaoapp and adjust api. 2021-10-27 19:58:50 +08:00
王怡栋
a44472fb45 Merge branch '15.6' into sprint/167 2021-10-14 15:48:14 +08:00
zenggang
8e95a7f98d * Fix bug#15466 2021-10-14 06:25:19 +00:00
liyuchun
5cd7ed9d74 * Fix bug #15495. 2021-10-13 14:35:09 +08:00
hufangzhou
bf78fe9be4 * Add the 15.6 version and upgrade. 2021-10-12 09:35:39 +08:00
朱金勇
fa879ae303 Merge branch 'sprint/165_tianshujie_42854' into 'sprint/165'
* Finish task #42854.

See merge request easycorp/zentaopms!39
2021-09-28 07:35:23 +00:00
朱金勇
1173e8b65d Merge branch 'sprint/165_wangyidong' into 'sprint/165'
Sprint/165 wangyidong

See merge request easycorp/zentaopms!37
2021-09-28 07:31:10 +00:00
tianshujie
4f977efaeb * Finish task #42854. 2021-09-28 13:14:32 +08:00
王怡栋
f30eb20fbd * code for task #42835. 2021-09-27 14:50:09 +08:00
zenggang
40d848f03f * Fix bug#15282 2021-09-26 17:06:13 +08:00
tianshujie
2a4b2497dc * Finish task #42847. 2021-09-23 08:56:40 +08:00
dingna
d9ac355260 * Fix bug #14529. 2021-09-17 13:19:57 +08:00
tianshujie
56a6accf6a * Fix bug #14892. 2021-09-14 13:22:06 +08:00
liyuchun
ebad305ad8 * Fix bug #14747. 2021-09-13 15:34:17 +08:00
hufangzhou
0653d3d3aa * Finish task #42376. 2021-09-08 14:52:47 +08:00
hufangzhou
71624f48b0 * Finish task #42140: Remove the entrance of tutorial. 2021-09-06 10:36:59 +08:00