 Hao Sun
|
da2fa732bf
|
* fix white-space in table.
|
2022-08-10 03:08:56 +00:00 |
|
|
Hao Sun
|
bf68fdab37
|
* change text overflow style in table.
|
2022-08-04 05:18:31 +00:00 |
|
|
王怡栋
|
c80090ff79
|
Merge branch 'sprint/221_zg_bugs' into 'master'
* Fix bug#25998,26017,23426
See merge request easycorp/zentaopms!4783
|
2022-08-04 03:56:58 +00:00 |
|
|
wangyidong
|
8bea830d4a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 11:51:37 +08:00 |
|
|
wangyidong
|
0ce2b35004
|
* fix for change table engine for upgrade.
|
2022-08-04 11:51:03 +08:00 |
|
|
王怡栋
|
0f9f37e882
|
Merge branch 'sprint/devplat_30' into 'master'
* Set the value is empty if the value is not setted.
See merge request easycorp/zentaopms!4786
|
2022-08-04 03:26:55 +00:00 |
|
|
daitingting
|
c5036c1b55
|
* Set the value is empty if the value is not setted.
|
2022-08-04 03:22:07 +00:00 |
|
|
王怡栋
|
0c250672e0
|
Merge branch 'sgm_kanban' into 'master'
Sgm kanban
See merge request easycorp/zentaopms!4785
|
2022-08-04 03:13:45 +00:00 |
|
|
wangyidong
|
d06f01a509
|
* fix bug for upgrade.
|
2022-08-04 11:11:28 +08:00 |
|
|
sunguangming
|
6fd31be063
|
* Fix comment.
|
2022-08-04 11:04:59 +08:00 |
|
|
王怡栋
|
a1fc10a300
|
Merge branch 'sprint/222' into 'master'
Sprint/222
See merge request easycorp/zentaopms!4784
|
2022-08-04 03:03:16 +00:00 |
|
|
sunguangming
|
ab34dbce82
|
* Code for task #62734.
|
2022-08-04 11:01:57 +08:00 |
|
|
zhouxudong
|
4ac799f1d5
|
* Update Code.
|
2022-08-04 02:59:02 +00:00 |
|
|
zenggang
|
9314b23885
|
* Fix bug#25998,26017
|
2022-08-04 02:48:29 +00:00 |
|
|
王怡栋
|
883c61e32a
|
Merge branch 'sprint/222_zhouxudong_62852' into 'sprint/222'
Sprint/222 zhouxudong 62852
See merge request easycorp/zentaopms!4782
|
2022-08-04 02:43:25 +00:00 |
|
|
zhouxudong
|
e95b8f75a3
|
* Finish task #62852.
|
2022-08-04 02:36:12 +00:00 |
|
|
王怡栋
|
fc494cc0f6
|
Merge branch 'sprint/221_tianshujie_fixbug' into 'master'
Sprint/221 tianshujie fixbug
See merge request easycorp/zentaopms!4781
|
2022-08-04 02:34:54 +00:00 |
|
|
zhouxudong
|
7054e33346
|
* Finish task #62852.
|
2022-08-04 02:30:31 +00:00 |
|
|
zhouxudong
|
f3c4e8b26b
|
* Finish task #62852.
|
2022-08-04 02:24:51 +00:00 |
|
|
zhouxudong
|
0c29e89833
|
* Finish task #62852.
|
2022-08-04 02:16:56 +00:00 |
|
|
刘刚
|
8f95fc6bb2
|
Merge branch 'sprint/devplat_30' into 'master'
* Finish task #63385.
See merge request easycorp/zentaopms!4780
|
2022-08-04 02:16:54 +00:00 |
|
|
liugang
|
1ce2315792
|
* Finish task #63385.
|
2022-08-04 10:15:13 +08:00 |
|
|
王怡栋
|
4e9d494e78
|
Merge branch 'master_liuhong_25759' into 'master'
*Fix bug #25759
See merge request easycorp/zentaopms!4776
|
2022-08-04 02:13:11 +00:00 |
|
|
liuhong
|
c44c768145
|
*Fix bug #25759
|
2022-08-04 02:11:40 +00:00 |
|
|
liuhong
|
2bd5412bb1
|
*Fix bug #25759
|
2022-08-04 02:05:07 +00:00 |
|
|
王怡栋
|
eceac71915
|
Merge branch 'master_liuhong_25078' into 'master'
*Fix bug #25078
See merge request easycorp/zentaopms!4762
|
2022-08-04 02:01:25 +00:00 |
|
|
wangyidong
|
a194dd86ca
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:59:15 +08:00 |
|
|
王怡栋
|
57f6a5a833
|
Merge branch 'sprint/222_zhouxudong_62850' into 'sprint/222'
Sprint/222 zhouxudong 62850
See merge request easycorp/zentaopms!4779
|
2022-08-04 01:57:18 +00:00 |
|
|
zhouxudong
|
84f3796c88
|
* Finish task #62850.
|
2022-08-04 01:53:21 +00:00 |
|
|
wangyuting2
|
c4f99aeced
|
* Fix program featureMenu bug.
|
2022-08-04 09:52:05 +08:00 |
|
|
sunguangming
|
728834da26
|
* Finish task #62733.
|
2022-08-04 09:49:35 +08:00 |
|
|
zhouxudong
|
ace4fde7a8
|
* Finish task #62850.
|
2022-08-04 01:48:56 +00:00 |
|
|
zhouxudong
|
8bbac3b2fe
|
* Finish task #62852.
|
2022-08-04 01:45:10 +00:00 |
|
|
wangyidong
|
0ed8c8bd03
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:41:48 +08:00 |
|
|
liuhong
|
b2f152d904
|
*Fix bug #25759
|
2022-08-04 01:40:59 +00:00 |
|
|
wangyidong
|
c98ee9e323
|
* fix for searchindex table fulltext index.
|
2022-08-04 09:40:58 +08:00 |
|
|
daitingting
|
c95a839fcb
|
* Process createdBy if the field is not createdBy.
|
2022-08-04 01:39:12 +00:00 |
|
|
李玉春
|
298342fedf
|
Merge branch 'testta_ly' into 'master'
Testta ly
See merge request easycorp/zentaopms!4777
|
2022-08-04 01:37:56 +00:00 |
|
|
liyang
|
40ba4c8a9e
|
* Fix copyDB function for unittest.
|
2022-08-04 09:34:25 +08:00 |
|
|
zhouxudong
|
461e3275db
|
* Finish task #62850.
|
2022-08-04 01:32:48 +00:00 |
|
|
liuhong
|
3c0471a280
|
*Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug
|
2022-08-04 01:28:19 +00:00 |
|
|
tianshujie
|
e0aaa4c18c
|
* Fix bug #26008.
|
2022-08-04 09:28:18 +08:00 |
|
|
zhouxudong
|
9f26275965
|
* Finish task #62850.
|
2022-08-04 01:27:07 +00:00 |
|
|
王怡栋
|
204336881b
|
Merge branch 'sprint/master_zhouxudong_60388' into 'master'
Sprint/master zhouxudong 60388
See merge request easycorp/zentaopms!4771
|
2022-08-04 01:21:52 +00:00 |
|
|
王怡栋
|
be74cdc536
|
Merge branch 'sprint/ZUI_guofeilong_update_icon' into 'master'
* Fix icon ztf and draft_edit
See merge request easycorp/zentaopms!4774
|
2022-08-04 01:17:04 +00:00 |
|
|
王怡栋
|
d2e9893c45
|
Merge branch 'sprint/devplat_30' into 'master'
Sprint/devplat 30
See merge request easycorp/zentaopms!4767
|
2022-08-04 01:15:36 +00:00 |
|
|
王怡栋
|
47954aefa5
|
Merge branch 'sprint/max_changelog' into 'master'
* Add the story of zentaomax to changelog.
See merge request easycorp/zentaopms!4775
|
2022-08-04 01:15:17 +00:00 |
|
|
wangyidong
|
d4c95e6e9c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-08-04 09:14:41 +08:00 |
|
|
wangyuting2
|
97e36551a1
|
* Finish task #63380.
|
2022-08-04 09:14:20 +08:00 |
|
|
wangyidong
|
f5b6edef01
|
Merge branch 'sprint/devplat_30'
|
2022-08-04 09:13:53 +08:00 |
|