Commit Graph
227 Commits
Author SHA1 Message Date
王怡栋 861242917e Merge branch 'sprint/master_zhouxudong_26612' into 'master'
* Fix bug #26612.

See merge request easycorp/zentaopms!5026
2022-08-19 05:11:53 +00:00
王怡栋 2794dbb783 Merge branch 'sprint/229_zhouxudong_64882' into 'master'
Sprint/229 zhouxudong 64882

See merge request easycorp/zentaopms!5022
2022-08-19 05:11:07 +00:00
zhouxudong 6312af0dea * Fix bug #26612. 2022-08-19 03:11:05 +00:00
zhouxudong fea283edf4 * Finish task #64882. 2022-08-17 06:26:44 +00:00
zhouxudong 49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
wangyidong 901d2b95a0 Merge branch 'sprint/master_zhouxudong_code' 2022-08-10 15:29:23 +08:00
lanzongjun 5f34fa4706 * fix bug #26159 2022-08-10 14:49:20 +08:00
zhouxudong 266fdf9ca7 * Update code. 2022-08-10 05:42:26 +00:00
zhouxudong ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
lanzongjun 0e75eed65c fix cp project 2022-08-08 18:57:16 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
lanzongjun 15cce6ebfa fix cp project 2022-08-08 18:18:09 +08:00
zhouxudong abc59ed7aa * Finish task #63679. 2022-08-07 15:21:43 +00:00
zhouxudong cf009e9c80 * Reconstruction method. 2022-08-05 01:58:27 +00:00
zhouxudong 545f58f944 * Finish task #62850. 2022-08-03 09:25:08 +00:00
zhouxudong 73ec96dc8f * Finish task #62850. 2022-08-02 09:32:21 +00:00
zhouxudong 6a784fdfda * Finish task #62850. 2022-08-02 08:50:16 +00:00
zhouxudong 364a5009f4 * Finish task #62850. 2022-08-02 07:21:03 +00:00
lanzongjun e6eff527d2 move code 2022-07-26 14:56:50 +08:00
lanzongjun e1068f2387 fix bug kanban project enter 2022-07-26 08:37:30 +08:00
lanzongjun 5d3bd547e0 * finish task #62245 2022-07-25 16:12:22 +08:00
lanzongjun 7fe505f4b2 add css 2022-07-22 13:14:51 +08:00
lanzongjun ffa0bbe650 add js notes 2022-07-21 13:12:38 +08:00
lanzongjun f2310c30dd tmp 2022-07-20 18:21:02 +08:00
lanzongjun e5c2184bab tmp 2022-07-20 18:06:34 +08:00
lanzongjun 658eedc2d5 tmp 2022-07-20 15:30:47 +08:00
lanzongjun 3c24e61b69 tmp 2022-07-19 17:24:52 +08:00
tianshujie 7eed8e4a2b * Finish task #61180. 2022-07-19 13:52:40 +08:00
tianshujie b5a9fe8c52 * Fix bug #25234,25233. 2022-07-14 09:57:56 +08:00
sunjun cf11a3a4fe fixConflict_24687 2022-07-13 05:31:43 +00:00
tianshujie c52fc59335 * Fix bug #25072. 2022-07-13 11:26:59 +08:00
zhouxudong eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
xieqiyu 38dad8467f * Finish task#56922. 2022-06-14 15:00:08 +08:00
王怡栋 f5788a4535 Merge branch 'sprint/204_tianshujie_57098' into 'master'
Sprint/204 tianshujie 57098

See merge request easycorp/zentaopms!3900
2022-06-14 05:28:03 +00:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
zhouxudong d376e41579 * Finish task #56908 #56914 #56921. 2022-06-13 07:35:54 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
xieqiyu cd1c1e1b63 * Finish task#54477. 2022-05-20 10:52:30 +08:00
孙广明 57a39efdea * Fix bug #17618. 2022-04-21 10:17:47 +08:00
tianshujie 685a583d99 * Fix bug #17551. 2022-04-18 10:50:50 +08:00
tianshujie 27b6817c2c * Fix bug #17551. 2022-04-14 17:11:36 +08:00
tianshujie 90a1fea2d8 * Fix bug #17551. 2022-04-13 13:35:02 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
tianshujie 1d91f13687 * Fix bug #17551. 2022-03-31 14:22:35 +08:00
王怡栋 15a3516aca Merge branch 'master' into 165_package 2022-03-28 08:50:18 +08:00
tianshujie d3e63841fa * Fix bug #20559. 2022-03-25 15:00:30 +08:00
tianshujie 7c46d9c61d * Fix bug #17291. 2022-03-25 12:51:59 +08:00
zhouxin 3291a491c9 Fix bug. 2022-03-24 08:55:56 +00:00