mayue
|
d5bc70122f
|
* Fix bug #23320.
|
2022-06-06 16:33:00 +08:00 |
|
xieqiyu
|
0bfb4cea16
|
* Fix bug#23156.
|
2022-06-06 00:45:22 +08:00 |
|
tianshujie
|
10b763fdf2
|
* Fix bug #23230.
|
2022-06-02 16:35:48 +08:00 |
|
孙广明
|
ea678a3736
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23132.
See merge request easycorp/zentaopms!3710
|
2022-06-02 05:55:29 +00:00 |
|
liyuchun
|
29ceb63023
|
* Fix bug #23132.
|
2022-06-02 02:49:27 +00:00 |
|
xieqiyu
|
c1bc3c7d41
|
* Fix bug of select main branch.
|
2022-06-01 20:44:31 +08:00 |
|
xieqiyu
|
5f5f721d19
|
* Finish task#55631.
|
2022-06-01 00:26:43 +08:00 |
|
tianshujie
|
a9021ec5a3
|
* Fix bug #23010.
|
2022-05-27 14:15:59 +08:00 |
|
tianshujie
|
93943c76dc
|
* Finish issue #649.
|
2022-05-27 13:26:12 +08:00 |
|
liumengyi
|
5df98760ae
|
* Fix bug #22995.
|
2022-05-26 16:38:06 +08:00 |
|
leiyong
|
6c1d71c837
|
* Finish task#54980.
|
2022-05-26 03:24:37 +00:00 |
|
孙广明
|
9fe66976f5
|
Merge branch 'sprint/192_leiyong_issue_645' into 'master'
* Issue 645 resolved.
See merge request easycorp/zentaopms!3586
|
2022-05-25 05:49:31 +00:00 |
|
daitingting
|
3a3549078f
|
* Remove useless object param.
|
2022-05-25 01:19:49 +00:00 |
|
daitingting
|
e2f7c10296
|
* Set default value in getFieldControl function, finish task #54954.
|
2022-05-25 01:03:06 +00:00 |
|
xieqiyu
|
23e2c29c1a
|
* Finish task#54989.
|
2022-05-24 17:04:09 +08:00 |
|
xieqiyu
|
d9bbc81938
|
* Finish task#54989.
|
2022-05-24 16:23:54 +08:00 |
|
李玉春
|
03469dbd1e
|
Merge branch 'sprint/194_tianshujie_14741' into 'master'
Sprint/194 tianshujie 14741
See merge request easycorp/zentaopms!3557
|
2022-05-24 05:39:25 +00:00 |
|
tianshujie
|
63b5d64dc8
|
* Finish task #14741.
|
2022-05-24 13:38:11 +08:00 |
|
tianshujie
|
e9bf958a3c
|
* Finish task #55253.
|
2022-05-24 13:28:16 +08:00 |
|
wangyidong
|
967d24dd06
|
Merge branch 'sprint/189_package'
|
2022-05-24 10:32:09 +08:00 |
|
tianshujie
|
02bee27596
|
* Finish story #14741.
|
2022-05-24 10:11:08 +08:00 |
|
leiyong
|
993138a2d1
|
* Issue 645 resolved.
|
2022-05-20 10:05:28 +00:00 |
|
xieqiyu
|
063fba9ddf
|
* Code for task#54463. Modify review code.
|
2022-05-20 14:03:05 +08:00 |
|
xieqiyu
|
1c06ae03f1
|
* Code for task#54463.
|
2022-05-20 13:18:57 +08:00 |
|
xieqiyu
|
c07f0dbdab
|
* Finish task#54463.
|
2022-05-20 12:37:26 +08:00 |
|
tianshujie
|
2f751595cc
|
* Resoled issue #640.
|
2022-05-19 16:25:58 +08:00 |
|
wangyidong
|
8aad51ace3
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-05-18 10:29:11 +08:00 |
|
wangyidong
|
d6cf08b9d7
|
Merge branch 'tid'
|
2022-05-18 10:20:48 +08:00 |
|
liumengyi
|
5bdc188491
|
* Code format for bug #22585.
|
2022-05-18 10:12:42 +08:00 |
|
liumengyi
|
b4a34e2ed6
|
* Fix bug #22585.
|
2022-05-18 10:10:06 +08:00 |
|
liumengyi
|
bff314e0d4
|
* Modify code for task #54354.
|
2022-05-17 17:26:17 +08:00 |
|
tanghucheng
|
d3dc4ebe43
|
* Fix bug.
|
2022-05-17 06:00:26 +00:00 |
|
wangyuting2
|
3380222afc
|
* Fix build action menu bug.
|
2022-05-11 16:11:34 +08:00 |
|
wangyuting2
|
d4ed89e64a
|
* Finish task #53548.
|
2022-05-11 15:05:13 +08:00 |
|
王怡栋
|
d9d331c38e
|
Merge branch 'master' into 'sprint/wangyuting_workflow'
# Conflicts:
# framework/control.class.php
|
2022-05-10 08:46:32 +00:00 |
|
wangyuting2
|
fe3c882c5e
|
* Adjust buildin workflow menu.
|
2022-05-10 16:32:04 +08:00 |
|
daitingting
|
d577d57a33
|
* Add id for checking unique field.
|
2022-05-09 17:02:23 +08:00 |
|
daitingting
|
e30acad1f2
|
* Add id for checking unique field.
|
2022-05-09 07:56:17 +00:00 |
|
daitingting
|
96e460c47d
|
* Finish task #53549.
|
2022-05-09 06:41:35 +00:00 |
|
hufangzhou
|
90265f93d8
|
* Add the new version.
|
2022-05-06 13:48:21 +08:00 |
|
李玉春
|
06a38f17e3
|
Merge branch 'sprint/renying_Fixbug#21999' into 'master'
Sprint/renying fixbug#21999
See merge request easycorp/zentaopms!3215
|
2022-04-29 05:34:30 +00:00 |
|
renying
|
d17854d07d
|
Fixbug#21999
|
2022-04-29 05:11:53 +00:00 |
|
xieqiyu
|
88fbdad2fd
|
* Fix bug#22114.
|
2022-04-29 11:29:40 +08:00 |
|
renying
|
a2430ed507
|
Fixbug#21999
|
2022-04-29 03:13:32 +00:00 |
|
renying
|
e06c2e8666
|
Fixbug#21999
|
2022-04-29 03:10:49 +00:00 |
|
renying
|
6a5e9b8657
|
Fixbug#21999
|
2022-04-29 02:50:51 +00:00 |
|
孙广明
|
8d8b999608
|
Merge branch 'fixbug_sunjun_17329' into 'master'
*Fixbug_sunjun_17329
See merge request easycorp/zentaopms!3188
|
2022-04-28 06:23:11 +00:00 |
|
sunjun
|
7f7f3013ea
|
*Fixbug_sunjun_17329
|
2022-04-28 06:18:13 +00:00 |
|
liyuchun
|
537c1bea2d
|
* Fix bug #15039.
|
2022-04-28 02:06:10 +00:00 |
|
zhouxudong
|
06cd4caa4d
|
* Fix bug #22024.
|
2022-04-27 01:55:30 +00:00 |
|