wangzemei
|
ea750ec99e
|
* add dividing judge
|
2022-09-15 08:32:48 +00:00 |
|
wangzemei
|
13c738817b
|
* add dividing judge
|
2022-09-15 07:01:59 +00:00 |
|
wangzemei
|
cfe34d7760
|
* add judge
|
2022-09-15 06:45:02 +00:00 |
|
wangzemei
|
5b04709721
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68935
|
2022-09-15 06:11:28 +00:00 |
|
wangzemei
|
f25ff4605b
|
* Finish #68935
|
2022-09-15 06:10:54 +00:00 |
|
李玉春
|
38e07b27af
|
Merge branch 'sprint/238' into 'master'
Sprint/238
See merge request easycorp/zentaopms!5347
|
2022-09-15 06:00:45 +00:00 |
|
wangyidong
|
80428dd470
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-09-15 10:49:55 +08:00 |
|
wangyidong
|
a497bafb9f
|
* fix bug.
|
2022-09-15 10:49:40 +08:00 |
|
王怡栋
|
701364bea5
|
Merge branch 'sprint/238_dyl_68929' into 'sprint/238'
* tash #68929, center the kanban title.
See merge request easycorp/zentaopms!5335
|
2022-09-15 02:47:55 +00:00 |
|
王怡栋
|
66a9f49aff
|
Merge branch 'sprint/238_dyl_68926' into 'sprint/238'
Sprint/238 dyl 68926
See merge request easycorp/zentaopms!5334
|
2022-09-15 02:47:39 +00:00 |
|
sunguangming
|
c1642ca43a
|
* Fix task error.
|
2022-09-15 10:33:29 +08:00 |
|
李玉春
|
03757200b4
|
Merge branch 'sprint/wangzemei/68931' into 'sprint/238'
Sprint/wangzemei/68931
See merge request easycorp/zentaopms!5333
|
2022-09-15 01:52:19 +00:00 |
|
wangzemei
|
202d334ef9
|
* Format
|
2022-09-15 01:51:15 +00:00 |
|
Guan Xiying
|
ae2f8881c5
|
* Rename exportJS to show.
|
2022-09-15 09:07:43 +08:00 |
|
wangzemei
|
147c1bbebf
|
Merge branch 'sprint/238' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/68931
|
2022-09-15 00:27:36 +00:00 |
|
李玉春
|
4b1b93ea4a
|
Merge branch 'sprint/238_tianshujie_68925' into 'sprint/238'
Sprint/238 tianshujie 68925
See merge request easycorp/zentaopms!5323
|
2022-09-15 00:25:03 +00:00 |
|
tianshujie
|
1782693e31
|
* Restore code.
|
2022-09-15 08:23:42 +08:00 |
|
李玉春
|
a7469ef72a
|
Merge branch 'unittest_ly' into 'master'
* Fix unit test config.
See merge request easycorp/zentaopms!5328
zentaopms_17.6.1
|
2022-09-15 00:16:15 +00:00 |
|
liyang
|
c71e749a69
|
* Fix init.
|
2022-09-14 09:17:30 +00:00 |
|
liyang
|
c87c77b709
|
* Fix init.
|
2022-09-14 09:14:48 +00:00 |
|
liyang
|
8e47691358
|
* Fix unit test config.
|
2022-09-14 09:03:22 +00:00 |
|
王怡栋
|
32fd03714b
|
Merge branch 'sprint/238_dyl_input' into 'sprint/238'
* file input support mulitple.
See merge request easycorp/zentaopms!5318
|
2022-09-14 06:47:58 +00:00 |
|
王怡栋
|
4a3dae1ebc
|
Merge branch 'fixbug' into 'master'
* Fix bug for bug export.
See merge request easycorp/zentaopms!5320
|
2022-09-14 06:46:24 +00:00 |
|
tanghucheng
|
714dffe615
|
* Fix bug for bug export.
|
2022-09-14 14:42:44 +08:00 |
|
dingyongliang
|
5ceb75a7c2
|
* tash #68929, center the kanban title.
|
2022-09-14 06:04:57 +00:00 |
|
wangyidong
|
8db145922d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-09-14 13:40:05 +08:00 |
|
wangyidong
|
2b75baa004
|
* fix bug #27472.
|
2022-09-14 13:39:40 +08:00 |
|
李玉春
|
4ef95f8045
|
Merge branch 'sprint/238_tianshujie_68928' into 'sprint/238'
Sprint/238 tianshujie 68928
See merge request easycorp/zentaopms!5315
|
2022-09-14 05:07:29 +00:00 |
|
胡方舟
|
a5b3f9ba64
|
Merge branch 'sprint/tianshujie_bug' into 'master'
* Fix the problem that Kanban cannot be loaded.
See merge request easycorp/zentaopms!5319
|
2022-09-14 05:02:31 +00:00 |
|
tianshujie
|
9e84862b3f
|
* Fix the problem that Kanban cannot be loaded.
|
2022-09-14 11:49:02 +08:00 |
|
Guan Xiying
|
1deda7b09a
|
* Add dtable class.
|
2022-09-14 11:32:51 +08:00 |
|
dingyongliang
|
910850d4d9
|
* tash #68926, optimize the global avatar drop-down menu.
|
2022-09-14 03:24:54 +00:00 |
|
wangzemei
|
a5b9544795
|
* modify #68931
|
2022-09-14 03:21:39 +00:00 |
|
wangzemei
|
8641c4cc0a
|
* Finish task #68931
|
2022-09-14 03:15:06 +00:00 |
|
dingyongliang
|
ce4df54d24
|
* file input support mulitple.
|
2022-09-14 03:10:19 +00:00 |
|
tianshujie
|
29bd1d6588
|
* Update test case of program module.
|
2022-09-14 10:37:05 +08:00 |
|
tianshujie
|
bb53095727
|
* Finish task #68928.
|
2022-09-14 10:24:53 +08:00 |
|
sunguangming
|
3b8b7d2681
|
* Add lang 'my' to task.
|
2022-09-14 08:57:53 +08:00 |
|
李玉春
|
49e15f191c
|
Merge branch 'sprint/238_tianshujie_68942' into 'sprint/238'
* Finish task #68942,68941.
See merge request easycorp/zentaopms!5313
|
2022-09-14 00:48:03 +00:00 |
|
tianshujie
|
292b148253
|
* Finish task #68942.
|
2022-09-14 08:45:03 +08:00 |
|
wangyidong
|
383bee843a
|
* adjust for delete effort logic.
|
2022-09-13 17:22:13 +08:00 |
|
tianshujie
|
73f3a6d80a
|
* Finish task #68925.
|
2022-09-13 16:53:52 +08:00 |
|
wangyidong
|
0e46ac4a91
|
* fix bug #27468.
|
2022-09-13 16:36:32 +08:00 |
|
李玉春
|
94ef3611c7
|
Merge branch 'dht_unittest' into 'master'
Add api control.
See merge request easycorp/zentaopms!5312
|
2022-09-13 08:31:56 +00:00 |
|
denghongtao
|
1de133a79b
|
* Fix notes.
|
2022-09-13 08:28:16 +00:00 |
|
denghongtao
|
f2dc224448
|
* Fix controlapi.
|
2022-09-13 08:17:55 +00:00 |
|
denghongtao
|
ad5663c09d
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into dht_unittest
|
2022-09-13 07:32:53 +00:00 |
|
denghongtao
|
d9e152b444
|
Add api control.
|
2022-09-13 07:31:36 +00:00 |
|
wangyidong
|
ee148d3a0e
|
* fix bug #27447.
|
2022-09-13 15:29:55 +08:00 |
|
tianshujie
|
626de039fa
|
* Finish task #68928.
|
2022-09-13 15:10:40 +08:00 |
|