Commit Graph

256 Commits

Author SHA1 Message Date
Yagami
b181c11e37 * Fix bug #30476. 2022-12-02 15:00:12 +08:00
Yagami
8cb3e136d3 Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_256 2022-12-02 10:48:11 +08:00
Yagami
32424d7072 * Finish task #77800. 2022-12-02 10:39:49 +08:00
lanzongjun
a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
lanzongjun
59c7949f9a change copyproject to copyProject 2022-12-02 09:53:03 +08:00
lanzongjun
8e1172e955 fix cp project js error 2022-12-02 08:50:07 +08:00
孙广明
71f18cd3b3 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix cp project js error

See merge request easycorp/zentaopms!6442
2022-12-01 07:42:25 +00:00
lanzongjun
a13ae45bd1 fix cp project js error 2022-12-01 15:36:17 +08:00
Yagami
cfc70e8176 * Code for task #77800. 2022-12-01 15:15:07 +08:00
Yagami
7a843ece37 * Code for task #77800. 2022-12-01 13:52:46 +08:00
Yagami
6263ee7a5c * Code for task #77801. 2022-12-01 10:34:23 +08:00
Yagami
8e481418df * Finish task #76107. 2022-11-14 16:20:32 +08:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
lanzongjun
506e752d0e * fix bug #26290 2022-11-04 11:04:06 +08:00
wangyidong
3a8ef27bec * code for task #73993. 2022-11-01 08:45:15 +08:00
wangyidong
7050943933 * fix bug #29017. 2022-10-28 15:25:17 +08:00
Yagami
2f04710843 * Finish task #73233. 2022-10-26 15:41:53 +08:00
Yagami
c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
wangyidong
a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tanghucheng
2fbae5ed72 * Finish task #70759. 2022-09-27 11:10:47 +08:00
daitingting
f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
wangyidong
685799b216 * adjust for set no sprint Menu. 2022-09-23 16:22:32 +08:00
lanzongjun
c4c57794ea * fix bug #27788 2022-09-22 14:49:33 +08:00
lanzongjun
bfba29a435 fix noSprint def val 2022-09-22 09:39:48 +08:00
lanzongjun
305e8cd794 * finish task #69698#69703#69704#69705 2022-09-20 08:58:41 +08:00
wangyidong
63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
liugang
fefdfe5b49 * Adjust the vertical align. 2022-09-15 13:07:43 +08:00
liugang
b45b3e3661 * Finish task #68999. 2022-09-14 14:07:00 +08:00
王怡栋
861242917e Merge branch 'sprint/master_zhouxudong_26612' into 'master'
* Fix bug #26612.

See merge request easycorp/zentaopms!5026
2022-08-19 05:11:53 +00:00
王怡栋
2794dbb783 Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882

See merge request easycorp/zentaopms!5022
2022-08-19 05:11:07 +00:00
zhouxudong
6312af0dea * Fix bug #26612. 2022-08-19 03:11:05 +00:00
zhouxudong
fea283edf4 * Finish task #64882. 2022-08-17 06:26:44 +00:00
zhouxudong
49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
wangyidong
901d2b95a0 Merge branch 'sprint/master_zhouxudong_code' 2022-08-10 15:29:23 +08:00
lanzongjun
5f34fa4706 * fix bug #26159 2022-08-10 14:49:20 +08:00
zhouxudong
266fdf9ca7 * Update code. 2022-08-10 05:42:26 +00:00
zhouxudong
ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
lanzongjun
0e75eed65c fix cp project 2022-08-08 18:57:16 +08:00
lanzongjun
5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
lanzongjun
15cce6ebfa fix cp project 2022-08-08 18:18:09 +08:00
zhouxudong
abc59ed7aa * Finish task #63679. 2022-08-07 15:21:43 +00:00
zhouxudong
cf009e9c80 * Reconstruction method. 2022-08-05 01:58:27 +00:00
zhouxudong
545f58f944 * Finish task #62850. 2022-08-03 09:25:08 +00:00
zhouxudong
73ec96dc8f * Finish task #62850. 2022-08-02 09:32:21 +00:00
zhouxudong
6a784fdfda * Finish task #62850. 2022-08-02 08:50:16 +00:00
zhouxudong
364a5009f4 * Finish task #62850. 2022-08-02 07:21:03 +00:00
lanzongjun
e6eff527d2 move code 2022-07-26 14:56:50 +08:00
lanzongjun
e1068f2387 fix bug kanban project enter 2022-07-26 08:37:30 +08:00
lanzongjun
5d3bd547e0 * finish task #62245 2022-07-25 16:12:22 +08:00