 tianshujie
|
9ef6b56e2c
|
* Fix bug #26994.
|
2022-09-05 13:07:33 +08:00 |
|
|
liuhong
|
e36ae07f31
|
*Fix bug #66226.
|
2022-08-25 01:28:00 +00:00 |
|
|
liuhong
|
88e6b8c92e
|
*Fix bug #66226.
|
2022-08-25 01:22:35 +00:00 |
|
|
liuhong
|
cac2e8ddb3
|
*Fix bug #66226.
|
2022-08-25 01:16:07 +00:00 |
|
|
liuhong
|
2aff11fbd7
|
Fix bug #66226.
|
2022-08-25 01:12:22 +00:00 |
|
|
liuhong
|
99878fdc7a
|
*Fix bug #66226.
|
2022-08-24 08:46:15 +00:00 |
|
|
李玉春
|
3e487df2b3
|
Merge branch 'sprint/231_tianshujie_65808' into 'master'
* Finish task #65808, #65807.
See merge request easycorp/zentaopms!5067
|
2022-08-23 08:26:36 +00:00 |
|
|
liumengyi
|
c95ecbd1a6
|
* Optimize code for task #65808.
|
2022-08-23 16:19:20 +08:00 |
|
|
liumengyi
|
545d74f7d0
|
* Optimize code for task #65808, #65807.
|
2022-08-23 14:50:40 +08:00 |
|
|
xieqiyu
|
99e4534f38
|
Merge branch 'master' into master_xieqiyu_draftStory
|
2022-08-22 17:29:21 +08:00 |
|
|
liuhong
|
650d491c44
|
*Fix bug
|
2022-08-19 08:30:20 +00:00 |
|
|
liuhong
|
6d74ea8acc
|
*Fix bug
|
2022-08-19 05:35:37 +00:00 |
|
|
liuhong
|
fda5a1b952
|
*Finish task #64883.
|
2022-08-18 02:51:35 +00:00 |
|
|
liuhong
|
ebae24048d
|
*Finish task #64883.
|
2022-08-18 02:51:35 +00:00 |
|
|
xieqiyu
|
17773dee90
|
* Code for story of add draft status.
|
2022-08-12 16:00:00 +08:00 |
|
|
tianshujie
|
6c0c3a3cda
|
* Fix bug #26110.
|
2022-08-11 09:30:06 +08:00 |
|
|
孙广明
|
7cc56886e3
|
Merge branch 'lyk_25876' into 'master'
* Fix bug 25876.
See merge request easycorp/zentaopms!4793
|
2022-08-05 02:32:36 +00:00 |
|
|
wangyidong
|
d4c95e6e9c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:14:41 +08:00 |
|
|
dongli
|
8b74ed5ddc
|
* Fix bug #25837.
|
2022-08-03 09:38:21 +00:00 |
|
|
dongli
|
4f1492221a
|
* Fix bug #25837.
|
2022-08-03 09:26:18 +00:00 |
|
|
liugang
|
af464df513
|
* Finish task #63391.
|
2022-08-03 16:16:26 +08:00 |
|
|
wangyuting2
|
84c6278274
|
* Finish task #63288.
|
2022-08-03 13:32:41 +08:00 |
|
|
liuyongkai
|
eac5c92fde
|
* Fix bug 25876.
|
2022-08-03 03:29:12 +00:00 |
|
|
daitingting
|
b834dc794f
|
* Finish task #62919,#62923,#62924.
|
2022-08-02 07:43:12 +00:00 |
|
|
王怡栋
|
378fb33899
|
Merge branch 'sprint/xuanxuan_112' into 'master'
Sprint/xuanxuan 112
See merge request easycorp/zentaopms!4687
|
2022-07-27 08:59:23 +00:00 |
|
|
zhouxudong
|
b0351e7036
|
* Fix bug #25672.
|
2022-07-26 05:27:05 +00:00 |
|
|
chaideqing
|
3fc3cf64e0
|
* remove zentao card's top-right button
|
2022-07-26 09:12:42 +08:00 |
|
|
zenggang
|
cabaedd234
|
* Finish task#61184,61183,61172
|
2022-07-19 00:51:32 +00:00 |
|
|
王怡栋
|
7e682c99c2
|
Merge branch 'sprint/xuanxuan_110' into 'master'
Sprint/xuanxuan 110
See merge request easycorp/zentaopms!4563
|
2022-07-15 03:17:39 +00:00 |
|
|
zenggang
|
410bd4d3aa
|
* Remove productplan die
|
2022-07-15 02:51:57 +00:00 |
|
|
mayue
|
6f9cfb66f1
|
* Fix bug #24706.
|
2022-07-14 15:13:51 +08:00 |
|
|
mayue
|
bde2111b6a
|
* Fix bug #24706.
|
2022-07-14 11:25:42 +08:00 |
|
|
zhouxudong
|
ce70c10870
|
* Code optimization.
|
2022-07-13 09:20:34 +00:00 |
|
|
zhouxudong
|
729a4872ca
|
* Fix bug #25163 #25166 #25170.
|
2022-07-13 05:47:57 +00:00 |
|
|
chaideqing
|
69f20c1205
|
* replace xhtml to html when click card
|
2022-07-13 10:54:12 +08:00 |
|
|
zhouxudong
|
09eabd3b84
|
* Finish task #60393.
|
2022-07-12 07:15:27 +00:00 |
|
|
zhouxudong
|
951d41d721
|
* Finish task #60393.
|
2022-07-12 02:54:06 +00:00 |
|
|
chaideqing
|
3532e82841
|
* fix card show blank above header
|
2022-07-11 15:29:26 +08:00 |
|
|
zhouxudong
|
c035264e3c
|
* Finish task #60387 #60386 #60383.
|
2022-07-11 06:43:13 +00:00 |
|
|
zhouxudong
|
8110d73bd7
|
* Finish task #59748.
|
2022-07-05 06:20:33 +00:00 |
|
|
zhouxudong
|
994ca59405
|
* Finish task #59748.
|
2022-07-05 02:50:25 +00:00 |
|
|
liyuchun
|
7159907f1c
|
* Fix bug #23872.
|
2022-06-30 08:55:39 +00:00 |
|
|
王怡栋
|
9ffdc942c2
|
Merge branch 'master' into 'sprint/205'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
|
2022-06-22 09:21:12 +00:00 |
|
|
tianshujie
|
e2669481c7
|
* Added German and French.
|
2022-06-22 15:28:45 +08:00 |
|
|
tianshujie
|
7372f7f936
|
* Finish story #32623.
|
2022-06-22 08:51:05 +08:00 |
|
|
王怡栋
|
83ecf656d3
|
Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.
See merge request easycorp/zentaopms!4033
(cherry picked from commit beaddb012c)
f0c23584 * Code for feedback #397.
|
2022-06-21 06:28:13 +00:00 |
|
|
王怡栋
|
c30ba304ab
|
Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
|
2022-06-21 06:25:45 +00:00 |
|
|
孙广明
|
f0c23584e0
|
* Code for feedback #397.
|
2022-06-21 10:23:58 +08:00 |
|
|
zhouxudong
|
f8792b01bf
|
* Finish task #57871.
|
2022-06-21 00:42:05 +00:00 |
|
|
zhouxudong
|
64310b7dfb
|
* Finish task #57871.
|
2022-06-20 08:17:44 +00:00 |
|