Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,882 Commits 2 Branches 292 Tags
34d3ca587cb2bf36d264f587ebef11a8e46d9d35
Commit Graph
44882 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
刘刚 34d3ca587c Merge branch 'sprint/239_liugang_fixbug_27489' into 'zentaopms_239' 
* Fix bug #27489.

See merge request easycorp/zentaopms!5351
 2022-09-15 06:44:15 +00:00
刘刚 e5e73460e1 Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239' 
* Finish task #69009.69010.

See merge request easycorp/zentaopms!5350
 2022-09-15 06:43:45 +00:00
liugang f76ecb4897 * Fix bug #27489. 2022-09-15 14:37:25 +08:00
tanghucheng 3d05710c9f Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239_tanghucheng 2022-09-15 14:29:52 +08:00
刘刚 b38486c649 Merge branch 'sprint/239_liugang_changeNameOfShadowProduct' into 'zentaopms_239' 
* Change the rule to create the shadow product's name.

See merge request easycorp/zentaopms!5348
 2022-09-15 06:24:59 +00:00
tanghucheng 9b62747396 * Finish task #69009. 2022-09-15 14:24:08 +08:00
liugang 00857783d7 * Change the rule to create the shadow product's name. 2022-09-15 13:52:12 +08:00
刘刚 f5712fd636 Merge branch 'sprint/238_liugang_68994' into 'zentaopms_239' 
* Finish task #68994.

See merge request easycorp/zentaopms!5344
 2022-09-15 05:47:09 +00: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
liugang 3a6bc7c768 * Finish task #68994. 2022-09-15 13:44:54 +08: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
刘刚 1eb6dd7805 Merge branch 'sprint/239_liuruogu_task69016' into 'zentaopms_239' 
* Finish task #69016.

See merge request easycorp/zentaopms!5339
 2022-09-15 02:50:39 +00:00
刘刚 a03b09c04e Merge branch 'sprint/239_liuruogu_task69018' into 'zentaopms_239' 
* Do task #69018.

See merge request easycorp/zentaopms!5338
 2022-09-15 02:49:31 +00:00
liuruogu 04cd8275fe * Finish task #69016. 2022-09-15 02:42:40 +00:00
liuruogu 8d46cc5019 * Do task #69018. 2022-09-15 02:01:00 +00:00
liuruogu ea62645622 * Do task #69018. 2022-09-15 01:43:27 +00:00
刘刚 5459e21d2e Merge branch 'sprint/239_liugang_fixbug' into 'zentaopms_239' 
* Fix bug of upgrade the exist projects.

See merge request easycorp/zentaopms!5337
 2022-09-15 01:32:51 +00:00
liugang 3b97ed9213 * Fix bug of upgrade the exist projects. 2022-09-15 09:30:46 +08:00
tanghucheng 4eaf187aab * Finish task #69010. 2022-09-15 08:58:12 +08:00
刘刚 ec6d342fb5 Merge branch 'sprint/239_liuruogu_task69012' into 'zentaopms_239' 
* Do task #69012.

See merge request easycorp/zentaopms!5336
 2022-09-15 00:52:55 +00:00
liuruogu 939602ade2 * Do task #69012. 2022-09-15 00:48:26 +00:00
liuruogu eb0265df2e * Do task #69018. 2022-09-15 00:46:51 +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
刘刚 c19e0c7428 Merge branch 'sprint/239_liuruogu_task69012' into 'zentaopms_239' 
* Finish task #69012.

See merge request easycorp/zentaopms!5327
 2022-09-14 09:05:44 +00:00
liuruogu 7d02ac1f96 * Finish task #69012. 2022-09-14 08:59:36 +00:00
liuruogu d1fbc1068b * Finish task #69012. 2022-09-14 08:51:17 +00:00
刘刚 ef75b463b4 Merge branch 'sprint/239_liugang_68996' into 'zentaopms_239' 
* Finish task #68996.

See merge request easycorp/zentaopms!5326
 2022-09-14 08:41:39 +00:00
liuruogu 41fad5460c * Finish task #69012. 2022-09-14 08:41:29 +00:00
liugang 6d750abaf0 * Finish task #68996. 2022-09-14 16:37:27 +08:00
liuruogu d6c8e4d1d9 * Finish task #69012. 2022-09-14 08:37:20 +00: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
刘刚 c8a1ccac36 Merge branch 'sprint/239_liugang_68998' into 'zentaopms_239' 
* Finish task #68998.

See merge request easycorp/zentaopms!5324
 2022-09-14 08:04:18 +00:00
liugang e9ce915eec * Finish task #68998. 2022-09-14 16:01:26 +08:00
刘刚 7165c60562 Merge branch 'sprint/239_liugang_68999' into 'zentaopms_239' 
Sprint/239 liugang 68999

See merge request easycorp/zentaopms!5322
 2022-09-14 06:57:50 +00:00
liugang e885261255 * Don't display the shadow products when create a project, see task #68999. 2022-09-14 14:52:45 +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
liugang fd873696f5 * Add lang items for the shadow field. 2022-09-14 10:40:40 +08:00
刘刚 2fd1b37549 Merge branch 'sprint/239_liugang_database' into 'zentaopms_239' 
* Add sql to update 17.6.1.

See merge request easycorp/zentaopms!5314
 2022-09-14 00:53:02 +00:00
liugang 5f17eee996 * Add sql to update 17.6.1. 2022-09-14 08:48:41 +08:00
wangyidong 2ba29dd574 * adjust for effort when restart task. 2022-09-13 13:04:01 +08:00
孙广明 11a2cee3ed Merge branch 'revert-32119ec2' into 'master' 
Revert "* Add task effort report."

See merge request easycorp/zentaopms!5308
 2022-09-13 03:29:36 +00:00