Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,553 Commits 2 Branches 292 Tags
e623a13cb2c5023461c85ecf091d281cff4e45d1
Commit Graph
28553 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
孙广明 e623a13cb2 Merge branch 'sprint/168_xiawenlong' into 'sprint/168' 
add right actions

See merge request easycorp/zentaopms!173
 2021-10-27 05:37:43 +00:00
xiawenlong b571de52de add right actions 2021-10-27 11:46:54 +08:00
朱金勇 57995a6e7f Merge branch 'sprint/168_sunhao/refactor_avatar_helper' into 'sprint/168' 
* Refactor avatar helper, the $user param cannot be an avatar url now.

See merge request easycorp/zentaopms!161
 2021-10-27 03:01:59 +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
孙广明 15fcbf79e8 Merge branch 'sprint/168_liyuchun_43503' into 'sprint/168' 
Sprint/168 liyuchun 43503

See merge request easycorp/zentaopms!171
 2021-10-27 02:46:22 +00:00
liyuchun d7868c41e3 * Code for task #43503. 2021-10-27 10:38:52 +08:00
liyuchun c0502c85fd * Code for task #43503. 2021-10-27 10:35:51 +08:00
孙广明 90079cd4fb Merge branch 'sprint/tengfei_168_lang' into 'sprint/168' 
* Edit dept lang.

See merge request easycorp/zentaopms!169
 2021-10-27 02:26:14 +00:00
reneeteng 1b3e236f01 * Edit dept lang. 2021-10-27 10:19:25 +08:00
孙广明 ee28e0f7ef * Add bind product action. 2021-10-27 09:37:39 +08:00
孙广明 3a4933ef96 Merge branch 'sprint/168_zenggang_15488' into 'sprint/168' 
* Fix bug#15488

See merge request easycorp/zentaopms!163
 2021-10-27 01:27:09 +00:00
孙广明 2ae094b948 Merge branch 'sprint/168_sunhao/improve_kanban_ui' into 'sprint/168' 
* Fix last merge conflict from kanban_demo and improve avatar style.

See merge request easycorp/zentaopms!162
 2021-10-27 00:58:10 +00:00
zenggang 51531e1e6b * Fix bug#15488 2021-10-26 09:39:25 +00:00
Hao Sun 14d45f2939 * move some code from kanban_demo. 2021-10-26 16:59:24 +08:00
Hao Sun 77d4073869 * improve avatar style in kanban. 2021-10-26 16:57:36 +08:00
Hao Sun a6e7949301 * refactor avatar helper, the $user param cannot be an avatar url now. 2021-10-26 16:39:44 +08:00
孙广明 7ad0747fd6 Merge branch 'sprint/168_zenggang' into 'sprint/168' 
* Fix menu pri judge

See merge request easycorp/zentaopms!159
 2021-10-26 07:57:05 +00:00
孙广明 d48c8c0d5a Merge branch 'sprint/168_sunhao/kanban_demo' into sprint/168 2021-10-26 15:56:09 +08:00
孙广明 fb5687c6a4 Merge branch 'sprint/168' into 'sprint/168_sunhao/kanban_demo' 
# Conflicts:
#   module/execution/js/kanban.js
#   module/execution/view/kanban.html.php
 2021-10-26 07:53:38 +00:00
zenggang 1da7061d7a * Fix menu pri judge 2021-10-26 07:49:56 +00:00
Hao Sun 0063ed7950 * replace kanban with kanbandemo. 2021-10-26 15:47:50 +08:00
Hao Sun b6f3608ab4 * change kanban page width to full size. 2021-10-26 15:38:00 +08:00
孙广明 e2d368f251 Merge branch 'sprint/168_liyuchun_43519' into 'sprint/168' 
Sprint/168 liyuchun 43519

See merge request easycorp/zentaopms!155
 2021-10-26 07:31:02 +00:00
liyuchun c45866a3a3 * Code for task #43519. 2021-10-26 15:24:09 +08: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
孙广明 ad05f1d4cf * Add kanban view. 2021-10-26 15:03:27 +08:00
Hao Sun cc3fb38f50 * fix maxCount not show in kanban header. 2021-10-26 14:55:12 +08:00
Hao Sun f5420202e2 * remove width limit in kanban page. 2021-10-26 14:54:57 +08:00
Hao Sun 43d52ddb9b * improve style for affixed header in kanban. 2021-10-26 14:54:16 +08: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
liyuchun 0dc857f2bb * Code for task #43519. 2021-10-26 14:38:00 +08:00
tianshujie 4d09ade9cb * Get card data of kanban column. 2021-10-26 14:37:39 +08:00
tianshujie 83a1e66eab * Adjust code. 2021-10-26 13:35:02 +08:00
tianshujie f8447c9825 * Correct Kanban data. 2021-10-26 11:46:33 +08:00
Hao Sun 920b8234a3 + add kanban demo files. 2021-10-26 11:42:23 +08: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
tianshujie 4a2b7dae24 * Add comment of kanban model.php 2021-10-26 10:49:42 +08: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
tianshujie a71cacdaa8 * Refactoring the Kanban function. 2021-10-26 10:25:33 +08:00
王怡栋 b77f8474c3 Merge branch 'sprint/168_liugang_bug' into 'sprint/168' 
* Remove the outdated code.

See merge request easycorp/zentaopms!143
 2021-10-25 09:07:40 +00:00
liugang f860008e56 * Remove the outdated code. 2021-10-25 16:18:48 +08:00
tianshujie 546edae92a * Adjust code of kanban. 2021-10-25 16:11:36 +08: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
王怡栋 c0cf35c191 Merge branch 'sprint/168_sgm_kanban' into 'sprint/168' 
* Add project managed products lang.

See merge request easycorp/zentaopms!139
 2021-10-25 07:35:22 +00:00
dingna 5ad02fe558 * Fix the bug that no navigation after clicking the subtask on the Work page. 2021-10-25 15:25:28 +08:00
tianshujie a72b84e257 * Get Kanban data. 2021-10-25 15:03:27 +08:00
dingna 6765c0bdae * Add testcase of product. 2021-10-25 14:48:21 +08:00
tianshujie 3d22a50a00 * Create the single execution Kanban lane and Kanban column. 2021-10-25 14:13:44 +08:00
孙广明 d76b563cc5 * Add project managed products lang. 2021-10-25 13:34:41 +08:00
孙广明 cd371a9491 Merge branch 'sprint/168_liyuchun_api' into 'sprint/168' 
* Adjust cases of testcase.

See merge request easycorp/zentaopms!130
 2021-10-25 02:33:58 +00:00