Commit Graph
1357 Commits
Author SHA1 Message Date
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
tianshujie 095b35b675 * Fix bug #26339. 2022-08-19 13:48:57 +08:00
王怡栋 fe898f9e20 Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
2022-08-17 07:33:25 +00:00
tianshujie 64c7f8dc23 * Finish task #63687. 2022-08-17 13:15:35 +08:00
tianshujie 72ef1b0ebd * Refactor the getStats method under the project. 2022-08-15 15:59:42 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
孙广明 77b27f5eb3 Merge branch 'lyk_fixbug' into 'master'
* Fix bug of the view of admin in lite

See merge request easycorp/zentaopms!4929
2022-08-12 00:14:12 +00:00
liuyongkai 3d5f702b1e * Fix bug of kanban and the view of admin in lite 2022-08-11 07:19:07 +00:00
hufangzhou e97a5a7361 * Add the new version. 2022-08-11 10:55:29 +08:00
liuyongkai e14424eba3 * Fix bug #26065 2022-08-10 05:46:55 +00:00
liuyongkai 0da420f283 * Fix bug #26065 2022-08-10 05:20:19 +00:00
王怡栋 ca91a4c8aa Merge branch 'sprint/224_liumengyi_fixissue' into 'master'
* Fix issue #709.

See merge request easycorp/zentaopms!4833
2022-08-08 08:46:11 +00:00
liuyongkai 628834cbab * Fix the view of kanbans' content 2022-08-08 05:28:11 +00:00
liuyongkai 7e7b535c13 * Fix the view of kanbans' content 2022-08-08 05:25:02 +00:00
liumengyi 1d9846d808 * Fix issue #709. 2022-08-08 10:43:38 +08:00
sunguangming 1e05476b43 * Code for kanban action. 2022-08-05 17:35:29 +08:00
sunguangming b065484875 * Code for kanban btn. 2022-08-05 14:29:56 +08:00
王怡栋 06031a7f7e Merge branch 'sprint/221_tianshujie_25944' into 'master'
* Fix bug #25944.

See merge request easycorp/zentaopms!4811
2022-08-05 02:50:51 +00:00
tianshujie 926f41277f * Fix bug #25944. 2022-08-05 10:48:08 +08:00
tianshujie 2132dd6bb5 * Fix bug #25944. 2022-08-05 08:59:07 +08:00
wangyidong 38b85c9262 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-04 17:26:56 +08:00
wangyidong a0a56c2b96 * fix bug #26064,26065. 2022-08-04 17:25:32 +08:00
liumengyi c9fc80ef4d * Fix bug #26025. 2022-08-04 15:50:40 +08:00
王怡栋 b0079165da Merge branch 'sprint/221_tianshujie_25732' into 'master'
* Fix bug #25732.

See merge request easycorp/zentaopms!4798
2022-08-04 06:51:25 +00:00
tianshujie bfbc7b1e1b * Fixed style issues with deferred execution cards. 2022-08-04 14:49:16 +08:00
sunguangming 6fd31be063 * Fix comment. 2022-08-04 11:04:59 +08:00
sunguangming ab34dbce82 * Code for task #62734. 2022-08-04 11:01:57 +08:00
sunguangming 728834da26 * Finish task #62733. 2022-08-04 09:49:35 +08:00
王怡栋 77e01714d2 Merge branch 'sprint/211_liumengyi_62958' into 'master'
* Finish task #62957, #62958.

See merge request easycorp/zentaopms!4760
2022-08-03 07:46:59 +00:00
liumengyi 56c6349d0d * Fix bug #25967. 2022-08-03 13:03:11 +08:00
liumengyi 2ab2e3a2fb * Finish task #62958. 2022-08-03 11:18:14 +08:00
liumengyi 9238ad1965 * Finish task #62957. 2022-08-03 11:17:49 +08:00
liumengyi 6d019f65e5 * Fix bug for task #62935. 2022-08-03 08:39:25 +08:00
liumengyi 5977be1fde * Finish task #62935, and add fr lang file. 2022-08-02 09:13:01 +08:00
liumengyi dd2c92fb9d * Finish task #62935. 2022-08-01 15:41:14 +08:00
tianshujie 961de62c13 * Fixed the issue of create and edit kanban page newlines. 2022-07-28 14:21:48 +08:00
王怡栋 5ec5c071f3 Merge branch 'sprint/220_tianshujie_fixbug' into 'master'
Sprint/220 tianshujie fixbug

See merge request easycorp/zentaopms!4707
2022-07-28 05:47:21 +00:00
liumengyi e13315a151 * Finish task #62494. 2022-07-28 09:57:02 +08:00
tianshujie 4268af5d06 * Fix function name. 2022-07-27 16:22:42 +08:00
tianshujie 06b864abf4 * Remove redundant parameters. 2022-07-21 16:39:43 +08:00
tianshujie 248ea09a59 * Fix bug #25450. 2022-07-20 08:51:50 +08:00
tianshujie 35537ff9db * Fix bug #25453. 2022-07-19 16:33:03 +08:00
tianshujie 468ce6bd6c * Fix bug #25444. 2022-07-19 15:14:39 +08:00
tianshujie fe276e667f * Fix bug #25437. 2022-07-19 14:54:14 +08:00
tianshujie 599bd7504f * Finish task #61169. 2022-07-19 09:42:42 +08:00
tianshujie c7a3e799f7 * Finish task #61169. 2022-07-19 09:39:03 +08:00
tianshujie 1b65879003 * Finish task #61169. 2022-07-19 09:31:50 +08:00
tianshujie 8dff584576 * Finish task #61169. 2022-07-18 17:51:05 +08:00
tianshujie c11d07e84e * Finish task #61169. 2022-07-18 15:41:02 +08:00
tianshujie 01667100f0 * Fix bug #25309. 2022-07-14 16:26:30 +08:00