 tianshujie
|
6bbff6043e
|
Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-22 09:24:30 +08:00 |
|
|
tianshujie
|
ee63dc4f17
|
* Finish task #64967.
|
2022-08-22 09:24:18 +08:00 |
|
|
liumengyi
|
ee19dd6d4a
|
* Fix bug for task #64967.
|
2022-08-22 09:22:39 +08:00 |
|
|
tianshujie
|
c990e09f61
|
* Finish task #64967.
|
2022-08-19 16:29:53 +08:00 |
|
|
tianshujie
|
36347984e3
|
* Finish task #64967.
|
2022-08-19 14:41:30 +08:00 |
|
|
tianshujie
|
2cccab4c6b
|
Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-19 14:02:06 +08:00 |
|
|
liumengyi
|
753f86b7f4
|
Merge branch 'sprint/228_tianshujie_64967' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-18 16:50:34 +08:00 |
|
|
liumengyi
|
ea5d22cc05
|
* Finish task #64967 for upgrade.
|
2022-08-18 16:49:22 +08:00 |
|
|
liumengyi
|
89d67fcfe8
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/228_tianshujie_64967
|
2022-08-18 16:47:44 +08: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 |
|
|
tianshujie
|
6cb34d72b6
|
* Resolve issue #718.
|
2022-08-18 16:36:27 +08:00 |
|
|
王怡栋
|
93b0c0efee
|
Merge branch 'sprint/228_tianshujie_63687' into 'master'
* Finish task #63687.
See merge request easycorp/zentaopms!5016
|
2022-08-18 08:14:01 +00:00 |
|
|
tianshujie
|
88eb976835
|
* Finish task #63687.
|
2022-08-18 16:12:16 +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 |
|
|
王怡栋
|
29443f8d2a
|
Merge branch 'sprint/228_zg_tasks' into 'sprint/228'
Sprint/228 zg tasks and units
See merge request easycorp/zentaopms!4999
|
2022-08-18 07:15:15 +00:00 |
|
|
曾刚
|
3172961404
|
Sprint/228 zg tasks and units
|
2022-08-18 07:15:14 +00:00 |
|
|
tianshujie
|
399f6b53d9
|
* Finish task #64967.
|
2022-08-18 15:08:07 +08:00 |
|
|
tianshujie
|
249c5c9cb1
|
* Finish task #64967.
|
2022-08-18 14:53:00 +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 |
|
|
李玉春
|
ae0ee026cc
|
Merge branch 'zenops_41' into 'master'
Zenops 41
See merge request easycorp/zentaopms!5013
|
2022-08-18 05:21:42 +00:00 |
|
|
liyuchun
|
9da91f6d91
|
* Add update sql.
|
2022-08-18 13:21:12 +08:00 |
|
|
liyuchun
|
bbe6ce4983
|
Merge branch 'zenops_41' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_41
|
2022-08-18 13:20:35 +08:00 |
|
|
liyuchun
|
2ccdc2c118
|
* Edit db file name.
|
2022-08-18 13:20:10 +08:00 |
|
|
王怡栋
|
c586a24d50
|
Merge branch 'sprint/228_liumengyi_65551' into 'sprint/228'
* Finish task #65551.
See merge request easycorp/zentaopms!5014
|
2022-08-18 05:05:08 +00:00 |
|
|
王怡栋
|
308fb3d2ee
|
Merge branch 'sprint/228_liumengyi_25319' into 'master'
* Fix bug #25319.
See merge request easycorp/zentaopms!4991
|
2022-08-18 05:02:22 +00:00 |
|
|
liumengyi
|
62d465d047
|
* Finish task #65551.
|
2022-08-18 11:22:16 +08:00 |
|
|
朱金勇
|
3cf6c73263
|
Merge branch 'sprint/remove-composer' into 'master'
- Remove composer.json.
See merge request easycorp/zentaopms!5009
|
2022-08-18 03:16:25 +00:00 |
|
|
王怡栋
|
1f9b619a4e
|
Merge branch 'sprint/ZUI_guofeilong_add_icon_subreview_user' into 'master'
* Add zentaoIcon sub-review-user
See merge request easycorp/zentaopms!5012
|
2022-08-18 02:53:58 +00:00 |
|
|
tianshujie
|
8287baa6dc
|
* Finish task #63696.
|
2022-08-18 10:45:58 +08:00 |
|
|
tianshujie
|
46071ffaec
|
* Finish task #63696.
|
2022-08-18 10:42:06 +08:00 |
|
|
caoyanyi
|
7b71377d3c
|
Merge branch 'master' into zenops_41
|
2022-08-18 10:37:47 +08:00 |
|
|
liumengyi
|
ce3e1bf617
|
* Finish task #64967.
|
2022-08-18 10:37:17 +08:00 |
|
|
guofeilong
|
04178d6624
|
* Add zentaoIcon sub-review-user
|
2022-08-18 02:27:42 +00:00 |
|
|
tianshujie
|
9cd4212ef7
|
i* Finish task #63696.
|
2022-08-18 10:23:41 +08:00 |
|
|
tianshujie
|
0ea6aa7b27
|
* Finish task #63696.
|
2022-08-18 10:04:09 +08:00 |
|
|
mayue
|
a48a15cdb1
|
* Ajust codes about stage setType.
|
2022-08-18 09:31:29 +08:00 |
|
|
Lufei
|
34ac7b70e5
|
- Remove composer.json.
zentaopms is not published in packagist and the dependencies in the file are outdated
|
2022-08-18 09:16:53 +08:00 |
|
|
sunguangming
|
ef679444bd
|
* Code for file checkpriv bug.
zentaopms_17.5
|
2022-08-18 08:47:49 +08:00 |
|
|
mayue
|
b3801a92a6
|
* Optimize code.
|
2022-08-18 08:47:31 +08:00 |
|
|
sunguangming
|
b175607c41
|
* Code for file checkpriv bug.
|
2022-08-18 08:25:37 +08:00 |
|
|
liumengyi
|
a998967592
|
* Finish task #65551.
|
2022-08-18 08:21:33 +08:00 |
|
|
liumengyi
|
73253183bc
|
* Finish task #64967.
|
2022-08-17 17:10:10 +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 |
|
|
王怡栋
|
fe898f9e20
|
Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687
See merge request easycorp/zentaopms!4985
|
2022-08-17 07:33:25 +00:00 |
|
|
王怡栋
|
74b66c9bb3
|
Merge branch 'master_xieqiyu_26414' into 'master'
* Fix bug#26414.
See merge request easycorp/zentaopms!4994
|
2022-08-17 07:22:40 +00:00 |
|
|
xieqiyu
|
6f6491148a
|
* Fix bug#26414.
|
2022-08-17 15:19:53 +08:00 |
|