 lanzongjun
|
493910031a
|
* Finish Task #79466
|
2022-12-13 09:45:01 +08:00 |
|
|
孙广明
|
389a68e863
|
Merge branch 'master_xieqiyu_79663' into 'master'
* Code for task#79663.
See merge request easycorp/zentaopms!6526
|
2022-12-13 01:33:28 +00:00 |
|
|
lanzongjun
|
0a492b61fa
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-13 09:08:08 +08:00 |
|
|
lanzongjun
|
6da0c6ea01
|
* Finish Task #79670
|
2022-12-13 09:06:53 +08:00 |
|
|
王怡栋
|
29ffa09b81
|
Merge branch 'zentaopms273_wyd' into 'master'
* code for task #79861,79860.
See merge request easycorp/zentaopms!6527
|
2022-12-13 00:40:15 +00:00 |
|
|
王怡栋
|
90acd9abcf
|
Merge branch 'feedback_1692' into 'master'
* Resolve feedback#1692
See merge request easycorp/zentaopms!6524
|
2022-12-13 00:39:42 +00:00 |
|
|
wangyidong
|
5bf3b27262
|
* code for task #79861,79860.
|
2022-12-13 08:38:36 +08:00 |
|
|
liuhong
|
d3d10ea6a7
|
* Adjust code task #79661.
|
2022-12-12 12:03:10 +00:00 |
|
|
lanzongjun
|
d2cb9938b5
|
* Finish Task #79670
|
2022-12-12 17:34:43 +08:00 |
|
|
王怡栋
|
38f24ef6f0
|
Merge branch 'sprint/konglingmao_feedback#1472' into 'master'
* Resolved feedbak #1472,privilege error in my work requirement.
See merge request easycorp/zentaopms!6523
|
2022-12-12 09:17:30 +00:00 |
|
|
Yagami
|
fa0b93874d
|
* Code for markdown preview bug.
|
2022-12-12 16:55:33 +08:00 |
|
|
xieqiyu
|
a46ddf8ee7
|
* Code for task#79663.
|
2022-12-12 16:40:23 +08:00 |
|
|
lanzongjun
|
c3d53daa5a
|
* Finish Task #79665
|
2022-12-12 16:36:32 +08:00 |
|
|
Yagami
|
27b73d7dcd
|
* Code for function review.
|
2022-12-12 16:16:51 +08:00 |
|
|
Yagami
|
de6e9b07ac
|
* Code for function review.
|
2022-12-12 16:11:03 +08:00 |
|
|
Yagami
|
92ba115642
|
* Finish task #79460.
|
2022-12-12 15:57:05 +08:00 |
|
|
chaideqing
|
a4c89f47d6
|
* Fix feedback1714.
|
2022-12-12 15:49:07 +08:00 |
|
|
lanzongjun
|
295bfadc5b
|
* Finish Task #79671
|
2022-12-12 15:38:55 +08:00 |
|
|
Yagami
|
8a5d1a8e04
|
* Finish task #79461.
|
2022-12-12 15:22:45 +08:00 |
|
|
liuhong
|
4cf85d5ed7
|
* Fix task #79669.
|
2022-12-12 07:17:47 +00:00 |
|
|
lanzongjun
|
835577a6f0
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-12 14:17:14 +08:00 |
|
|
Yagami
|
a299a62db1
|
* Rename siblings to twins.
|
2022-12-12 14:13:06 +08:00 |
|
|
lanzongjun
|
ad203dfbf9
|
* Finish Task #79450
|
2022-12-12 13:25:39 +08:00 |
|
|
zenggang
|
ee78bb255b
|
* Resolve feedback#1692
|
2022-12-12 02:53:26 +00:00 |
|
|
Yagami
|
b70f00842f
|
* Finish task #79462.
|
2022-12-12 10:01:40 +08:00 |
|
|
朱金勇
|
9f741a612a
|
Merge branch 'sprint/sunhao/fix_gantt_export' into 'master'
* fix gantt export not work as expected, not include all rows
See merge request easycorp/zentaopms!6458
|
2022-12-11 13:58:26 +00:00 |
|
|
朱金勇
|
62c7224c01
|
Merge branch 'sprint/sunhao/optimize_open_app' into 'master'
* hide old tab content on open from hidden state
See merge request easycorp/zentaopms!6455
|
2022-12-11 13:58:11 +00:00 |
|
|
孔令茂
|
4964f6b73a
|
* Resolved feedbak #1472,privilege error in my work requirement.
|
2022-12-09 12:30:05 +00:00 |
|
|
wangyidong
|
d64a93ea2b
|
* code task #79282.
|
2022-12-09 17:13:06 +08:00 |
|
|
Yagami
|
2f34206c94
|
Merge branch 'master_271_78665'
|
2022-12-09 16:59:06 +08:00 |
|
|
孙广明
|
2fdb547f3e
|
Merge branch 'master' into 'master_271_78665'
# Conflicts:
# module/build/control.php
|
2022-12-09 08:58:55 +00:00 |
|
|
Yagami
|
6809cda70f
|
Merge branch 'master_xieqiyu_78690'
|
2022-12-09 16:58:31 +08:00 |
|
|
孙广明
|
8fa7675188
|
Merge branch 'master' into 'master_xieqiyu_78690'
# Conflicts:
# module/productplan/model.php
|
2022-12-09 08:58:14 +00:00 |
|
|
孙广明
|
cb6a64eede
|
Merge branch 'master_bug_30609' into 'master'
* Fix bug #30609.
See merge request easycorp/zentaopms!6511
|
2022-12-09 08:56:19 +00:00 |
|
|
孙广明
|
a7d7ec312a
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30616
See merge request easycorp/zentaopms!6522
|
2022-12-09 08:55:12 +00:00 |
|
|
wangyidong
|
81d3403a20
|
* code for task #79279.
|
2022-12-09 16:54:17 +08:00 |
|
|
wangyidong
|
240111bc70
|
* code task #79283.
|
2022-12-09 16:23:57 +08:00 |
|
|
lanzongjun
|
4cf85b7656
|
* Fix Bug #30616
|
2022-12-09 16:06:34 +08:00 |
|
|
lanzongjun
|
e6301a8ec3
|
* Fix Bug #30616
|
2022-12-09 16:03:32 +08:00 |
|
|
lanzongjun
|
c80e1cfbee
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun
|
2022-12-09 15:50:05 +08:00 |
|
|
xieqiyu
|
7405efe5c7
|
* Code for task#78690.
|
2022-12-09 15:39:55 +08:00 |
|
|
lanzongjun
|
9158f6f79f
|
* Fix Bug #30616
|
2022-12-09 15:38:54 +08:00 |
|
|
liuhong
|
94b3f9bfd5
|
* resolve conflict task #78665
|
2022-12-09 07:21:08 +00:00 |
|
|
孙广明
|
88fb3d7cf6
|
Merge branch 'sprint/271_mayue_bug#30681' into 'master'
* Fix bug #30681.
See merge request easycorp/zentaopms!6510
|
2022-12-09 06:55:26 +00:00 |
|
|
mayue
|
c87bc41018
|
* Restore code.
|
2022-12-09 14:53:14 +08:00 |
|
|
孙广明
|
1f1e87e9cc
|
Merge branch 'master_xieqiyu_30698' into 'master'
* Fix bug#30698.
See merge request easycorp/zentaopms!6509
|
2022-12-09 06:49:32 +00:00 |
|
|
孙广明
|
8981507e80
|
Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30637#30662#78695#78688
See merge request easycorp/zentaopms!6515
|
2022-12-09 06:48:13 +00:00 |
|
|
孙广明
|
0c7d26e9b8
|
Merge branch 'sprint/hufangzhou_feedback_1707' into 'master'
* Handle feedback #1707.
See merge request easycorp/zentaopms!6520
|
2022-12-09 06:47:38 +00:00 |
|
|
hufangzhou
|
6f9d1f9fdb
|
* Handle feedback #1707.
|
2022-12-09 06:37:38 +00:00 |
|
|
王怡栋
|
756389a53a
|
Merge branch 'sprint/feedback1675' into 'master'
Sprint/feedback1675
See merge request easycorp/zentaopms!6517
|
2022-12-09 06:04:17 +00:00 |
|