 王怡栋
|
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 |
|
|
liuhong
|
329238d8cd
|
*Fix bug #26000.
|
2022-08-23 09:23:09 +00:00 |
|
|
xieqiyu
|
99e4534f38
|
Merge branch 'master' into master_xieqiyu_draftStory
|
2022-08-22 17:29:21 +08:00 |
|
|
liuhong
|
7d89582ab7
|
*Fix bug #26000.
|
2022-08-19 07:10:02 +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 |
|
|
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 |
|
|
tianshujie
|
6d662334f9
|
* Fix bug #26167.
|
2022-08-10 10:16:23 +08: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 |
|
|
liuhong
|
a2adce2bb6
|
*Finish task #35865.
|
2022-08-08 13:39:32 +00: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 |
|
|
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 |
|
|
xieqiyu
|
f9f47e14cb
|
* Fix bug#26019.
|
2022-08-05 08:32:27 +08:00 |
|
|
wangyuting2
|
1b2f9f68e6
|
* Adjust assetlib caselib approval menu.
|
2022-08-04 13:47:12 +08:00 |
|
|
王怡栋
|
a1fc10a300
|
Merge branch 'sprint/222' into 'master'
Sprint/222
See merge request easycorp/zentaopms!4784
|
2022-08-04 03:03:16 +00:00 |
|
|
zhouxudong
|
9f26275965
|
* Finish task #62850.
|
2022-08-04 01:27:07 +00:00 |
|
|
wangyidong
|
d4c95e6e9c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:14:41 +08:00 |
|
|
wangyidong
|
f5b6edef01
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:13:53 +08:00 |
|
|
王怡栋
|
b6869b0602
|
Merge branch 'sgm_block' into 'master'
Sgm block
See merge request easycorp/zentaopms!4772
|
2022-08-04 01:01:35 +00:00 |
|
|
sunguangming
|
9d1ce4c9d5
|
* Code for project export program name.
|
2022-08-04 08:39:15 +08:00 |
|
|
liuruogu
|
653f238cac
|
* Finish task #63386.
|
2022-08-03 09:05:13 +00:00 |
|
|
李玉春
|
e8e657e6bb
|
Update model.php
|
2022-08-03 06:52:05 +00:00 |
|
|
tianshujie
|
b4a394718f
|
* Finish task #62947.
|
2022-08-03 14:49:42 +08:00 |
|
|
tianshujie
|
167c36d6d5
|
* Finish task #62947.
|
2022-08-03 13:41:05 +08:00 |
|
|
zenggang
|
8f6ca19bf7
|
* Finish task#62937,62950
|
2022-08-02 08:19:56 +00:00 |
|
|
zhouxudong
|
364a5009f4
|
* Finish task #62850.
|
2022-08-02 07:21:03 +00:00 |
|
|
zhouxudong
|
626ab2ccee
|
* Finish task #62836 ~ #62849.
|
2022-08-02 02:41:23 +00:00 |
|
|
zhouxudong
|
2358f42e39
|
* Finish task #62836 ~ #62849.
|
2022-08-01 08:13:05 +00:00 |
|
|
lanzongjun
|
f745e21839
|
delete code
|
2022-07-28 16:45:49 +08:00 |
|
|
zenggang
|
dfae2ec61f
|
* Fix bug#23205
|
2022-07-28 06:55:51 +00:00 |
|
|
王怡栋
|
d6ea8aea86
|
Merge branch 'master_xieqiyu_25004' into 'master'
* Fix bug#25004.
See merge request easycorp/zentaopms!4676
|
2022-07-28 00:52:40 +00:00 |
|
|
xieqiyu
|
0ec68feb10
|
* Fix bug#25004.
|
2022-07-27 21:38:28 +08:00 |
|
|
xieqiyu
|
91493be372
|
* Fix bug#25523.
|
2022-07-27 14:11:10 +08:00 |
|
|
xieqiyu
|
cd8247954c
|
* Fix bug#25004.
|
2022-07-27 13:31:48 +08:00 |
|
|
tianshujie
|
6454cc7025
|
* Resolve issue #697.
|
2022-07-27 11:15:27 +08:00 |
|
|
tianshujie
|
cac6216a09
|
* Finish task #61967.
|
2022-07-26 10:50:16 +08:00 |
|
|
tianshujie
|
21f33a3ee9
|
* Finish task #61967.
|
2022-07-25 15:35:47 +08:00 |
|
|
tianshujie
|
96c71eb326
|
* Finish task #61967.
|
2022-07-25 13:36:14 +08:00 |
|
|
lanzongjun
|
274c1a0c9b
|
remove code
|
2022-07-22 13:18:12 +08:00 |
|
|
孙广明
|
815c633bc7
|
* Code for my-index speed.
|
2022-07-22 10:26:59 +08:00 |
|
|
王怡栋
|
dcd013186a
|
Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug
See merge request easycorp/zentaopms!4620
|
2022-07-21 05:08:47 +00:00 |
|
|
tianshujie
|
68da0b31d2
|
* Modify the return link for the delete project method.
|
2022-07-21 11:35:11 +08:00 |
|
|
孙广明
|
f4c75cd9af
|
* Code for my-block.
|
2022-07-21 11:28:40 +08:00 |
|
|
王怡栋
|
08bc30c893
|
Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug
See merge request easycorp/zentaopms!4616
|
2022-07-20 09:29:29 +00:00 |
|