Commit Graph
4483 Commits
Author SHA1 Message Date
liugang 15f3ec081b * Fix bug #27562. 2022-09-19 16:30:49 +08:00
liugang 807952f921 * Finish task #69599. 2022-09-19 15:36:40 +08:00
liugang 2bbf63e9dc * Finish task #69599. 2022-09-19 15:25:17 +08:00
刘刚 8579209d6a Merge branch 'sprint/243_liugang_69005' into 'zentaopms_239'
* Finish task #69005.

See merge request easycorp/zentaopms!5389
2022-09-19 03:13:14 +00:00
liugang a51e63ab52 * Finish task #69005. 2022-09-19 10:56:54 +08:00
刘刚 2c85588d1a Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239'
* Finish task #69017.

See merge request easycorp/zentaopms!5387
2022-09-19 02:02:08 +00:00
liuruogu 11d08e8620 * Finish task #69103. 2022-09-19 01:43:12 +00:00
tanghucheng 30ad85c622 * Finish task #69004. 2022-09-16 16:11:55 +08:00
liuruogu cfc214c776 * Finish task #69017. 2022-09-16 07:42:20 +00:00
liuruogu 8319c90e58 * Modify menu of project. 2022-09-16 02:52:20 +00:00
liuruogu 34bfa0e423 * Light menu. 2022-09-16 02:43:34 +00:00
刘刚 9187aac29e Merge branch 'sprint/239_liuruogu_task#69013' into 'zentaopms_239'
* Finish task #69013.

See merge request easycorp/zentaopms!5360
2022-09-16 01:24:19 +00:00
liuruogu fed9a781e9 * Use global lang. 2022-09-16 01:23:07 +00:00
liuruogu 234cf3ff97 * Finish task #69013. 2022-09-16 01:05:29 +00:00
刘刚 9d835d0ada Merge branch 'sprint/239_liuruogu_task#69013' into 'zentaopms_239'
* Finsih task #69013.

See merge request easycorp/zentaopms!5358
2022-09-16 00:46:33 +00:00
liuruogu 17392ef1ac * Finsih task #69013. 2022-09-15 08:45:57 +00:00
tanghucheng c58ef703a4 * Finish task #69007. 2022-09-15 15:25:25 +08:00
liugang 00857783d7 * Change the rule to create the shadow product's name. 2022-09-15 13:52:12 +08:00
刘刚 99b4fb6e13 Merge branch 'sprint/239_liuruogu_task69016' into 'zentaopms_239'
* Finish task #69016.

See merge request easycorp/zentaopms!5343
2022-09-15 05:47:01 +00:00
liuruogu cc80ff7209 * Finish task #69016. 2022-09-15 05:14:16 +00:00
刘刚 02de591f31 Merge branch 'sprint/239_liugang_fixStyle' into 'zentaopms_239'
* Display the products and the plans on the edit page of the project module if...

See merge request easycorp/zentaopms!5342
2022-09-15 05:13:01 +00:00
liuruogu 04824e964b * Finish task #69016. 2022-09-15 05:12:30 +00:00
liugang fefdfe5b49 * Adjust the vertical align. 2022-09-15 13:07:43 +08:00
liugang 93b221c6a6 * Display the products and the plans on the edit page of the project module if the project has product. 2022-09-15 13:06:23 +08:00
liugang 042a9a97c3 * Display the project type on the edit page of the project module. 2022-09-15 13:05:14 +08:00
liuruogu 04cd8275fe * Finish task #69016. 2022-09-15 02:42:40 +00:00
刘刚 46db1983ad Merge branch 'zentaopms_239_tanghucheng_69000' into 'zentaopms_239'
* Finish task #69001.

See merge request easycorp/zentaopms!5329
2022-09-14 09:42:28 +00:00
tanghucheng 710b11ff0c * Finish task #69001. 2022-09-14 17:16:53 +08:00
刘刚 975d5c13cf Merge branch 'zentaopms_239_tanghucheng_69000' into 'zentaopms_239'
* Finish task #69000.

See merge request easycorp/zentaopms!5325
2022-09-14 08:19:55 +00:00
tanghucheng 8045b87d5d * Finish task #69000. 2022-09-14 16:11:51 +08:00
liugang e9ce915eec * Finish task #68998. 2022-09-14 16:01:26 +08:00
liugang e3c1cd99c8 * The project hasn't product don't related with the normal products. 2022-09-14 14:43:01 +08:00
liugang b45b3e3661 * Finish task #68999. 2022-09-14 14:07:00 +08:00
liugang 4a7986fa00 * Add lang items of the hasProduct field of project. 2022-09-14 10:57:51 +08:00
wangyidong 0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
liumengyi 2500ad1fb7 * Fix bug #27428. 2022-09-09 09:45:33 +08:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
wangyidong cf1399e0f6 * adjust for unit test. 2022-09-08 11:35:25 +08:00
wangyidong 6a6a049170 * fix bug. 2022-09-07 15:50:23 +08:00
wangyidong 4092d95876 * code for task #68204. 2022-09-07 15:01:27 +08:00
liumengyi ed78e77035 * Fix bug #27020. 2022-09-06 15:04:00 +08:00
liumengyi ea3071279b * Fix bug #27020. 2022-09-06 14:52:24 +08:00
wangyidong 249913cd5a * code for bug #68205. 2022-09-06 14:01:41 +08:00
孙广明 a321b87f1c Merge branch 'sprint/237_liumengyi_fixbug' into 'master'
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.

See merge request easycorp/zentaopms!5262
2022-09-06 00:42:27 +00:00
liumengyi 6a2deee711 * Fix bug for task #67727. 2022-09-06 08:39:49 +08:00
liumengyi 796d0423bc * Fix bug #27020. 2022-09-05 16:30:02 +08:00
xieqiyu 066b6a129d * Modify project and release test case. 2022-09-04 12:20:01 +08:00
王怡栋 f1ce6c51a6 Merge branch 'estimate2effort' into 'master'
* Merge task estimate to effort.

See merge request easycorp/zentaopms!5254
2022-09-02 06:28:06 +00:00
sunguangming 54c54108e6 * Code for task effort. 2022-09-02 14:17:39 +08:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00