 孙广明
|
f89071b9e7
|
Merge branch 'sprint/168' into 'sprint/168_zhengrunyu_45148'
# Conflicts:
# module/execution/view/view.html.php
|
2021-11-30 03:13:21 +00:00 |
|
|
zhengrunyu
|
46a9f157b1
|
*Finish task #45148.
|
2021-11-30 10:56:09 +08:00 |
|
|
zhengrunyu
|
e78c876216
|
*Finish task #45148.
|
2021-11-30 09:22:04 +08:00 |
|
|
liyuchun
|
578d53f5ae
|
* Finish task #45152.
|
2021-11-29 13:08:18 +08:00 |
|
|
zhengrunyu
|
b3c8ee7ccb
|
*Finish task #45148.
|
2021-11-29 09:29:44 +08:00 |
|
|
zhengrunyu
|
9dac5358e3
|
*Finish task #45148.
|
2021-11-26 15:20:17 +08:00 |
|
|
liyuchun
|
1b63752f83
|
* Finish task #45152.
|
2021-11-26 14:00:54 +08:00 |
|
|
zhengrunyu
|
07363c68ff
|
*Finish task #45148.
|
2021-11-26 09:01:56 +08:00 |
|
|
zhengrunyu
|
2f41e85fda
|
*Finish task #sprint/168_zhengrunyu_45148.
|
2021-11-26 08:30:55 +08:00 |
|
|
zhengrunyu
|
0edae7664d
|
*Finish task #45148.
|
2021-11-25 15:42:18 +08:00 |
|
|
tanghucheng
|
17f6a6203c
|
* Code for project.
|
2021-11-25 13:32:06 +08:00 |
|
|
tanghucheng
|
72863779bb
|
* Code for project function getTeamMemberPairs.
|
2021-11-25 10:31:49 +08:00 |
|
|
tanghucheng
|
8742bd0314
|
* Code for project model function getTeamMemberPairs.
|
2021-11-24 17:15:05 +08:00 |
|
|
孙广明
|
59172b420e
|
* Fix project and product relation bug.
|
2021-11-24 14:01:50 +08:00 |
|
|
孙广明
|
b956e21448
|
* Fix bug.
|
2021-11-24 13:10:40 +08:00 |
|
|
liyuchun
|
9502610ece
|
* Fix error for task #44358.
|
2021-11-22 08:39:34 +08:00 |
|
|
liyuchun
|
8cde6c30d4
|
* Finish task #44357,#44358.
|
2021-11-19 12:26:23 +08:00 |
|
|
Hao Sun
|
ecb8881734
|
* task #44358, project kanban support drag-and-drop.
|
2021-11-17 11:01:59 +08:00 |
|
|
孙广明
|
184629174c
|
* Adjust create project page.
|
2021-11-15 15:53:54 +08:00 |
|
|
孙广明
|
a075c72531
|
* Fix execution update order.
|
2021-11-12 09:28:37 +08:00 |
|
|
孙广明
|
00912a7d52
|
* Finish task #43985.
|
2021-11-11 13:26:33 +08:00 |
|
|
孙广明
|
6d625bb597
|
* Finish task #43998.
|
2021-11-10 09:43:04 +08:00 |
|
|
孙广明
|
f9f26953aa
|
* Adjust kanban details.
|
2021-11-09 09:10:07 +08:00 |
|
|
孙广明
|
9f85b1a557
|
* Fix kanban error.
|
2021-11-08 18:22:02 +08:00 |
|
|
孙广明
|
d49b7eac72
|
* Fix kanban error.
|
2021-11-08 17:35:09 +08:00 |
|
|
李玉春
|
c97af049d8
|
Merge branch 'sprint/171_sgm_43948' into 'spirnt/168_liyuchun_bug'
Sprint/171 sgm 43948
See merge request easycorp/zentaopms!346
|
2021-11-08 09:04:11 +00:00 |
|
|
孙广明
|
c7529ca96f
|
* Code for task #43998.
|
2021-11-08 17:01:31 +08:00 |
|
|
孙广明
|
870b311f06
|
* Fix errors.
|
2021-11-08 16:32:18 +08:00 |
|
|
孙广明
|
1ecb25aabc
|
* Code for task #43994.
|
2021-11-08 13:18:53 +08:00 |
|
|
孙广明
|
2fb46989d3
|
* Code for task #43997.
|
2021-11-08 13:15:56 +08:00 |
|
|
孙广明
|
3965d5339b
|
* Finish task #44002, #44003...
|
2021-11-08 13:12:25 +08:00 |
|
|
孙广明
|
d420eba707
|
* Finish task #44005.
|
2021-11-05 11:24:19 +08:00 |
|
|
孙广明
|
75d547998c
|
* Code for task #44005.
|
2021-11-04 16:55:37 +08:00 |
|
|
孙广明
|
ee28e0f7ef
|
* Add bind product action.
|
2021-10-27 09:37:39 +08:00 |
|
|
孙广明
|
d76b563cc5
|
* Add project managed products lang.
|
2021-10-25 13:34:41 +08:00 |
|
|
tianshujie
|
69743fa3a4
|
* Fix bug #15698.
|
2021-10-21 08:32:55 +08:00 |
|
|
李玉春
|
1ee2b61d95
|
Merge branch 'sprint/167_xieqiyu_15457' into 'sprint/167'
* Fix bug#15457.
See merge request easycorp/zentaopms!78
|
2021-10-18 01:17:58 +00:00 |
|
|
王怡栋
|
351b07352b
|
Merge branch '15.6' into sprint/167
|
2021-10-18 08:53:13 +08:00 |
|
|
xieqiyu
|
3e8e0dbcce
|
* Fix bug#15457.
|
2021-10-16 15:32:13 +08:00 |
|
|
xieqiyu
|
21ad4ecf0a
|
* Code for bug#15543.Modify the consumed hours of the project in the block.
|
2021-10-16 08:27:28 +08:00 |
|
|
xieqiyu
|
5cd2f5d2db
|
* Code for bug#15543.
|
2021-10-15 14:45:01 +08:00 |
|
|
李玉春
|
88323d34da
|
Merge branch 'sprint/167_hufangzhou_15544' into 'sprint/167'
* Fix bug #15544.
See merge request easycorp/zentaopms!76
|
2021-10-15 06:19:33 +00:00 |
|
|
xieqiyu
|
5697ba482a
|
* Fix bug#15543.
|
2021-10-15 14:13:41 +08:00 |
|
|
hufangzhou
|
dc8317d122
|
* Fix bug #15544.
|
2021-10-15 14:11:42 +08:00 |
|
|
Hao Sun
|
d8327a0cdc
|
* Task #43195, fix project creating guide modal not show as expected sometimes.
|
2021-10-15 11:18:37 +08:00 |
|
|
朱金勇
|
e50c3c65d9
|
Merge branch 'sprint/167_zenggang_43179' into 'sprint/167'
* Finish task#43179
See merge request easycorp/zentaopms!49
|
2021-10-15 01:05:33 +00:00 |
|
|
王怡栋
|
a44472fb45
|
Merge branch '15.6' into sprint/167
|
2021-10-14 15:48:14 +08:00 |
|
|
hufangzhou
|
52e49919d2
|
* Code for bug #15518.
|
2021-10-14 13:51:59 +08:00 |
|
|
李玉春
|
8e1161b02c
|
Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167'
* Finish task #43169.
See merge request easycorp/zentaopms!64
|
2021-10-14 05:05:12 +00:00 |
|
|
tianshujie
|
f5e1ceb880
|
* Finish task #43169.
|
2021-10-14 09:24:16 +08:00 |
|