Commit Graph

194 Commits

Author SHA1 Message Date
tianshujie98
183bd16df3 * Fix bug #13973. 2021-08-04 16:29:10 +08:00
tianshujie98
d06d09f155 * Modify function comment. 2021-08-03 16:45:48 +08:00
holan20180123
4c621f9f1e * Finish task #40818. 2021-08-03 10:05:13 +08:00
holan20180123
4e578bf78f * Finish task #40819. 2021-08-03 09:23:24 +08:00
wangyidong
bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
wangyidong
3bfa1df846 * fix bug #13954. 2021-07-30 10:48:14 +08:00
tianshujie98
42829fa597 * Adjust page. 2021-07-23 10:39:56 +08:00
tianshujie98
7c0ee909ec * Fix bug #13744. 2021-07-21 11:38:10 +08:00
qiyu-xie
c9ee925c65 * When execution manage products, make the normal product without 'has-branch' class. 2021-07-20 08:24:19 +08:00
zhujinyong
d75f650c7e Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-19 11:59:06 +08:00
zhujinyong
37f44fbbca + Add user and bug api. 2021-07-19 11:58:25 +08:00
hufangzhou
9d181f5493 * Fix bug #13706. 2021-07-19 09:17:05 +08:00
holan20180123
25a3320c75 * Finish task #40315. 2021-07-16 10:57:51 +08:00
zhujinyong
6f04aedcd3 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:44:23 +08:00
zhujinyong
1677574443 * return before $this->send. 2021-07-16 09:40:41 +08:00
dingguodong
bb7f7cf142 * Remove duplicated loadModel for gitlab related after CR. 2021-07-15 13:53:04 +08:00
zenggang
c29583f980 * finish task #40111 2021-07-14 14:44:48 +08:00
qiyu-xie
a7f8cd98c4 * Fix a bug. 2021-07-14 13:48:19 +08:00
zenggang
182b8217f3 finish task #40111 2021-07-14 13:42:30 +08:00
qiyu-xie
d7cc954aca * Adjust project order at execution kanban. 2021-07-14 11:14:59 +08:00
Guan Xiying
1c802f2a36 Merge branch 'jihu' 2021-07-14 09:48:58 +08:00
qiyu-xie
1f7e04e6f0 * Add no data tips when look execution kanban. 2021-07-14 09:31:50 +08:00
hufangzhou
a4db5380eb * Finish task #40000. 2021-07-13 18:20:48 +08:00
qiyu-xie
9d4e2a4dd1 * Fix a bug. 2021-07-13 15:26:19 +08:00
qiyu-xie
da283bc32d * Fix a bug. 2021-07-13 15:17:02 +08:00
qiyu-xie
6c598c245a * Finish task#40009. 2021-07-13 11:24:28 +08:00
wangyidong
9d95d960e5 * finish task #40005. 2021-07-13 09:38:27 +08:00
Yagami
2ba786263c * Finish task #40104. 2021-07-12 14:09:25 +08:00
qiyu-xie
ccc8c97aaa * Finish task#40008. 2021-07-08 10:14:23 +08:00
wangyidong
fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
lichengjun
f04514f65d * Fix code format. 2021-07-06 16:43:04 +08:00
wangyidong
f3681dc1f6 * adjust for gitlab. 2021-07-02 15:00:07 +08:00
wangyidong
c287a0cb49 * adjust code. 2021-07-01 16:56:59 +08:00
holan20180123
203f0984d9 * Adjust execution link plan. 2021-06-29 08:57:48 +08:00
holan20180123
6f7b82a051 * Fix bug #12406. 2021-06-28 16:37:02 +08:00
Yagami
93430eae9f * Fix details. 2021-06-16 13:20:19 +08:00
wangyidong
4d5bacb823 * adjust for web page. 2021-06-11 16:51:28 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
wangyidong
e858eb9d98 * fix bug. 2021-06-04 15:36:26 +08:00
holan20180123
5389de2709 * Adjust code for review. 2021-06-04 08:51:45 +08:00
qiyu-xie
27538bc017 * Finish task#38637. 2021-06-01 14:39:00 +08:00
wangyidong
e56f9d04bb Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-05-20 16:56:04 +08:00
wangyidong
1cae502aee * adjust for web html. 2021-05-20 16:55:12 +08:00
holan20180123
69fa5c6b6c * Fix bug #12737. 2021-05-20 11:14:45 +08:00
holan20180123
10a17aaf42 * Fix bug #12710. 2021-05-19 15:19:57 +08:00
holan20180123
ceed7f755d * Fix bug #12654. 2021-05-19 11:21:55 +08:00
holan20180123
729c3c4891 * Fix bug #12714. 2021-05-19 11:04:01 +08:00
holan20180123
8da9b93845 * Fix bug #12654. 2021-05-19 09:51:19 +08:00
holan20180123
daf14af385 * Finish task #38180. 2021-05-14 14:32:26 +08:00
holan20180123
6d00f3253a * Fix bug #12626. 2021-05-13 17:10:34 +08:00