 王怡栋
|
de8934a593
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* add import white list
See merge request easycorp/zentaopms!5109
|
2022-08-25 03:20:27 +00:00 |
|
|
lanzongjun
|
b964b5e17a
|
* add import white list
|
2022-08-25 10:20:05 +08:00 |
|
|
liumengyi
|
723093c840
|
* Fix bug for task #65808.
|
2022-08-25 10:01:58 +08:00 |
|
|
liumengyi
|
c033a87009
|
* Fix bug #26845.
|
2022-08-24 17:19:59 +08:00 |
|
|
孙广明
|
01c6c2fa7a
|
Merge branch 'sprint/max43_mayue_task#65893' into 'master'
* Finish task #65893.
See merge request easycorp/zentaopms!5089
|
2022-08-24 07:29:34 +00:00 |
|
|
mayue
|
b64081a30e
|
* Finish task #65893.
|
2022-08-24 14:56:00 +08:00 |
|
|
liumengyi
|
c95ecbd1a6
|
* Optimize code for task #65808.
|
2022-08-23 16:19:20 +08:00 |
|
|
liumengyi
|
06c64d7e6f
|
* Optimize code for task #65808, #65807.
|
2022-08-23 15:48:47 +08:00 |
|
|
tianshujie
|
4e1ca8bd60
|
* Finish task #65808.
|
2022-08-23 13:40:34 +08:00 |
|
|
liumengyi
|
20041ea696
|
* Fix bug #26723.
|
2022-08-22 11:12:38 +08:00 |
|
|
sunguangming
|
9d52e47151
|
Merge branch 'sprint/228_tianshujie_64967'
|
2022-08-22 10:24:40 +08:00 |
|
|
tianshujie
|
ee63dc4f17
|
* Finish task #64967.
|
2022-08-22 09:24:18 +08:00 |
|
|
李玉春
|
6399c58056
|
Merge branch 'sprint/228_tianshujie_64976' into 'master'
Sprint/228 tianshujie 64976
See merge request easycorp/zentaopms!5017
|
2022-08-18 09:57:34 +00:00 |
|
|
tianshujie
|
98694da2ae
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-18 16:47:14 +08:00 |
|
|
胡方舟
|
2027a69923
|
Merge branch 'sprint/228' into 'master'
Sprint/228
See merge request easycorp/zentaopms!5015
|
2022-08-18 07:53:30 +00:00 |
|
|
曾刚
|
3172961404
|
Sprint/228 zg tasks and units
|
2022-08-18 07:15:14 +00:00 |
|
|
tianshujie
|
c0e97a501c
|
* Finish task #64976.
|
2022-08-18 14:33:10 +08:00 |
|
|
王怡栋
|
f3d49ef75f
|
Merge branch 'sprint/max42_mayue_task#64939' into 'master'
Sprint/max42 mayue task#64939
See merge request easycorp/zentaopms!5010
|
2022-08-18 05:54:12 +00:00 |
|
|
tianshujie
|
884d6fa30a
|
* Finish task #64967.
|
2022-08-18 13:44:04 +08:00 |
|
|
tianshujie
|
df8c9caf46
|
* Finish task #64967.
|
2022-08-17 16:37:02 +08:00 |
|
|
mayue
|
e95ecf9244
|
* Finish task #64939.
|
2022-08-17 16:20:17 +08:00 |
|
|
caoyanyi
|
8c1a24d3b5
|
Merge branch 'master' into zenops_41
|
2022-08-17 16:03:23 +08:00 |
|
|
tianshujie
|
619068ea8d
|
* Finish task #64967.
|
2022-08-17 15:40:01 +08:00 |
|
|
tianshujie
|
24e39026cc
|
* Finish task #64967.
|
2022-08-16 17:07:27 +08:00 |
|
|
tanghucheng
|
68f35f5262
|
* Fix bug #26520,26520.
|
2022-08-16 13:58:19 +08:00 |
|
|
tanghucheng
|
517fd4b79e
|
* Fix bug for gantt menu.
|
2022-08-15 15:44:47 +08:00 |
|
|
tanghucheng
|
2bc6e7a1e8
|
* Sort execution and project gantt menu .
|
2022-08-15 14:28:31 +08:00 |
|
|
liyuchun
|
a4b8a6eba2
|
Merge branch 'master' into zenops_41
|
2022-08-15 09:38:48 +08:00 |
|
|
wangyidong
|
9a3513a15c
|
* change for change table engine.
|
2022-08-12 16:11:35 +08:00 |
|
|
caoyanyi
|
e45d44ccaa
|
Merge branch 'master' into zenops_41
|
2022-08-11 16:04:36 +08:00 |
|
|
leiyong
|
489fa70400
|
* Fix single sign-on.
|
2022-08-11 01:54:32 +00:00 |
|
|
liyuchun
|
6c2cacf02c
|
Merge branch 'master' into zenops_41
|
2022-08-10 08:26:42 +00:00 |
|
|
tanghucheng
|
824b9219d9
|
* Code for gantt.
|
2022-08-10 13:34:57 +08:00 |
|
|
tianshujie
|
93d0a62707
|
* Finish task #63692.
|
2022-08-09 11:47:27 +08:00 |
|
|
孙广明
|
fe0f69fc77
|
Merge branch 'lyk_64217' into 'master'
* Finish task #64217
See merge request easycorp/zentaopms!4844
|
2022-08-08 08:59:22 +00:00 |
|
|
王怡栋
|
22bf2d8058
|
Merge branch 'sprint/hufangzhou_62965' into 'master'
* Finish task #62965. Fix bug #26130, #26129, #26120.
See merge request easycorp/zentaopms!4843
|
2022-08-08 08:47:08 +00:00 |
|
|
王怡栋
|
9e6111ad6c
|
Merge branch 'master' into 'sprint/devplat_30'
# Conflicts:
# db/update17.4.sql
|
2022-08-08 08:44:25 +00:00 |
|
|
liuyongkai
|
da82407e9d
|
* Finish task #64217
|
2022-08-08 08:37:53 +00:00 |
|
|
hufangzhou
|
b44ed94231
|
* Finish task #62965. Fix bug #26130, #26129, #26120.
|
2022-08-08 16:31:20 +08:00 |
|
|
王怡栋
|
3cc4c75950
|
Merge branch 'sprint/221_tianshujie_issue' into 'master'
Sprint/221 tianshujie issue
See merge request easycorp/zentaopms!4810
|
2022-08-05 02:34:09 +00:00 |
|
|
王怡栋
|
7cbbcc9cad
|
Merge branch 'lyk_25879' into 'master'
* Fix bug 25879.
See merge request easycorp/zentaopms!4792
|
2022-08-05 02:25:35 +00:00 |
|
|
tianshujie
|
e6ddd61174
|
* Finish task #62948.
|
2022-08-05 09:36:56 +08:00 |
|
|
wangyuting2
|
9021138b70
|
* Adjust featurebar sort to config.
|
2022-08-05 09:01:31 +08:00 |
|
|
lanzongjun
|
fa254f518e
|
resolve conflict
|
2022-08-05 08:49:49 +08:00 |
|
|
lanzongjun
|
f241846903
|
resolve conflict
|
2022-08-05 08:43:09 +08:00 |
|
|
wangyuting2
|
5bc8123a58
|
* Add note.
|
2022-08-03 17:06:56 +08:00 |
|
|
wangyuting2
|
afba28db68
|
* Add project execution approval menu.
|
2022-08-03 16:48:10 +08:00 |
|
|
wangyuting2
|
731e5a4161
|
* Fix warring.
|
2022-08-03 14:35:54 +08:00 |
|
|
wangyuting2
|
84c6278274
|
* Finish task #63288.
|
2022-08-03 13:32:41 +08:00 |
|
|
liuyongkai
|
c45499b497
|
* Fix bug 25879.
|
2022-08-02 06:33:56 +00:00 |
|