Commit Graph
1301 Commits
Author SHA1 Message Date
liumengyi febfc7b228 * Finish task #91276. 2023-04-17 09:20:09 +08:00
liumengyi 1a57384ff8 * Rename the privilege of productplan-browse. 2023-04-13 17:14:59 +08:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
hufangzhou d0792c47f9 * Fix bug #33008. 2023-03-16 14:32:31 +08:00
caoyanyi beaa4768b1 * Fix bug #28726. 2023-03-08 17:06:31 +08:00
caoyanyi 6d4d57ab92 * Update product common lang. 2023-03-08 10:15:08 +08:00
caoyanyi 9ffce9d8a7 * Modify project lang to variable. 2023-03-06 10:19:48 +08:00
liumengyi 740afc7a0c * Fix bug. 2023-02-22 07:48:23 +00:00
liumengyi 6a9b3fc6e4 * Fix bug #32243. 2023-02-17 06:26:19 +00:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
Yagami 786dacf52d * Fix bug #31524. 2023-02-14 15:05:22 +08:00
liumengyi e9c8ea6d7a * Fix bug #32064. 2023-02-13 13:26:31 +08:00
liumengyi 5850589edc * Fix bug #30137. 2023-02-10 16:35:45 +08:00
Yagami 0436a025bb * Fix bug #32045. 2023-02-10 15:45:00 +08:00
Yagami c2724b9f57 Merge branch 'zentaopms_281' 2023-02-08 15:31:13 +08:00
liuhong 62967bf48b * Fix bug #31524. 2023-01-12 01:47:48 +00:00
liuhong fb519537d4 * Adjust code for bug #31559. 2023-01-09 01:19:09 +00:00
liuhong 3bb38d3358 * Fix bug #31559. 2023-01-09 01:00:12 +00:00
liuhong 1c7e9b7d14 * Fix bug #31521. 2023-01-06 01:35:10 +00:00
liuhong b922f85ecd * Finish task #81781. 2023-01-03 04:50:20 +00:00
孙广明 b2a41c76d6 * Fix locate bug. 2022-12-30 10:50:36 +08:00
liuhong 06e00bfa61 * Finish task #80189 for Closed plans are not shown in Kanban. 2022-12-29 08:03:56 +00:00
liuhong 970dc71b2e * Finish task 81189. 2022-12-28 01:33:35 +00:00
xieqiyu e6d364c246 * Fix bug#30803. 2022-12-15 15:12:24 +08:00
xieqiyu 54a12ea735 * Fix bug of task#79663. 2022-12-13 16:44:33 +08:00
xieqiyu 5c2ed30fd3 * Fix bug of task#79663. 2022-12-13 16:42:17 +08:00
王怡栋 e70366d1c7 Merge branch 'zentaopms273_wyd' into 'master'
* code task #79859,79858,79857,79856,79855,79854.

See merge request easycorp/zentaopms!6531
2022-12-13 06:17:58 +00:00
wangyidong 8dc609e4a0 * code task #79859,79858,79857,79856,79855,79854. 2022-12-13 14:15:39 +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
wangyidong 5bf3b27262 * code for task #79861,79860. 2022-12-13 08:38:36 +08:00
xieqiyu a46ddf8ee7 * Code for task#79663. 2022-12-12 16:40:23 +08:00
Yagami 27b73d7dcd * Code for function review. 2022-12-12 16:16:51 +08:00
孙广明 8fa7675188 Merge branch 'master' into 'master_xieqiyu_78690'
# Conflicts:
#   module/productplan/model.php
2022-12-09 08:58:14 +00:00
xieqiyu 7405efe5c7 * Code for task#78690. 2022-12-09 15:39:55 +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
lanzongjun 8a0cbc6e6d * Finish Bug #30637 2022-12-09 09:41:06 +08:00
xieqiyu 4724af01bb * Fix bug#30698. 2022-12-08 16:11:20 +08:00
孙广明 31ef3e0260 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480

See merge request easycorp/zentaopms!6498
2022-12-08 06:05:50 +00:00
xieqiyu c4c0fe7271 * Fix bug#30550,#30607. 2022-12-08 12:18:55 +08:00
lanzongjun d6f9976aae * Finish Bug #30480 2022-12-08 11:06:04 +08:00
孙广明 99f18346bb Merge branch 'master_xieqiyu_78690' into 'master'
* Finish task#78690.

See merge request easycorp/zentaopms!6495
2022-12-08 02:50:29 +00:00
孙广明 5a7fdb8ec5 Merge branch 'master_xieqiyu_78699' into 'master'
* Finish task#78699.

See merge request easycorp/zentaopms!6496
2022-12-08 02:50:18 +00:00
xieqiyu 847bb6be13 * Finish task#78698. 2022-12-08 10:46:58 +08:00
xieqiyu 8472e0a191 * Finish task#78699. 2022-12-08 10:34:46 +08:00
xieqiyu 80af5ddba5 * Finish task#78690. 2022-12-08 10:06:46 +08:00
孙广明 cbb280ba3f Merge branch 'master_xieqiyu_fixbug' into 'master'
* Code for task#78669. Fix bug of edit parent plan.

See merge request easycorp/zentaopms!6480
2022-12-07 01:36:23 +00:00
lanzongjun a228bfdeeb resolve conflict 2022-12-06 17:21:18 +08:00
lanzongjun 55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00