Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,168 Commits 2 Branches 292 Tags
fcf8218569a4f693d2c7ef83a1187115b1089ac7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋 41f77027bc Merge branch 'sprint/master_zhouxudong_54491_1' into 'master' 
* Finish task #54491

See merge request easycorp/zentaopms!3495
 2022-05-19 00:55:52 +00:00
王怡栋 e6e4e7dddb Merge branch 'sgm_approval' into 'master' 
* Add approval sql.

See merge request easycorp/zentaopms!3483
 2022-05-18 07:09:33 +00:00
王怡栋 cbef1578ca Merge branch 'master_xieqiyu_54467' into 'master' 
* Code for task#54467.

See merge request easycorp/zentaopms!3481
 2022-05-18 06:21:47 +00:00
wangyidong 98df6e3ffb * adjust code for tid. 2022-05-18 13:09:40 +08:00
wangyidong e9289b68d5 * adjust for data. 2022-05-18 11:11:11 +08:00
王怡栋 9dedd40457 Merge branch 'master_xieqiyu_54468' into 'master' 
* Finish task#54468.

See merge request easycorp/zentaopms!3473
 2022-05-18 03:09:09 +00:00
王怡栋 44d98b2cc3 Merge branch 'sprint/daitingting_flow_addID' into 'master' 
* Add id for post data.

See merge request easycorp/zentaopms!3463
 2022-05-18 02:44:59 +00:00
wangyidong 8aad51ace3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-18 10:29:11 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
王怡栋 ad6b686c0d Merge branch 'master_xieqiyu_54467' into 'master' 
* Finish task#54467.

See merge request easycorp/zentaopms!3466
 2022-05-18 01:52:49 +00:00
王怡栋 e8fe05b744 Merge branch 'sprint/master_zhouxudong_54480' into 'master' 
Sprint/master zhouxudong 54480

See merge request easycorp/zentaopms!3452
 2022-05-17 08:38:03 +00:00
王怡栋 ec8d77bb19 Merge branch 'sgm_task54218' into 'master' 
* Finish task #54218.

See merge request easycorp/zentaopms!3450
 2022-05-17 08:37:13 +00:00
王怡栋 aa9924c41a Merge branch 'master_xieqiyu_54483' into 'master' 
* Fix bug#54483.

See merge request easycorp/zentaopms!3445
 2022-05-17 08:00:36 +00:00
王怡栋 32108b6ad2 Merge branch 'sgm_fixbug' into 'master' 
* Fix jira and markdown bug.

See merge request easycorp/zentaopms!3444
 2022-05-17 08:00:12 +00:00
王怡栋 8f67505c1f Merge branch 'sgm_sprint190' into 'master' 
* Finish task #54194.

See merge request easycorp/zentaopms!3446
 2022-05-17 07:59:22 +00:00
王怡栋 61131a17f4 Merge branch 'sprint/wangyuting_fixbug' into 'master' 
* Fix workflow default lang bug.

See merge request easycorp/zentaopms!3443
 2022-05-17 07:43:37 +00:00
王怡栋 1ed6b45e30 Merge branch 'sgm_sprint190' into 'master' 
Sgm sprint190

See merge request easycorp/zentaopms!3440
 2022-05-17 03:20:36 +00:00
王怡栋 670520548f Merge branch 'sprint/wangyuting_fixbug_22520' into 'master' 
* Fix bug #22520

See merge request easycorp/zentaopms!3435
 2022-05-17 03:03:53 +00:00
王怡栋 a8afd69c54 Merge branch 'sgm_sprint190' into 'master' 
* Code for task #54189.

See merge request easycorp/zentaopms!3433
 2022-05-17 01:19:16 +00:00
王怡栋 f565477c52 Merge branch 'master_xieqiyu_22496' into 'master' 
* Fix bug#22496.

See merge request easycorp/zentaopms!3429
 2022-05-16 09:27:22 +00:00
王怡栋 3cd2d727a7 Merge branch 'sprint/master_zhouxudong_22531' into 'master' 
* Fix bug #22531.

See merge request easycorp/zentaopms!3431
 2022-05-16 09:26:34 +00:00
王怡栋 568d74299e Merge branch 'master_xieqiyu_22375' into 'master' 
* Fix bug#22375.

See merge request easycorp/zentaopms!3426
 2022-05-16 07:13:36 +00:00
王怡栋 0374e98fdb Merge branch '189_tanghucheng_fixbug' into 'master' 
* Fix bug for sql.

See merge request easycorp/zentaopms!3425
 2022-05-16 07:13:07 +00:00
王怡栋 1ecf960064 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3424
 2022-05-16 07:01:15 +00:00
王怡栋 57cf623f54 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3423
 2022-05-16 06:45:50 +00:00
王怡栋 77308c7fc1 Merge branch 'sprint/189_hufangzhou_sso' into 'master' 
* Fix an error of sso.

See merge request easycorp/zentaopms!3419
 2022-05-16 05:57:59 +00:00
王怡栋 0d87358352 Merge branch 'sprint/189_hufangzhou_22250' into 'master' 
* Fix bug #22250.

See merge request easycorp/zentaopms!3420
 2022-05-16 05:57:41 +00:00
王怡栋 91829138c4 Merge branch 'sprint/master_zhouxudong_22523' into 'master' 
* Fix bug #22523.

See merge request easycorp/zentaopms!3421
 2022-05-16 05:56:10 +00:00
王怡栋 c3d5036eea Merge branch 'fixbug' into 'master' 
* Fix bug for sql.

See merge request easycorp/zentaopms!3414
 2022-05-16 05:07:16 +00:00
王怡栋 cd2b17e27b Merge branch 'master_xieqiyu_fixbug' into 'master' 
* Fix bug of burn when have no data in burn datatable.

See merge request easycorp/zentaopms!3417
 2022-05-16 05:06:14 +00:00
王怡栋 2cdf81eda4 Merge branch 'sprint/master_zhouxudong_22441' into 'master' 
Sprint/master zhouxudong 22441

See merge request easycorp/zentaopms!3411
 2022-05-16 05:05:37 +00:00
王怡栋 80c36bb26f Merge branch 'sprint/master_zhouxudong_22514' into 'master' 
* Fix bug #22514.

See merge request easycorp/zentaopms!3418
 2022-05-16 05:03:42 +00:00
王怡栋 71e39dafb2 Merge branch 'sprint/189_hufangzhou_deletefile' into 'master' 
* Delete the unused file.

See merge request easycorp/zentaopms!3416
 2022-05-16 03:33:09 +00:00
王怡栋 48e5aff46d Merge branch 'master_xieqiyu_showDeadline' into 'master' 
* Show execution deadline at burn in view page.

See merge request easycorp/zentaopms!3415
 2022-05-16 03:15:17 +00:00
王怡栋 19d32ad6ec Merge branch 'sprint/189_hufangzhou_deletefiles' into 'master' 
* Delete the files during upgrade.

See merge request easycorp/zentaopms!3392
 2022-05-16 02:12:01 +00:00
王怡栋 b47dc7a794 Merge branch 'hufangzhou_score_autotest' into 'master' 
* Add the score auto test case.

See merge request easycorp/zentaopms!3412
 2022-05-16 02:04:58 +00:00
王怡栋 e1553f2329 Merge branch 'master_xieqiyu_unittest' into 'master' 
* Add unit test of search module.

See merge request easycorp/zentaopms!3407
 2022-05-16 02:01:09 +00:00
王怡栋 9bc0b237e4 Merge branch 'master_xieqiyu_22409' into 'master' 
* Fix bug#22409.

See merge request easycorp/zentaopms!3389
 2022-05-16 00:59:34 +00:00
王怡栋 7dc27f4c95 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #22417#22413

See merge request easycorp/zentaopms!3398
 2022-05-13 09:55:23 +00:00
王怡栋 f27bae0fe6 Merge branch 'sprint/189_zg_bugs' into 'master' 
* Fix bug#22451,22473,22475

See merge request easycorp/zentaopms!3390
 2022-05-13 09:44:01 +00:00
王怡栋 3f7611c365 Merge branch 'fixbug' into 'master' 
* Fix bug #22416.

See merge request easycorp/zentaopms!3393
 2022-05-13 09:40:39 +00:00
王怡栋 1927af786c Merge branch 'master_xieqiyu_unittest' into 'master' 
Master xieqiyu unittest

See merge request easycorp/zentaopms!3395
 2022-05-13 06:40:09 +00:00
wangyidong 12b811e4b4 * adjust for workflow field. 2022-05-13 14:19:54 +08:00
王怡栋 def7e0a5ed Merge branch 'sprint/189_hufangzhou_autotest' into 'master' 
* Add the auto test case for action model.

See merge request easycorp/zentaopms!3388
 2022-05-13 03:34:22 +00:00
王怡栋 1df620e923 Merge branch 'sprint/daitingting_product_printextendfield' into 'master' 
* Fix bug for printExtendFields in view file.

See merge request easycorp/zentaopms!3387
 2022-05-13 03:24:53 +00:00
wangyidong d5e9bf9dc9 Merge branch 'fixbug' 2022-05-13 11:23:34 +08:00
王怡栋 77d9a77af8 Merge branch 'master' into 'fixbug' 
# Conflicts:
#   db/update16.5.sql
 2022-05-13 03:21:53 +00:00
王怡栋 ce0f556d48 Merge branch 'master_xieqiyu_53666' into 'master' 
Master xieqiyu 53666

See merge request easycorp/zentaopms!3384
 2022-05-13 02:48:26 +00:00
wangyidong c1b12a1104 * code bug #22445. 2022-05-13 10:22:02 +08:00
wangyidong 0a9dca7902 * code bug #22442. 2022-05-13 10:11:36 +08:00
wangyidong 9e49476c2f * code bug #22447. 2022-05-13 10:07:00 +08:00
wangyidong 0e1859becf * code bug #22440. 2022-05-13 09:57:06 +08:00
王怡栋 f82384a4cd Merge branch 'sprint/189_hufangzhou_22439' into 'master' 
* Fix bug #22439.

See merge request easycorp/zentaopms!3382
 2022-05-13 01:44:23 +00:00
王怡栋 71354563ea Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* add method sql

See merge request easycorp/zentaopms!3378
 2022-05-13 01:43:40 +00:00
王怡栋 19f37df962 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3381
 2022-05-13 01:16:18 +00:00
王怡栋 86f2e56096 Merge branch 'sprint/master_zhouxudong_compile' into 'master' 
Sprint/master zhouxudong compile

See merge request easycorp/zentaopms!3355
 2022-05-13 01:15:40 +00:00
王怡栋 24c8d5f010 Merge branch 'sprint/189_hufangzhou_22407' into 'master' 
* Fix bug #22407.

See merge request easycorp/zentaopms!3377
 2022-05-13 01:14:26 +00:00
王怡栋 b885f105d2 Merge branch 'sprint/189_hufangzhou_22443' into 'master' 
* Fix bug #22443.

See merge request easycorp/zentaopms!3380
 2022-05-13 01:04:12 +00:00
wangyidong ee559e5e7c * code for bug #22376. 2022-05-13 08:47:42 +08:00
wangyidong 71bc27b631 * fix bug #22433. 2022-05-13 08:27:44 +08:00
wangyidong 50ec57b390 * code for story #32387. 2022-05-12 19:04:44 +08:00
wangyidong 7336b0dabb * code for task #53928. 2022-05-12 18:56:26 +08:00
王怡栋 3f6d438550 Merge branch 'sprint/189_liumengyi_kanban' into 'master' 
* Add card desc of productplan card and build card.

See merge request easycorp/zentaopms!3376
 2022-05-12 09:24:21 +00:00
王怡栋 c116f9a9d1 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3372
 2022-05-12 09:10:50 +00:00
wangyidong c1cb8211dc Merge branch 'sprint/master_lanzongjun_fixbug' 2022-05-12 17:09:47 +08:00
王怡栋 a47a3ad064 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug' 
# Conflicts:
#   db/update16.5.sql
 2022-05-12 09:09:28 +00:00
王怡栋 57b96215b3 Merge branch 'sprint/189_hufangzhou_issue' into 'master' 
* Resolve issue #634.

See merge request easycorp/zentaopms!3369
 2022-05-12 08:48:06 +00:00
王怡栋 42473b2dfb Merge branch 'sprint/tianshujie_bug22436' into 'master' 
* Fix bug #22436.

See merge request easycorp/zentaopms!3371
 2022-05-12 08:44:42 +00:00
王怡栋 93e5d9e108 Merge branch 'sprint/wangyuting_workflow' into 'master' 
* Fix print extend fields bug.

See merge request easycorp/zentaopms!3362
 2022-05-12 07:59:55 +00:00
王怡栋 7a15492b56 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3364
 2022-05-12 07:56:03 +00:00
王怡栋 125a97d530 Merge branch 'sprint/189_hufangzhou_22429' into 'master' 
* Fix bug #22429.

See merge request easycorp/zentaopms!3366
 2022-05-12 07:55:10 +00:00
王怡栋 66eb00606e Merge branch 'sprint/189_hufangzhou_22399' into 'master' 
* Fix bug #22399.

See merge request easycorp/zentaopms!3367
 2022-05-12 07:53:53 +00:00
wangyidong 450a61cf12 * fix bug #22415. 2022-05-12 15:52:24 +08:00
wangyidong aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00
王怡栋 fa0b10275e Merge branch 'sprint/daitingting_fix_isClickable' into 'master' 
* Check execution privilege in buildOperateMenu function.

See merge request easycorp/zentaopms!3360
 2022-05-12 06:06:05 +00:00
wangyidong c04ec4db8f * fix for merge program when upgrade. 2022-05-12 13:46:57 +08:00
王怡栋 4bae11dbc6 Merge branch 'sprint/wangyuting_workflow' into 'master' 
* Fix workflow bug.

See merge request easycorp/zentaopms!3357
 2022-05-12 05:42:14 +00:00
王怡栋 9cd2982d2e Merge branch 'sprint/189_hufangzhou_22364' into 'master' 
* Fix bug #22364.

See merge request easycorp/zentaopms!3358
 2022-05-12 05:38:14 +00:00
王怡栋 440891b197 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* add sql

See merge request easycorp/zentaopms!3349
 2022-05-12 05:29:51 +00:00
wangyidong c0f53c6740 Merge branch 'sprint/189_zhouxudong_53651' 2022-05-12 13:20:50 +08:00
王怡栋 a9d13faa1a Merge branch 'master' into 'sprint/189_zhouxudong_53651' 
# Conflicts:
#   module/execution/js/edit.js
 2022-05-12 05:20:13 +00:00
王怡栋 5674160b7e Merge branch 'master_xieqiyu_53666' into 'master' 
Master xieqiyu 53666

See merge request easycorp/zentaopms!3353
 2022-05-12 05:05:25 +00:00
王怡栋 d11a0831f8 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3345
 2022-05-12 01:07:16 +00:00
王怡栋 bc71574f01 Merge branch 'sprint/wangyuting_workflow' into 'master' 
* Adjust release action menu.

See merge request easycorp/zentaopms!3341
 2022-05-11 09:14:54 +00:00
王怡栋 fe9eb1bf83 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master' 
Sprint/master zhouxudong fixbug

See merge request easycorp/zentaopms!3340
 2022-05-11 09:09:04 +00:00
王怡栋 b8533b242c Merge branch 'sprint/master_zhouxudong_22337' into 'master' 
* Fix bug #22337.

See merge request easycorp/zentaopms!3329
 2022-05-11 09:08:33 +00:00
王怡栋 d8d6b13d2b Merge branch 'sprint/wangyuting_flowbug' into 'master' 
* Fix build action menu bug.

See merge request easycorp/zentaopms!3338
 2022-05-11 08:18:09 +00:00
王怡栋 e16858d53d Merge branch 'fixbug' into 'master' 
* Finish task #53590.

See merge request easycorp/zentaopms!3330
 2022-05-11 07:26:55 +00:00
王怡栋 307716798b Merge branch 'sprint/daitingting_buildoperatemenu_story' into 'master' 
* Build operate menu for story module.

See merge request easycorp/zentaopms!3335
 2022-05-11 07:25:26 +00:00
王怡栋 feacaf7a9c Merge branch 'sprint/wangyuting_workflow' into 'master' 
* Finish task #53548.

See merge request easycorp/zentaopms!3333
 2022-05-11 07:23:01 +00:00
王怡栋 952d354b46 Merge branch 'sprint/189_hufangzhou_53673' into 'master' 
* Code for task #53673.

See merge request easycorp/zentaopms!3328
 2022-05-11 06:41:58 +00:00
王怡栋 5cd347ce80 Merge branch 'sprint/daitingting_fix_story_assign' into 'master' 
* Remove comment field of story.

See merge request easycorp/zentaopms!3324
 2022-05-11 05:29:14 +00:00
王怡栋 82968630b0 Merge branch 'master_xieqiyu_53671' into 'master' 
Master xieqiyu 53671

See merge request easycorp/zentaopms!3322
 2022-05-11 05:17:05 +00:00
wangyidong 828fddb8b7 * code for task #53589. 2022-05-11 13:02:08 +08:00
王怡栋 f98d33e010 Merge branch 'sprint/189_hufangzhou_53673' into 'master' 
* Finish task #53673.

See merge request easycorp/zentaopms!3316
 2022-05-11 03:27:53 +00:00
wangyidong 703ef6e4eb Merge branch 'fixbug' 2022-05-11 11:26:21 +08:00
王怡栋 72584ceb38 Merge branch 'master' into 'fixbug' 
# Conflicts:
#   db/update16.5.sql
 2022-05-11 03:26:01 +00:00
王怡栋 1a90f16fd0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix task #53588

See merge request easycorp/zentaopms!3320
 2022-05-11 03:17:29 +00:00
王怡栋 61c086d94f Merge branch 'sprint/daitingting_buildoperatemenu_productplan' into 'master' 
* Build operate menu for productplan module.

See merge request easycorp/zentaopms!3315
 2022-05-11 01:51:59 +00:00
wangyidong d09a097714 Merge branch 'fixbug' 2022-05-10 17:12:18 +08:00