Commit Graph
24698 Commits
Author SHA1 Message Date
孙广明 d49b7eac72 * Fix kanban error. 2021-11-08 17:35:09 +08:00
李玉春 c97af049d8 Merge branch 'sprint/171_sgm_43948' into 'spirnt/168_liyuchun_bug'
Sprint/171 sgm 43948

See merge request easycorp/zentaopms!346
2021-11-08 09:04:11 +00:00
孙广明 c7529ca96f * Code for task #43998. 2021-11-08 17:01:31 +08:00
liyuchun bddeb2d5b2 * Remove more button in group lane. 2021-11-08 16:50:12 +08:00
孙广明 870b311f06 * Fix errors. 2021-11-08 16:32:18 +08:00
李玉春 b0e267571a Merge branch 'sprint/171_sgm_43948' into 'sprint/168'
Sprint/171 sgm 43948

See merge request easycorp/zentaopms!340
2021-11-08 07:53:34 +00:00
孙广明 3d00ecc5b0 * Fix an error. 2021-11-08 15:48:58 +08:00
孙广明 c2a9dd1d7b * Fix kanban details. 2021-11-08 15:39:35 +08:00
李玉春 e8039ed93a Merge branch 'sprint/171_sgm_43948' into 'sprint/168'
* Finish task #43948.

See merge request easycorp/zentaopms!337
2021-11-08 07:01:13 +00:00
孙广明 1f49e46582 * Finish task #43948. 2021-11-08 14:29:10 +08:00
李玉春 f4734d8249 Merge branch 'sprint/sgm_168_44003' into 'sprint/168'
Sprint/sgm 168 44003

See merge request easycorp/zentaopms!334
2021-11-08 06:13:06 +00:00
孙广明 d37ce3b5a3 Merge branch 'spirnt/168_liyuchun_bug' into 'sprint/168'
Spirnt/168 liyuchun bug

See merge request easycorp/zentaopms!331
2021-11-08 05:40:56 +00:00
liyuchun 743f03c2cf * Finish task #43929. 2021-11-08 13:35:49 +08:00
孙广明 791be24fb7 * Remove unused code. 2021-11-08 13:27:17 +08:00
孙广明 869faaeaaa * Remove unused code. 2021-11-08 13:26:26 +08:00
孙广明 1ecb25aabc * Code for task #43994. 2021-11-08 13:18:53 +08:00
孙广明 2fb46989d3 * Code for task #43997. 2021-11-08 13:15:56 +08:00
liyuchun e8f2b39833 * Finish task #43929. 2021-11-08 13:15:17 +08:00
孙广明 3965d5339b * Finish task #44002, #44003... 2021-11-08 13:12:25 +08:00
liyuchun ce439b9061 * Compatible php5.3. 2021-11-08 11:05:09 +08:00
孙广明 143abdf45b * Fix an error. 2021-11-08 11:02:11 +08:00
liyuchun 4f6739980e * Finish task #43937. 2021-11-08 10:31:34 +08:00
李玉春 ceef9ab63f Merge branch 'sprint/168_sgm_waterfall' into 'sprint/168'
Sprint/168 sgm waterfall

See merge request easycorp/zentaopms!329
2021-11-08 01:27:12 +00:00
孙广明 932d73fd12 * Fix menu. 2021-11-08 09:18:15 +08:00
孙广明 612c6e0728 * Add weekly and holiday. 2021-11-08 09:07:16 +08:00
holan20180123 3f01755d1b * Fix error of kanban session. 2021-11-07 20:48:04 +08:00
holan20180123 30b0c8db07 * Finish task #43938,#43939. 2021-11-07 20:31:28 +08:00
孙广明 d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
李玉春 31f72ade7b Merge branch 'sprint/168_sgm_44005' into 'sprint/168'
* Code for task #44005.

See merge request easycorp/zentaopms!313
2021-11-04 09:15:26 +00:00
孙广明 f9978c4841 * Code for task #44005. 2021-11-04 17:07:37 +08:00
孙广明 75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
孙广明 ad7fd76e1b Merge branch 'sprint/171_liyuchun_bug' into 'sprint/168'
* Finish task #43935.

See merge request easycorp/zentaopms!312
2021-11-04 08:44:28 +00:00
liyuchun 67f485736e * Fix error of task #43935. 2021-11-04 16:32:51 +08:00
liyuchun a6483ab2dc * Finish task #43935. 2021-11-04 16:24:32 +08:00
孙广明 62dced270b Merge branch 'sprint/171_liyuchun_bug' into 'sprint/168'
Finish task #43928, #43927.

See merge request easycorp/zentaopms!310
2021-11-04 06:16:45 +00:00
liyuchun edd4f50a8e * Fix bug #43928. 2021-11-04 14:10:00 +08:00
liyuchun 380941f957 * Fix bug #43927. 2021-11-04 10:06:14 +08:00
李玉春 3d2350112a Merge branch 'sprint/171_sgm_43987' into 'sprint/168'
* Code for task #43985.

See merge request easycorp/zentaopms!302
2021-11-04 02:01:53 +00:00
孙广明 5db6060e90 * Code for task #43985. 2021-11-04 09:53:03 +08:00
孙广明 88c410fdf2 Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15933.

See merge request easycorp/zentaopms!295
2021-11-03 09:17:19 +00:00
liyuchun 410499dc9a * Fix bug #43931. 2021-11-03 17:04:50 +08:00
liyuchun 28027af1b0 * Fix bug #43931. 2021-11-03 17:03:57 +08:00
liyuchun ddc8fade9a * Fix bug #15869. 2021-11-03 16:51:14 +08:00
李玉春 784a74c8f1 Merge branch 'sprint/171_sgm_43987' into 'sprint/168'
* Code for task #43985,#43984.

See merge request easycorp/zentaopms!294
2021-11-03 08:09:52 +00:00
孙广明 373b4746d0 * Code for task #43985,#43984. 2021-11-03 16:02:02 +08:00
tianshujie e4a97a5687 * Fix bug card update logic. 2021-11-03 12:34:03 +08:00
liyuchun 245d8ef65f * Fix bug #15933. 2021-11-03 09:40:21 +08:00
liyuchun a25e86cb59 * Adjust error of kanban action. 2021-11-03 09:15:07 +08:00
liyuchun 6ce13b1e17 * Fix bug #15928. 2021-11-03 08:57:46 +08:00
李玉春 f011907e1f Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168'
* Change var name.

See merge request easycorp/zentaopms!281
2021-11-02 06:13:46 +00:00