Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
28,734 Commits 2 Branches 292 Tags
e7c595df19fdf7082df4f1b4e85cf56d6d426645
Commit Graph
28734 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
李玉春 e7c595df19 Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168' 
* Fix bug#15886.

See merge request easycorp/zentaopms!268
 2021-11-02 00:33:07 +00:00
xieqiyu 47ee3885ba * Optimize the code. 2021-11-02 08:27:32 +08:00
孙广明 1c98dbd28b Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168' 
* Fix bug #15887,#15877,#15874.

See merge request easycorp/zentaopms!266
 2021-11-01 09:18:16 +00:00
liyuchun 38fe82e21d * Fix bug #15874. 2021-11-01 16:57:10 +08:00
liyuchun 1631791368 * Fix bug #15887,#15877. 2021-11-01 16:54:02 +08:00
李玉春 5cfaf07475 Merge branch 'sprint/168_hufangzhou_43423' into 'sprint/168' 
* Code for task #43423.

See merge request easycorp/zentaopms!264
 2021-11-01 08:41:04 +00:00
李玉春 38da2ef80d Merge branch 'sprint/168_tianshujie_15882' into 'sprint/168' 
* Fix bug #15882.

See merge request easycorp/zentaopms!263
 2021-11-01 08:40:07 +00:00
李玉春 44c5cfdbc4 Merge branch 'sprint/168_tianshujie_15871' into 'sprint/168' 
* Fix bug #15871.

See merge request easycorp/zentaopms!262
 2021-11-01 08:39:12 +00:00
hufangzhou aadb69106d * Code for task #43423. 2021-11-01 16:32:28 +08:00
孙广明 065b0d04c9 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' 
* Fix bug #15867.

See merge request easycorp/zentaopms!260
 2021-11-01 08:30:11 +00:00
tianshujie 7af3f622c0 * Fix bug #15871. 2021-11-01 16:26:50 +08:00
李玉春 697498e199 Merge branch 'sprint/168_xieqiyu_merge' into 'sprint/168' 
* Delete the unused code.

See merge request easycorp/zentaopms!259
 2021-11-01 08:22:31 +00:00
xieqiyu 19fca33fa3 * Delete the unused code. 2021-11-01 16:20:01 +08:00
xieqiyu edc60704d5 * Add color to the lane. 2021-11-01 16:15:22 +08:00
李玉春 a3e3b5a7fd Merge branch 'sprint/168_tianshujie_15881' into 'sprint/168' 
* Fix bug #15881.

See merge request easycorp/zentaopms!258
 2021-11-01 08:14:47 +00:00
liyuchun bec1e33ea2 Merge branch 'sprint/168_hufangzhou_43423' into sprint/168 2021-11-01 16:13:56 +08:00
liyuchun d8c96a6430 * Fix bug #15867. 2021-11-01 16:13:13 +08:00
李玉春 16b6f5786e Merge branch 'sprint/168' into 'sprint/168_hufangzhou_43423' 
# Conflicts:
#   module/execution/js/kanban.js
#   module/kanban/model.php
 2021-11-01 08:12:58 +00:00
李玉春 353b9bbb33 更新module/kanban/control.php 2021-11-01 08:12:17 +00:00
李玉春 9ccc42efc0 更新module/kanban/model.php 2021-11-01 08:11:47 +00:00
李玉春 c118bfe048 更新module/execution/js/kanban.js 2021-11-01 08:05:08 +00:00
孙广明 2b2ec6f202 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' 
* Fix bug #15861.

See merge request easycorp/zentaopms!252
 2021-11-01 08:02:42 +00:00
hufangzhou 200801ebee * Add the dynamic for moving swimlane. 2021-11-01 15:51:30 +08:00
tianshujie 201ee20f1e * Fix bug #15882. 2021-11-01 15:44:06 +08:00
dingna 4450c96453 * Fix lang for select menu. 2021-11-01 15:38:34 +08:00
tianshujie 5d438c910e * Fix bug #15881. 2021-11-01 15:38:08 +08:00
李玉春 c72bde8698 Merge branch 'sprint/168_tianshujie_15878' into 'sprint/168' 
* Fix bug #15878.

See merge request easycorp/zentaopms!257
 2021-11-01 07:32:14 +00:00
tianshujie 6417119744 * Fix bug #15878. 2021-11-01 15:28:35 +08:00
李玉春 d66dbe0d13 Merge branch 'sprint/168_tianshujie_15876' into 'sprint/168' 
* Fix bug #15876.

See merge request easycorp/zentaopms!256
 2021-11-01 07:25:31 +00:00
tianshujie 9d1899e3ff * Fix bug #15876. 2021-11-01 14:39:21 +08:00
hufangzhou f0349dac2c * Adjust the variable name. 2021-11-01 14:11:21 +08:00
孙广明 4099ac4a20 Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168' 
Sprint/168 xieqiyu kanban

See merge request easycorp/zentaopms!253
 2021-11-01 05:53:00 +00:00
hufangzhou 702c40addd * Finish task #43423. 2021-11-01 13:50:53 +08:00
liyuchun 7d31524581 * Fix bug #15861. 2021-11-01 13:45:43 +08:00
dingna c28e4c1b61 * Fix code for task#43401,#43403,#43404,#43405,#43398,#43399. 2021-11-01 13:26:57 +08:00
xieqiyu c08c981ab0 * Display the sub Lane view kanban. 2021-11-01 13:13:56 +08:00
孙广明 2d2609618c Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' 
* Adjust create object in kanban.

See merge request easycorp/zentaopms!250
 2021-11-01 05:06:36 +00:00
liyuchun 970763b0c5 * Adjust create object in kanban. 2021-11-01 11:32:21 +08:00
朱金勇 ad9ddb07d4 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168' 
* Limit range for iframe modal triggers.

See merge request easycorp/zentaopms!234
 2021-11-01 02:10:25 +00:00
李玉春 317e423180 Merge branch 'sprint/168_tianshujie_lang' into 'sprint/168' 
* merge code of kanban lang.

See merge request easycorp/zentaopms!241
 2021-11-01 00:59:04 +00:00
tianshujie b9c0807023 * merge code of kanban lang. 2021-10-29 17:20:20 +08:00
李玉春 b5532e7379 Merge branch 'sprint/168_tianshujie_kanban' into 'sprint/168' 
* Add a default color to the kanban column.

See merge request easycorp/zentaopms!239
 2021-10-29 07:15:20 +00:00
liyuchun f6ce6f4e42 Merge branch 'sprint/168_dingna_enlang' into sprint/168 2021-10-29 15:12:02 +08:00
李玉春 1187d1cb81 Merge branch 'sprint/168' into 'sprint/168_dingna_enlang' 
# Conflicts:
#   module/kanban/lang/zh-cn.php
 2021-10-29 07:10:27 +00:00
tianshujie 70349fe46a * Add a default color to the kanban column. 2021-10-29 15:05:33 +08:00
孙广明 06feb0f942 Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168' 
* Fix error of save WIP.

See merge request easycorp/zentaopms!240
 2021-10-29 07:04:08 +00:00
孙广明 4c91b03239 Merge branch 'sprint/168_zenggang_tasks' into 'sprint/168' 
* Finish task#43410,43411,43413

See merge request easycorp/zentaopms!227
 2021-10-29 07:03:13 +00:00
tianshujie bf032684e4 * Add a default color to the kanban column. 2021-10-29 14:49:17 +08:00
liyuchun dfc29b5cb2 * Fix error of save WIP. 2021-10-29 14:48:38 +08:00
dingna e352053c76 * Fix language items. 2021-10-29 14:37:35 +08:00