 daitingting
|
cfc20958d0
|
* Fix bug #24903.
|
2022-07-07 02:35:55 +00:00 |
|
|
tianshujie
|
40ca319394
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/211_tianshujie_58555
|
2022-07-07 09:41:09 +08:00 |
|
|
刘刚
|
52da827d60
|
Merge branch 'sprint/zentaobiz10' into 'master'
* Fix bug #24908.
See merge request easycorp/zentaopms!4394
|
2022-07-07 01:23:55 +00:00 |
|
|
daitingting
|
3bdeeea0f0
|
* Fix bug #24908.
|
2022-07-07 01:12:48 +00:00 |
|
|
tianshujie
|
dc7e0ec546
|
* Put the functions that add and remove elements in my.full.js.
|
2022-07-06 16:37:10 +08:00 |
|
|
tanghucheng
|
9eeb2c64e6
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-06 16:33:55 +08:00 |
|
|
tanghucheng
|
c7c198453c
|
* Finish simple export.
|
2022-07-06 16:33:33 +08:00 |
|
|
王怡栋
|
f25fcc1eb2
|
Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
# module/testcase/css/create.css
|
2022-07-06 06:47:25 +00:00 |
|
|
tanghucheng
|
eaf2ff65ed
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport
|
2022-07-06 14:36:13 +08:00 |
|
|
tanghucheng
|
b03afaebb3
|
* Code for export.
|
2022-07-06 14:35:09 +08:00 |
|
|
zhouxudong
|
1e1ce39096
|
* Fix bug #24736 #24738 #24745 #24748 #24844 #24849.
|
2022-07-06 06:18:09 +00:00 |
|
|
刘刚
|
d3174ab36c
|
Merge branch 'sprint/zentaobiz10' into 'master'
Sprint/zentaobiz10
See merge request easycorp/zentaopms!4368
|
2022-07-06 03:07:19 +00:00 |
|
|
liumengyi
|
6464887f89
|
* Fix bug #24753.
|
2022-07-06 08:42:21 +08:00 |
|
|
liumengyi
|
b5608fb799
|
* Fix bug #24754.
|
2022-07-06 08:41:51 +08:00 |
|
|
tianshujie
|
577b42f32c
|
* Hide required fields in custom forms.
|
2022-07-06 08:41:20 +08:00 |
|
|
tianshujie
|
cdaf164f0a
|
* Fix bug #24752,24747.
|
2022-07-06 08:26:27 +08:00 |
|
|
daitingting
|
be44e76cb9
|
* Finish task #59646.
|
2022-07-05 09:20:47 +00:00 |
|
|
王怡栋
|
bc00e9f66c
|
Merge branch 'sprint/211_tianshujie_59475' into 'master'
Sprint/211 tianshujie 59475
See merge request easycorp/zentaopms!4353
|
2022-07-05 08:30:47 +00:00 |
|
|
tianshujie
|
64c23417d0
|
* Modify style issues.
|
2022-07-05 16:05:33 +08:00 |
|
|
tianshujie
|
f186662f35
|
* Transfer variable.
|
2022-07-05 15:31:23 +08:00 |
|
|
zhouxudong
|
b9ee65ddfd
|
* Fix bug #24751.
|
2022-07-05 06:54:04 +00:00 |
|
|
tianshujie
|
4c4e67f7e8
|
* Finish task #59475.
|
2022-07-05 14:08:00 +08:00 |
|
|
tianshujie
|
1bae5b38d1
|
* Finish task #59472.
|
2022-07-05 14:00:34 +08:00 |
|
|
tianshujie
|
e29794271a
|
* Delete extra blank lines.
|
2022-07-05 13:19:56 +08:00 |
|
|
tianshujie
|
4e05cb1916
|
* Finish task #59472.
|
2022-07-05 13:19:03 +08:00 |
|
|
王怡栋
|
a6916a73c5
|
Merge branch 'sprint/master_zhouxudong_59527' into 'master'
Sprint/master zhouxudong 59527
See merge request easycorp/zentaopms!4326
|
2022-07-05 02:07:26 +00:00 |
|
|
王怡栋
|
db007fe5eb
|
Merge branch 'sprint/211_tianshujie_59472' into 'master'
Sprint/211 tianshujie 59472
See merge request easycorp/zentaopms!4327
|
2022-07-05 01:54:17 +00:00 |
|
|
tianshujie
|
17a8e9dcd5
|
* Changing the name of a function.
|
2022-07-05 08:47:45 +08:00 |
|
|
tianshujie
|
21d8a543a4
|
* Fix bug #24721.
|
2022-07-04 17:20:35 +08:00 |
|
|
tianshujie
|
3028701a06
|
* Finish task #59472.
|
2022-07-04 17:18:20 +08:00 |
|
|
王怡栋
|
4e1f22be8a
|
Merge branch 'sprint/212_zhouxudong_59542' into 'master'
Sprint/212 zhouxudong 59542
See merge request easycorp/zentaopms!4321
|
2022-07-04 07:50:04 +00:00 |
|
|
zhouxudong
|
5af55d653b
|
* Finish task #59542 #59541.
|
2022-07-04 07:46:30 +00:00 |
|
|
zhouxudong
|
1c00265c79
|
* Finish task #59527 #59572.
|
2022-07-04 07:21:39 +00:00 |
|
|
王怡栋
|
4bacc1b95f
|
Merge branch 'sprint/211_liumengyi_59468' into 'master'
* Finish task #59468.
See merge request easycorp/zentaopms!4316
|
2022-07-04 07:04:37 +00:00 |
|
|
liumengyi
|
247458ba1e
|
* Optimize code of task #59468.
|
2022-07-04 15:03:49 +08:00 |
|
|
王怡栋
|
04b2a5994f
|
Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554
See merge request easycorp/zentaopms!4317
|
2022-07-04 06:59:21 +00:00 |
|
|
tianshujie
|
6fc6d25a48
|
* Finish task #58554.
|
2022-07-04 14:48:24 +08:00 |
|
|
tianshujie
|
3e19862ed1
|
* Finish task #58554.
|
2022-07-04 14:12:36 +08:00 |
|
|
zhouxudong
|
6b960dc038
|
* Finish task #59542 #59541.
|
2022-07-04 05:57:34 +00:00 |
|
|
tianshujie
|
ee701c75c9
|
* Finish task #58554.
|
2022-07-04 13:20:09 +08:00 |
|
|
liumengyi
|
89f5ead39c
|
* Modify French language items.
|
2022-07-04 11:28:49 +08:00 |
|
|
liumengyi
|
7f9f5f662c
|
* Finish task #59468.
|
2022-07-04 11:21:56 +08:00 |
|
|
孙广明
|
52a588ec90
|
* Code for kanban error.
|
2022-07-01 14:38:20 +08:00 |
|
|
zhouxudong
|
1e4f5f1e7d
|
* Fix bug of batchCreate Task.
|
2022-07-01 05:19:00 +00:00 |
|
|
王怡栋
|
be04312358
|
Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug for preview.
See merge request easycorp/zentaopms!4285
|
2022-07-01 00:17:54 +00:00 |
|
|
孙广明
|
f04bcce5cf
|
Merge branch 'fixbug_22007' into 'master'
fixbug_22007
See merge request easycorp/zentaopms!4286
|
2022-07-01 00:15:12 +00:00 |
|
|
sunjun
|
7882690c49
|
fixbug_22007
|
2022-06-30 09:16:49 +00:00 |
|
|
zhouxudong
|
3970773281
|
* Fix bug for preview.
|
2022-06-30 09:08:57 +00:00 |
|
|
zhouxudong
|
502e3db733
|
* Iframe and disable will be invalid.
|
2022-06-30 08:35:22 +00:00 |
|
|
zhouxudong
|
bd848e13e2
|
* Fix bug #24598.
|
2022-06-30 05:51:38 +00:00 |
|