Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,572 Commits 2 Branches 292 Tags
6f72de9b65ad15322facfa6bf00a437680340ac8
Commit Graph
34 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李玉春 5822a06c7d Merge branch 'sprint/168' into 'sprint/167_sgm_kanbandata' 
# Conflicts:
#   module/kanban/model.php
 2021-10-27 07:05:51 +00:00
李玉春 0af76bd862 Merge branch 'sprint/168_sgm_43396' into 'sprint/168' 
* Add bind product action.

See merge request easycorp/zentaopms!166
 2021-10-27 02:55:51 +00:00
李玉春 0458578361 Merge branch 'sprint/168_sgm_kanban' into 'sprint/168' 
* Add kanban view.

See merge request easycorp/zentaopms!154
 2021-10-26 07:16:12 +00:00
李玉春 28dcdf4449 Merge branch 'sprint/168_tianshujie_43426' into 'sprint/168' 
* Correct Kanban data.

See merge request easycorp/zentaopms!147
 2021-10-26 06:49:35 +00:00
李玉春 ff8f020485 Merge branch 'sprint/168_tianshujie_43426' into 'sprint/168' 
* Refactoring the Kanban function.

See merge request easycorp/zentaopms!145
 2021-10-26 02:51:13 +00:00
李玉春 5f286affd8 Merge branch 'sprint/168_dingna_api' into 'sprint/168' 
* Add testcase of product.

See merge request easycorp/zentaopms!140
 2021-10-26 02:28:59 +00:00
李玉春 86afd37ec1 Merge branch 'sprint/168_dingna_bug' into 'sprint/168' 
* Fix the bug that no navigation after clicking the subtask on the Work page.

See merge request easycorp/zentaopms!142
 2021-10-25 08:06:24 +00:00
李玉春 824afd991b Merge branch 'sprint/168_tianshujie_api' into 'sprint/168' 
* Add test case of bug module.

See merge request easycorp/zentaopms!134
 2021-10-22 07:37:43 +00:00
李玉春 a5434d2cf2 Merge branch 'sprint/168_tianshujie_15693' into 'sprint/168' 
* Fix bug #15693.

See merge request easycorp/zentaopms!131
 2021-10-22 00:59:58 +00:00
李玉春 a24fbb9075 Merge branch 'sprint/167_tianshujie_15698' into 'sprint/167' 
* Fix bug #15698.

See merge request easycorp/zentaopms!129
 2021-10-21 00:37:05 +00:00
李玉春 28698c9061 Merge branch 'sprint/167_tianshujie_15679' into 'sprint/167' 
* Fix bug #15679.

See merge request easycorp/zentaopms!123
 2021-10-20 07:34:30 +00:00
李玉春 724588ee19 Merge branch 'sprint/167_tianshujie_15638' into 'sprint/167' 
* Fix bug #15638.

See merge request easycorp/zentaopms!115
 2021-10-19 12:40:58 +00:00
李玉春 1dea8203c0 Merge branch 'sprint/167' into 'sprint/167_xieqiyu_15615' 
# Conflicts:
#   module/api/view/index.html.php
 2021-10-19 10:44:18 +00:00
李玉春 1e69e81346 Merge branch 'sprint/167_tianshujie_15620' into 'sprint/167' 
* Fix bug #15620.

See merge request easycorp/zentaopms!111
 2021-10-19 10:29:39 +00:00
李玉春 0959ee3ef2 Merge branch 'sprint/167_hufangzhou_15637' into 'sprint/167' 
* Fix bug #15637.

See merge request easycorp/zentaopms!110
 2021-10-19 10:27:05 +00:00
李玉春 7967afd49a Merge branch 'sprint/167_tianshujie_15634' into 'sprint/167' 
* Fix bug #15634.

See merge request easycorp/zentaopms!108
 2021-10-19 10:14:30 +00:00
李玉春 71c5b684fd Merge branch 'sprint/167_hufangzhou_compatible' into 'sprint/167' 
* Compatible with pro version in mobile.

See merge request easycorp/zentaopms!104
 2021-10-19 09:47:02 +00:00
李玉春 579763d5f8 Merge branch 'sprint/167_sgm_fixbug' into 'sprint/167' 
* Fix bug #15635.

See merge request easycorp/zentaopms!105
 2021-10-19 09:44:29 +00:00
李玉春 a11155b1db Merge branch 'sprint/167_sgm_apitest' into 'sprint/167' 
* Add insert user test.

See merge request easycorp/zentaopms!89
 2021-10-19 03:56:56 +00:00
李玉春 310190aeb9 Merge branch 'sprint/167_mayue_15506' into 'sprint/167' 
Sprint/167 mayue 15506

See merge request easycorp/zentaopms!87
 2021-10-18 09:32:25 +00:00
李玉春 68c2d64f67 Merge branch 'sprint/167_xieqiyu_15561' into 'sprint/167' 
* Fix bug#15561.

See merge request easycorp/zentaopms!86
 2021-10-18 08:39:46 +00:00
李玉春 1ee2b61d95 Merge branch 'sprint/167_xieqiyu_15457' into 'sprint/167' 
* Fix bug#15457.

See merge request easycorp/zentaopms!78
 2021-10-18 01:17:58 +00:00
李玉春 88323d34da Merge branch 'sprint/167_hufangzhou_15544' into 'sprint/167' 
* Fix bug #15544.

See merge request easycorp/zentaopms!76
 2021-10-15 06:19:33 +00:00
李玉春 d27aaff476 Merge branch 'sprint/167_tianshujie_15541' into 'sprint/167' 
*Fix bug #15541.

See merge request easycorp/zentaopms!74
 2021-10-15 06:17:55 +00:00
李玉春 fae6d95bfe Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167' 
*Finish task #43169

See merge request easycorp/zentaopms!71
 2021-10-15 01:32:39 +00:00
李玉春 83f19c2b65 Merge branch 'sprint/167_tianshujie_43190' into 'sprint/167' 
* Finish task #43190.

See merge request easycorp/zentaopms!69
 2021-10-15 01:31:16 +00:00
李玉春 d215a06448 Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167' 
* Code for task#43168.

See merge request easycorp/zentaopms!65
 2021-10-14 05:53:17 +00:00
李玉春 8e1161b02c Merge branch 'sprint/167_tianshujie_43169' into 'sprint/167' 
* Finish task #43169.

See merge request easycorp/zentaopms!64
 2021-10-14 05:05:12 +00:00
李玉春 89be4c74c7 Merge branch '15.6_tianshujie_15484' into '15.6' 
* Fix bug #15484.

See merge request easycorp/zentaopms!63
 2021-10-13 09:23:33 +00:00
李玉春 5ba5ad9305 Merge branch 'sprint/167_xieqiyu_43173' into 'sprint/167' 
* Finish task#43173.

See merge request easycorp/zentaopms!59
 2021-10-13 07:31:18 +00:00
李玉春 26026cbf89 Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167' 
* Finish task#43168.

See merge request easycorp/zentaopms!58
 2021-10-13 03:10:29 +00:00
李玉春 aa9252f50b Merge branch 'sprint/167_xieqiyu_43168' into 'sprint/167' 
* Finish task#43168.

See merge request easycorp/zentaopms!56
 2021-10-13 00:42:34 +00:00
李玉春 79fc550337 Merge branch 'sprint/167_xieqiyu_43173' into 'sprint/167' 
* Finish task#43173.

See merge request easycorp/zentaopms!55
 2021-10-13 00:41:49 +00:00
李玉春 01b777c445 Merge branch 'sprint/167_hufangzhou_43188' into 'sprint/167' 
* Finish task #43188.

See merge request easycorp/zentaopms!51
 2021-10-13 00:27:43 +00:00