Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,840 Commits 2 Branches 292 Tags
84b130e6177f28a7338a5628abaaf71548b184e3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 84b130e617 Merge branch 'master_xieqiyu_27445' into 'master' 
* Fix bug#27445.

See merge request easycorp/zentaopms!5306
 2022-09-13 05:48:16 +00:00
王怡栋 9b8f83adaf Merge branch 'sprint/daitingting_bug_27272' into 'master' 
* Fix bug #27272.

See merge request easycorp/zentaopms!5310
 2022-09-13 05:45:50 +00:00
wangyidong 09694f3751 * adjust for edit effort. 2022-09-13 13:37:13 +08:00
wangyidong 0142653d2b * adjust lang. 2022-09-13 13:21:14 +08:00
wangyidong 2ba29dd574 * adjust for effort when restart task. 2022-09-13 13:04:01 +08:00
wangyidong 070d0404b6 * fix bug for activate multi mode task. 2022-09-13 11:21:22 +08:00
wangyidong f743da3ddc * fix bug. 2022-09-13 11:04:04 +08:00
wangyidong d88700a2e7 * adjust for notice manage task team. 2022-09-13 10:35:56 +08:00
王怡栋 f89811bc86 Merge branch 'sprint/237_liumengyi_27450' into 'master' 
* Fix bug #27450.

See merge request easycorp/zentaopms!5304
 2022-09-09 08:37:28 +00:00
王怡栋 f78fdce043 Merge branch 'sprint/tianshujie_bug' into 'master' 
Sprint/tianshujie bug

See merge request easycorp/zentaopms!5305
 2022-09-09 08:37:15 +00:00
wangyidong 0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
wangyidong 4bd3d07e34 Merge branch 'sprint/237_liumengyi_fixbug' 2022-09-09 15:19:04 +08:00
王怡栋 b1c87862f2 Merge branch 'master' into 'sprint/237_liumengyi_fixbug' 
# Conflicts:
#   module/doc/css/createbasicinfo.css
 2022-09-09 07:18:21 +00:00
王怡栋 b9564e50a1 Merge branch 'master_xieqiyu_27124' into 'master' 
Master xieqiyu 27124

See merge request easycorp/zentaopms!5300
 2022-09-09 07:17:43 +00:00
王怡栋 eeaad02185 Merge branch 'sprint/tianshujie_bug' into 'master' 
Sprint/tianshujie bug

See merge request easycorp/zentaopms!5299
 2022-09-09 03:24:09 +00:00
wangyidong 1bb552b34d * fix bug for linear task. 2022-09-09 09:23:12 +08:00
wangyidong 7e683404db * adjust for waterfall report. 2022-09-09 09:11:07 +08:00
王怡栋 0e71ec7d2a Merge branch 'sprint/237_tianshujie_bug' into 'master' 
* Fix bug #24318.

See merge request easycorp/zentaopms!5294
 2022-09-09 00:15:17 +00:00
王怡栋 e07d28fd82 Merge branch 'master_xieqiyu_27406' into 'master' 
* Fix bug#27406,#27235.

See merge request easycorp/zentaopms!5293
 2022-09-09 00:14:59 +00:00
wangyidong ce91c9945e * adjust for show linear effort. 2022-09-08 17:30:50 +08:00
wangyidong 2a8eacad9c * Fix weekly report. 2022-09-08 17:30:50 +08:00
王怡栋 457063cc44 Merge branch 'sprint/hufangzhou_fixxuanxuan' into 'master' 
* Fix error for xuan.

See merge request easycorp/zentaopms!5292
 2022-09-08 08:12:42 +00:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
王怡栋 01b4d9b7d6 Merge branch 'master_xieqiyu_27354' into 'master' 
* Fix bug#27354.

See merge request easycorp/zentaopms!5289
 2022-09-08 07:34:16 +00:00
王怡栋 b6f17557af Merge branch 'sprint/237_hufangzhou_newVersion' into 'master' 
* Add the new version.

See merge request easycorp/zentaopms!5290
 2022-09-08 07:33:39 +00:00
wangyidong cf1399e0f6 * adjust for unit test. 2022-09-08 11:35:25 +08:00
王怡栋 28abbc2a71 Merge branch 'master_xieqiyu_67691' into 'master' 
* Code for task#67691.

See merge request easycorp/zentaopms!5288
 2022-09-08 03:15:45 +00:00
wangyidong c7c586691d * fix bug #27344. 2022-09-08 10:31:10 +08:00
wangyidong a195088ba3 * fix for edit team. 2022-09-08 10:07:45 +08:00
wangyidong 00b0aa0ba0 * adjust for create effort. 2022-09-08 09:47:56 +08:00
wangyidong dfe8cd3088 Merge branch 'master_xieqiyu_67691' 2022-09-08 09:38:52 +08:00
王怡栋 84da5dced1 Merge branch 'master' into 'master_xieqiyu_67691' 
# Conflicts:
#   db/update17.6.sql
 2022-09-08 01:38:22 +00:00
王怡栋 a416702128 Merge branch 'max_45' into 'master' 
* Fix bug for my work auditplan.

See merge request easycorp/zentaopms!5287
 2022-09-08 00:35:49 +00:00
wangyidong 438c2b2524 * fix bug #27310. 2022-09-07 17:21:01 +08:00
wangyidong a370daf00f * fix bug #27307. 2022-09-07 17:16:30 +08:00
wangyidong 548c24ba42 * fix bug. 2022-09-07 17:11:12 +08:00
wangyidong e0248af2a4 * adjust code. 2022-09-07 15:57:20 +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
wangyidong d7dfd0fd3b * fix bug. 2022-09-07 11:55:48 +08:00
wangyidong a8a703bf16 * finish task #68203. 2022-09-07 11:08:48 +08:00
王怡栋 72dad72c13 Merge branch 'sprint/237_liumengyi_67768' into 'master' 
* Fix bug #27186.

See merge request easycorp/zentaopms!5281
 2022-09-07 02:35:29 +00:00
王怡栋 e6885c26ac Merge branch 'sprint/237_liumengyi_67774' into 'master' 
* Fix bug #26648.

See merge request easycorp/zentaopms!5278
 2022-09-07 02:35:15 +00:00
王怡栋 ceeda8a41e Merge branch 'master_xieqiyu_67693' into 'master' 
* Add delay label.

See merge request easycorp/zentaopms!5277
 2022-09-07 02:34:47 +00:00
王怡栋 9be46b416f Merge branch 'max_45' into 'master' 
* Finish task #67793.

See merge request easycorp/zentaopms!5282
 2022-09-07 02:32:06 +00:00
wangyidong b389d7ea97 Merge branch 'importExport' 2022-09-07 10:30:33 +08:00
王怡栋 17aec51cbe Merge branch 'master' into 'importExport' 
# Conflicts:
#   module/port/model.php
 2022-09-07 02:30:00 +00:00
wangyidong 2a7d73ef55 * fix for upgrade for effort order. 2022-09-07 10:06:23 +08:00
wangyidong 9648f86221 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-07 09:20:39 +08:00
wangyidong aa9e733921 * fix bug #27286. 2022-09-07 09:20:26 +08:00
王怡栋 76447025a4 Merge branch 'sprint/237_tianshujie_bug' into 'master' 
Sprint/237 tianshujie bug

See merge request easycorp/zentaopms!5279
 2022-09-07 00:29:42 +00:00
王怡栋 c7024eee3c Merge branch 'master_xieqiyu_27006' into 'master' 
* Fix bug#27006.

See merge request easycorp/zentaopms!5275
 2022-09-06 07:56:04 +00:00
王怡栋 887e405c1c Merge branch 'master_xieqiyu_27276' into 'master' 
* Fix bug#27276,#27280.

See merge request easycorp/zentaopms!5271
 2022-09-06 07:55:02 +00:00
王怡栋 f71df64f64 Merge branch 'sprint/workflow_fixbug#26826' into 'master' 
* Finish task #67872. Fix bug #26826.

See merge request easycorp/zentaopms!5274
 2022-09-06 07:54:41 +00:00
王怡栋 c13f57e39e Merge branch 'sprint/daitingting_bug_67888' into 'master' 
* Fix bug #67888.

See merge request easycorp/zentaopms!5272
 2022-09-06 07:53:57 +00:00
王怡栋 20852c3bc7 Merge branch 'sprint/237_liumengyi_fixbug' into 'master' 
* Fix bug #27020, #27004.

See merge request easycorp/zentaopms!5273
 2022-09-06 07:53:08 +00:00
王怡栋 e5bd16f5b6 Merge branch 'sprint/237_liumengyi_67702' into 'master' 
* Fix bug #26193.

See merge request easycorp/zentaopms!5276
 2022-09-06 07:52:27 +00:00
wangyidong 358e54302d * fix bug #27292. 2022-09-06 15:26:01 +08:00
wangyidong 249913cd5a * code for bug #68205. 2022-09-06 14:01:41 +08:00
王怡栋 19d5097ff3 Merge branch 'sprint/daitingting_optimize' into 'master' 
* Optimize codes.

See merge request easycorp/zentaopms!5269
 2022-09-06 05:44:51 +00:00
王怡栋 a1e31e99e3 Merge branch 'master_xieqiyu_66957' into 'master' 
* Code for task#68109.

See merge request easycorp/zentaopms!5266
 2022-09-06 02:57:03 +00:00
王怡栋 fabd055dc1 Merge branch 'master_xieqiyu_67693' into 'master' 
* Finish task#67693.

See merge request easycorp/zentaopms!5267
 2022-09-06 02:52:14 +00:00
wangyidong 19a69c8cae * code for task #67405. 2022-09-06 09:30:22 +08:00
wangyidong 08ad00b091 * fix bug #25049. 2022-09-06 08:54:36 +08:00
wangyidong 81223fe4c5 * adjust for report workload. 2022-09-05 20:36:01 +08:00
wangyidong 6972110d54 * adjust for delete estimate. 2022-09-05 20:21:18 +08:00
wangyidong 303cede555 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-05 16:01:46 +08:00
wangyidong 1a0afdd6e0 * fix bug #26541. 2022-09-05 16:01:13 +08:00
王怡栋 d033de2303 Merge branch 'sprint/tianshujie_case' into 'master' 
* Add and modify test case of execution module.

See merge request easycorp/zentaopms!5265
 2022-09-05 07:46:17 +00:00
王怡栋 7cc59a9177 Merge branch 'sprint/237_tianshujie_bug' into 'master' 
Sprint/237 tianshujie bug

See merge request easycorp/zentaopms!5264
 2022-09-05 07:45:45 +00:00
wangyidong 1562e2c4a8 * fix bug #26543. 2022-09-05 14:06:56 +08:00
wangyidong c8c544c6d0 * adjust for record estimate. 2022-09-05 13:55:22 +08:00
wangyidong 4f170236c3 * fix bug #27262. 2022-09-05 13:33:56 +08:00
王怡栋 e8478894c4 Merge branch 'master_xieqiyu_test' into 'master' 
Master xieqiyu test

See merge request easycorp/zentaopms!5261
 2022-09-05 05:10:05 +00:00
王怡栋 0e1038275f Merge branch 'sprint/235_liumengyi_27238' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!5259
 2022-09-05 05:09:06 +00:00
王怡栋 9f2a83fa19 Merge branch 'bug_26943' into 'master' 
* Fix bug#26943

See merge request easycorp/zentaopms!5258
 2022-09-05 05:08:45 +00:00
王怡栋 9ed4f6bdd4 Merge branch 'sprint/hufangzhou_25840' into 'master' 
* Fix bug #25840.

See merge request easycorp/zentaopms!5252
 2022-09-05 05:08:21 +00:00
王怡栋 88a75824f7 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #27198

See merge request easycorp/zentaopms!5251
 2022-09-05 05:05:12 +00:00
wangyidong 86ebfc0480 * fix bug #27262. 2022-09-05 11:30:25 +08:00
wangyidong cff2453097 * fix bug #26362. 2022-09-05 08:54:26 +08:00
wangyidong c5a129d777 * fix bug #27243. 2022-09-05 08:47:10 +08:00
wangyidong 574fd06e71 * adjust for task #67404. 2022-09-05 08:36:17 +08:00
wangyidong 4635256fb9 * adjust for record estimate for linear task. 2022-09-02 17:51:04 +08:00
王怡栋 158bd704f8 Merge branch 'sprint/235_liumengyi_27238' into 'master' 
* Fix bug #27135,#27034.

See merge request easycorp/zentaopms!5255
 2022-09-02 09:08:48 +00:00
王怡栋 5cad8843e7 Merge branch 'master_xieqiyu_27244' into 'master' 
* Fix bug#27244.

See merge request easycorp/zentaopms!5257
 2022-09-02 08:38:50 +00:00
wangyidong c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +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
王怡栋 1a9ba95c43 Merge branch 'master_xieqiyu_66955' into 'master' 
* Code for task#66955.

See merge request easycorp/zentaopms!5245
 2022-09-02 05:07:46 +00:00
王怡栋 413c6d64ba Merge branch 'sprint/hufangzhou_26131' into 'master' 
* Fix bug #26131.

See merge request easycorp/zentaopms!5244
 2022-09-02 05:04:18 +00:00
王怡栋 6376b09468 Merge branch 'sprint/235_dongli_bug27225' into 'master' 
* Fix bug #27225.

See merge request easycorp/zentaopms!5249
 2022-09-02 05:02:51 +00:00
王怡栋 17b58bc39b Merge branch 'sprint/235_liutian_fixissue' into 'master' 
* Fix issue #731, #728, #727, #726.

See merge request easycorp/zentaopms!5247
 2022-09-02 02:57:35 +00:00
wangyidong 908b539e92 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-02 10:49:55 +08:00
wangyidong d1cb72d4a2 * code for task #67405. 2022-09-02 10:49:29 +08:00
wangyidong 1d326d5bb9 * code for task #67405. 2022-09-02 09:09:47 +08:00
wangyidong d4cd0de865 * adjust for webhook send weixin message. 2022-09-02 09:09:06 +08:00
王怡栋 121e8fc33d Merge branch 'sprint/235_dongli_bug26188' into 'master' 
* Fix bug #26188,#26715.

See merge request easycorp/zentaopms!5241
 2022-09-01 07:53:43 +00:00
王怡栋 48e11d5186 Merge branch 'sprint/hufangzhou_26458' into 'master' 
* Fix bug #26458.

See merge request easycorp/zentaopms!5230
 2022-09-01 06:53:53 +00:00
王怡栋 b9ba89d886 Merge branch 'sprint235_17141' into 'master' 
* Fix bug#27141,27153

See merge request easycorp/zentaopms!5232
 2022-09-01 06:53:32 +00:00
wangyidong 5fe9412a2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-01 14:30:56 +08:00
wangyidong db217f9ffe * fix bug #27056. 2022-09-01 14:30:18 +08:00