 王怡栋
|
03ea51fe76
|
Merge branch 'sprint/231_dongli_64973' into 'master'
* Finish task #64972,64973,64969.
See merge request easycorp/zentaopms!5076
|
2022-08-24 01:14:44 +00:00 |
|
|
王怡栋
|
0036bac572
|
Merge branch 'master_liuhong_26000' into 'master'
*Fix bug #26000.
See merge request easycorp/zentaopms!5047
|
2022-08-24 00:46:46 +00:00 |
|
|
dongli
|
f3b8e63376
|
* Finsh task #64972,64973,64969.
|
2022-08-23 10:46:03 +00:00 |
|
|
liuhong
|
329238d8cd
|
*Fix bug #26000.
|
2022-08-23 09:23:09 +00:00 |
|
|
王怡栋
|
2a49655e2d
|
Merge branch 'sprint/master_zhouxudong_update64888' into 'master'
* Optimization task #64888.
See merge request easycorp/zentaopms!5037
|
2022-08-23 01:49:31 +00:00 |
|
|
xieqiyu
|
99e4534f38
|
Merge branch 'master' into master_xieqiyu_draftStory
|
2022-08-22 17:29:21 +08:00 |
|
|
zhouxudong
|
005533579d
|
* Update code.
|
2022-08-22 06:02:02 +00:00 |
|
|
zhouxudong
|
fad466d711
|
* Batch edit append ignore prompt.
|
2022-08-22 05:05:49 +00:00 |
|
|
zhouxudong
|
a49c03134c
|
* Batch edit append ignore prompt.
|
2022-08-22 05:04:47 +00:00 |
|
|
zhouxudong
|
a4bb6e0c3e
|
* Batch edit append ignore prompt.
|
2022-08-22 04:06:20 +00:00 |
|
|
zhouxudong
|
41862bf81c
|
* Batch edit append ignore.
|
2022-08-22 02:20:05 +00:00 |
|
|
zhouxudong
|
faf66f2d63
|
* Optimization task #64888.
|
2022-08-19 07:51:38 +00:00 |
|
|
liuhong
|
7d89582ab7
|
*Fix bug #26000.
|
2022-08-19 07:10:02 +00:00 |
|
|
zhouxudong
|
000f8842e8
|
* Fix bug.
|
2022-08-19 06:55:39 +00:00 |
|
|
dongli
|
e3800e4e49
|
* Finish task #64969.
|
2022-08-19 05:31:03 +00:00 |
|
|
dongli
|
9fa036cb34
|
Revert "* Finish task #64969."
This reverts commit bacc10ccc0.
|
2022-08-19 05:31:02 +00:00 |
|
|
dongli
|
93adfc3971
|
* Finish task #64969.
|
2022-08-19 05:31:02 +00: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
|
b058344542
|
* Fix bug #26612.
|
2022-08-19 03:07:13 +00:00 |
|
|
zhouxudong
|
9dbfa8b99b
|
* FInish task #64882.
|
2022-08-19 02:22:42 +00:00 |
|
|
zhouxudong
|
0a3c297b43
|
* Finish task #64882.
|
2022-08-19 02:18:16 +00:00 |
|
|
zhouxudong
|
3435040a3f
|
* Finish task #64882.
|
2022-08-19 01:55:48 +00:00 |
|
|
王怡栋
|
5d28a2973f
|
Merge branch 'sprint/229' into 'master'
Sprint/229
See merge request easycorp/zentaopms!5018
|
2022-08-19 00:50:35 +00:00 |
|
|
zhouxudong
|
9883b69c7d
|
* Finish task #64882.
|
2022-08-18 09:21:35 +00:00 |
|
|
胡方舟
|
2027a69923
|
Merge branch 'sprint/228' into 'master'
Sprint/228
See merge request easycorp/zentaopms!5015
|
2022-08-18 07:53:30 +00:00 |
|
|
zhouxudong
|
39007e35b2
|
Merge branch 'sprint/229_zhouxudong_64888' into sprint/229
|
2022-08-17 07:15:55 +00:00 |
|
|
王怡栋
|
3a3477b3c3
|
Merge branch 'sprint/master_zhouxudong_63580' into 'sprint/229'
Sprint/master zhouxudong 63580
See merge request easycorp/zentaopms!4986
|
2022-08-17 06:43:24 +00:00 |
|
|
zhouxudong
|
fea283edf4
|
* Finish task #64882.
|
2022-08-17 06:26:44 +00:00 |
|
|
zhouxudong
|
5c71d7d0b3
|
* Finish task #63580.
|
2022-08-17 02:10:45 +00:00 |
|
|
zhouxudong
|
49d654cabc
|
* Finish task #64888.
|
2022-08-16 05:37:22 +00:00 |
|
|
lanzongjun
|
572021a1bd
|
* fix params
|
2022-08-16 13:06:58 +08:00 |
|
|
lanzongjun
|
4b21f31e5c
|
* fix bug #26462
|
2022-08-16 11:22:57 +08:00 |
|
|
lanzongjun
|
5b380fedb4
|
* fix bug cp project
|
2022-08-16 09:19:27 +08:00 |
|
|
tianshujie
|
72ef1b0ebd
|
* Refactor the getStats method under the project.
|
2022-08-15 15:59:42 +08:00 |
|
|
xieqiyu
|
17773dee90
|
* Code for story of add draft status.
|
2022-08-12 16:00:00 +08:00 |
|
|
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 |
|
|
zhouxudong
|
fc5f9013e5
|
* Finish task #63580.
|
2022-08-11 08:33:14 +00:00 |
|
|
zhouxudong
|
04247b0533
|
* Finish task #63580.
|
2022-08-11 07:00:06 +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 |
|
|
zhouxudong
|
40909f0195
|
* Fix bug.
|
2022-08-11 01:28:21 +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 |
|