Commit Graph

356 Commits

Author SHA1 Message Date
liumengyi
582ddf2a06 * Fix bug #18436.Finish task #47361. 2022-01-14 10:14:40 +08:00
zhujinyong
411b060895 + Create demo data for api. 2021-12-21 09:36:25 +08:00
hufangzhou
68a534b137 * Fix bug #17269, bug #16975. 2021-12-08 17:16:22 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liumengyi
41d073f19d * Finish task #45157. 2021-11-29 10:37:56 +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
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
孙广明
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
tianshujie
6da546e2a4 * Load the language item of the bug. 2021-09-03 13:24:30 +08:00
tianshujie
297be7901c * Fix bug #14918. 2021-09-03 13:10:38 +08:00
hufangzhou
3cb8c9be13 * Fix bug #14640. 2021-08-25 16:14:38 +08:00
tianshujie98
aa84629f3b * Finish task #41798. 2021-08-20 13:17:10 +08:00
hufangzhou
d228aa6f10 * Finish task #41786. 2021-08-20 10:39:28 +08:00
tianshujie98
7e28815aee * Fix bug #13862. 2021-08-09 14:15:31 +08:00
tianshujie98
f9269d1c77 * Fix bug #13903. 2021-08-09 13:23:09 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
wangyidong
fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
tianshujie98
51ff47c095 * Fix bug #13057. 2021-07-05 14:52:33 +08:00
Yagami
18acf1cef6 * Fix progress block logic. 2021-06-29 16:24:26 +08:00
tianshujie98
c38c99e0a8 * Fix bug. 2021-06-18 16:17:04 +08:00
tianshujie98
abe711e334 * Finish task #39450. 2021-06-18 09:10:40 +08:00
tianshujie98
53cf8a8b2a * Finish task #39451. 2021-06-18 09:05:37 +08:00
tianshujie98
5a6630e11e * Adjust code. 2021-06-15 17:12:40 +08:00
tianshujie98
c22b78a555 * Fix the problem of pending block. 2021-06-15 16:38:50 +08:00
tianshujie98
16b3845b2e * Add meeting to pending block. 2021-06-12 21:06:57 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
leiyong
49cd722bd3 * Fix bug. 2021-05-31 12:27:16 +08:00
tianshujie98
0c351122cd * Fix error. 2021-04-20 16:53:09 +08:00
tianshujie98
de1f0c0798 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-16 15:12:33 +08:00
tianshujie98
3fc650e112 * Fix bug #12176. 2021-04-16 15:12:16 +08:00
qiyu-xie
251ec077b6 * Fix a bug. 2021-04-16 14:38:47 +08:00
tianshujie98
4aad17c101 * Finish task #37551. 2021-04-15 16:02:02 +08:00
tianshujie98
8c1de08633 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-15 08:21:32 +08:00
tianshujie98
985101a0f0 * Adjust the language items of the block module. 2021-04-15 08:20:46 +08:00
Yagami
38f23c454e * Adjust code. 2021-04-14 15:52:29 +08:00
wangyidong
44a6ed5a8c * fix for bug #11891. 2021-04-09 12:11:48 +08:00
qiyu-xie
117c091bd8 * Adjust the code. 2021-04-07 15:54:00 +08:00
tianshujie98
690d4aa32a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 17:40:46 +08:00
tianshujie98
d0b6699671 * Finish task#37020. 2021-04-01 17:40:15 +08:00
hufangzhou
ee4864a30a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-01 15:48:24 +08:00
hufangzhou
24e7dd0e61 * Finish task #37035. 2021-04-01 15:48:18 +08:00
wangyidong
7567d4436a * fix error. 2021-04-01 15:23:01 +08:00