 xieqiyu
|
4da9aac7c3
|
* Fix bug#26177.
|
2022-08-12 13:49:10 +08:00 |
|
|
zhouxudong
|
7826781cff
|
* Fix bug.
|
2022-08-11 08:53:49 +00:00 |
|
|
胡方舟
|
3509dfa1fa
|
Merge branch 'spirnt/224_tianshujie_bug' into 'master'
Spirnt/224 tianshujie bug
See merge request easycorp/zentaopms!4912
|
2022-08-11 01:39:52 +00:00 |
|
|
王怡栋
|
7c2d2b54eb
|
Merge branch 'master' into 'master_liuhong_63787'
# Conflicts:
# module/program/css/browse.css
# module/project/css/browse.css
|
2022-08-11 01:22:50 +00:00 |
|
|
liuhong
|
f713f01ee7
|
*Finish task #63787.
|
2022-08-11 00:49:21 +00:00 |
|
|
tianshujie
|
ad2cab0eff
|
* Fix bug #26186.
|
2022-08-11 08:34:12 +08:00 |
|
|
王怡栋
|
de30066a3b
|
Merge branch 'master_liuhong_63787' into 'master'
Master liuhong 63787
See merge request easycorp/zentaopms!4902
|
2022-08-10 08:11:31 +00:00 |
|
|
xieqiyu
|
0495adaae1
|
* Code for task#63787.
|
2022-08-10 15:54:35 +08:00 |
|
|
wangyidong
|
901d2b95a0
|
Merge branch 'sprint/master_zhouxudong_code'
|
2022-08-10 15:29:23 +08:00 |
|
|
zhouxudong
|
c54ef7b6d6
|
* Finish task.
|
2022-08-10 07:24:44 +00:00 |
|
|
zhouxudong
|
0b570616f1
|
Merge branch 'sprint/master_zhouxudong_code' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_zhouxudong_code
|
2022-08-10 07:21:02 +00:00 |
|
|
zhouxudong
|
5366bb35b3
|
* Finish task.
|
2022-08-10 07:20:24 +00:00 |
|
|
王怡栋
|
af7904f9f1
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/project/view/create.html.php
|
2022-08-10 07:19:51 +00:00 |
|
|
xieqiyu
|
bd18594c80
|
* Code for task#63579.
|
2022-08-10 15:09:57 +08:00 |
|
|
lanzongjun
|
5f34fa4706
|
* fix bug #26159
|
2022-08-10 14:49:20 +08:00 |
|
|
xieqiyu
|
2f6d225550
|
* Code for task#62851.
|
2022-08-10 13:55:03 +08:00 |
|
|
zhouxudong
|
266fdf9ca7
|
* Update code.
|
2022-08-10 05:42:26 +00:00 |
|
|
xieqiyu
|
f8cf3855d2
|
* Code for task#63581.
|
2022-08-10 13:04:40 +08:00 |
|
|
liuhong
|
0c2b54ade7
|
*Finish task #63787.
|
2022-08-10 03:57:22 +00:00 |
|
|
tianshujie
|
6d662334f9
|
* Fix bug #26167.
|
2022-08-10 10:16:23 +08:00 |
|
|
wangyidong
|
9959006f46
|
* change upgrade for change engine.
|
2022-08-10 09:43:40 +08:00 |
|
|
zhouxudong
|
01c75c8370
|
* Finish task.
|
2022-08-09 15:08:33 +00:00 |
|
|
xieqiyu
|
930d72178e
|
* Code for task#63790.
|
2022-08-09 22:39:41 +08:00 |
|
|
liuhong
|
61839c50a8
|
*Finish task #63787.
|
2022-08-09 14:31:37 +00:00 |
|
|
zhouxudong
|
808d01aa17
|
* Finish task.
|
2022-08-09 09:43:34 +00:00 |
|
|
zhouxudong
|
3cc9977663
|
* Finisha task.
|
2022-08-09 05:49:27 +00:00 |
|
|
王怡栋
|
6ba5f3bd67
|
Merge branch 'master_liuhong_35865' into 'master'
Master liuhong 35865
See merge request easycorp/zentaopms!4857
|
2022-08-09 05:34:18 +00:00 |
|
|
王怡栋
|
ff55e9ca2e
|
Merge branch 'master_liuhong_63772' into 'master'
* Code for task#63772. Fix bug of plan empty when at the page of project bug...
See merge request easycorp/zentaopms!4854
|
2022-08-09 05:33:04 +00:00 |
|
|
xieqiyu
|
8a159ba714
|
* Code for task#63772. Fix bug of plan empty when at the page of project bug and execution bug in all product.
|
2022-08-09 09:39:58 +08:00 |
|
|
zhouxudong
|
ef847f1169
|
* Finish task #63581.
|
2022-08-08 14:37:33 +00:00 |
|
|
liuhong
|
a2adce2bb6
|
*Finish task #35865.
|
2022-08-08 13:39:32 +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
|
e56f5c8082
|
* Update code.
|
2022-08-05 07:39:23 +00:00 |
|
|
tanghucheng
|
5d3b1f4496
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-05 14:59:12 +08:00 |
|
|
王怡栋
|
86693cfb4f
|
Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix sprint211 problems.
See merge request easycorp/zentaopms!4818
|
2022-08-05 06:48:01 +00:00 |
|
|
王怡栋
|
a1518aaf67
|
Merge branch 'master_liuhong_25973' into 'master'
*Fix bug #25973
See merge request easycorp/zentaopms!4823
|
2022-08-05 06:45:43 +00:00 |
|
|
zhouxudong
|
0e5fccdc46
|
* Update code.
|
2022-08-05 06:20:54 +00:00 |
|
|
liuhong
|
3f62f19b7f
|
*Fix bug #25973
|
2022-08-05 06:17:05 +00:00 |
|
|
zhouxudong
|
03ed6c4dfe
|
* Update code.
|
2022-08-05 05:50:15 +00:00 |
|
|
zhouxudong
|
e3ea94dd9b
|
* Update code.
|
2022-08-05 05:31:38 +00:00 |
|
|
zenggang
|
262ab9e5cd
|
* Fix sprint211 problems.
|
2022-08-05 05:19:47 +00:00 |
|
|
tanghucheng
|
3bfdc7d342
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-08-05 13:07:31 +08:00 |
|
|
孙广明
|
9f323c631a
|
Merge branch 'lyk_26002_25249' into 'master'
Lyk 26002 25249
See merge request easycorp/zentaopms!4816
|
2022-08-05 03:34:42 +00:00 |
|
|
zhouxudong
|
cf009e9c80
|
* Reconstruction method.
|
2022-08-05 01:58:27 +00:00 |
|
|
wangyidong
|
1204fcf8db
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-05 08:46:32 +08:00 |
|
|
wangyidong
|
7796bc8499
|
Merge branch 'sprint/devplat_30'
|
2022-08-05 08:46:26 +08:00 |
|
|
王怡栋
|
7269c3a85e
|
Merge branch 'master_xieqiyu_26019' into 'master'
* Fix bug#26019.
See merge request easycorp/zentaopms!4805
|
2022-08-05 00:40:25 +00:00 |
|