Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,925 Commits 2 Branches 292 Tags
zentaopms_17.0
Commit Graph

39925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
王怡栋
451d897d09 Merge branch 'sgm_license' into 'master' 
* Remove unused file and change license.

See merge request easycorp/zentaopms!3782
zentaopms_17.0 		2022-06-08 02:38:51 +00:00
王怡栋
84d33d5f3c Merge branch 'sprint/fixbug_liumengyi_23340' into 'master' 
* Fix bug #23340.

See merge request easycorp/zentaopms!3781
 2022-06-08 02:38:12 +00:00
liumengyi
5511a51882 * Fix bug #23340. 2022-06-08 10:35:41 +08:00
孙广明
304f50eef0 * Remove unused file and change license. 2022-06-08 10:34:19 +08:00
王怡栋
50f3eb7f71 Merge branch 'sgm_license' into 'master' 
* Change zentao license.

See merge request easycorp/zentaopms!3779
 2022-06-08 02:05:46 +00:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
王怡栋
369f08a0c4 Merge branch 'sgm_license' into 'master' 
* Change license.

See merge request easycorp/zentaopms!3776
 2022-06-08 01:36:34 +00:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
王怡栋
3d34ddcd33 Merge branch 'tanghucheng_fixbug' into 'master' 
* Fix bug .

See merge request easycorp/zentaopms!3773
 2022-06-07 09:05:07 +00:00
tanghucheng
146d8f9f38 * Fix bug . 2022-06-07 17:03:57 +08:00
孙广明
d1c824509c Merge branch 'sprint/tianshujie_23349' into 'master' 
* Fix bug #23349.

See merge request easycorp/zentaopms!3772
 2022-06-07 08:01:45 +00:00
tianshujie
ff8e718b37 * Fix bug #23349. 2022-06-07 16:00:28 +08:00
王怡栋
7b709fc816 Merge branch 'sgm_removecode' into 'master' 
* Remove unused code.

See merge request easycorp/zentaopms!3769
 2022-06-07 06:56:14 +00:00
孙广明
fcd7183dbb * Remove unused code. 2022-06-07 14:52:48 +08:00
孙广明
5281be0b32 Merge branch 'sprint/scx_header' into 'master' 
* SupportLang.

See merge request easycorp/zentaopms!3763
 2022-06-07 06:51:54 +00:00
孙广明
06f1bc6dff Merge branch 'sprint/sunhao/bug23284' into 'master' 
* bug #23284, fix simplemde error.

See merge request easycorp/zentaopms!3765
 2022-06-07 06:50:09 +00:00
李玉春
c8c1bfc4c0 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix bug #23358.

See merge request easycorp/zentaopms!3768
 2022-06-07 06:49:05 +00:00
tianshujie
ee2d74d99d * Fix bug #23358. 2022-06-07 14:43:42 +08:00
王怡栋
b2a576b958 Merge branch 'sprint/tianshujie_fixbug' into 'master' 
* Fix bug #23348,23349.

See merge request easycorp/zentaopms!3767
 2022-06-07 06:08:09 +00:00
tianshujie
a396ad68c4 * Fix bug #23348,23349. 2022-06-07 13:55:45 +08:00
李玉春
6a1f0a9562 Merge branch 'sprint/fixbug_liumengyi_23340' into 'master' 
* Fix bug #23340.

See merge request easycorp/zentaopms!3762
 2022-06-07 05:28:37 +00:00
王怡栋
444b00343f Merge branch 'master_fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3766
 2022-06-07 04:13:02 +00:00
tanghucheng
0e24f99f82 * Fix bug for lite. 2022-06-07 12:10:33 +08:00
tanghucheng
97b6196b91 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-07 11:35:20 +08:00
Hao Sun
4185bd47e1 * bug #23284, fix simplemde error. 2022-06-07 03:14:44 +00:00
宋辰轩
328aea3be5 * Modify supportLang to defaultLang. 2022-06-07 10:56:42 +08:00
liumengyi
6e4ac95a48 * Fix bug #23340. 2022-06-07 10:35:13 +08:00
宋辰轩
d50f757397 * SupportLang. 2022-06-07 09:52:57 +08:00
李玉春
cf20ee9361 Merge branch 'sprint/tianshujie_23258' into 'master' 
* Fix bug #23258.

See merge request easycorp/zentaopms!3761
 2022-06-07 01:47:07 +00:00
tianshujie
3033d3e567 * Fix bug #23258. 2022-06-07 09:42:05 +08:00
李玉春
21c7ec71b5 Merge branch 'fixbug_sunjun_22885' into 'master' 
fixbug_sunjun_22885

See merge request easycorp/zentaopms!3752
 2022-06-07 01:13:09 +00:00
李玉春
0da04fca77 Merge branch 'sprint/scx_executionbug' into 'master' 
* Fix bug #23291.

See merge request easycorp/zentaopms!3748
 2022-06-07 01:12:52 +00:00
李玉春
9d1276c73a Merge branch 'sprint/tianshujie_bug23335' into 'master' 
* Fix bug #23335.

See merge request easycorp/zentaopms!3760
 2022-06-07 01:02:23 +00:00
李玉春
61142f9f67 Update managemembers.js 2022-06-07 01:01:59 +00:00
tianshujie
020528cdbb * Fix bug #23335. 2022-06-07 08:59:51 +08:00
王怡栋
3206d611d4 Merge branch 'master_xieqiyu_23116' into 'master' 
* Fix bug#23116.

See merge request easycorp/zentaopms!3757
 2022-06-07 00:57:45 +00:00
tianshujie
d2242277e7 * Fix bug #23335. 2022-06-07 08:57:24 +08:00
李玉春
4bb6bf8843 Merge branch 'fixbug_sunjun_23101' into 'master' 
fixbug_sunjun_23101

See merge request easycorp/zentaopms!3737
 2022-06-07 00:52:50 +00:00
李玉春
189af78ca7 Merge branch 'sprint/scx_recordestimate' into 'master' 
* Modify taskrecordestimate api.

See merge request easycorp/zentaopms!3735
 2022-06-07 00:51:58 +00:00
李玉春
91f7d07cd5 Merge branch 'sprint/fixbug_liumengyi_23290' into 'master' 
* Fix bug #23327.

See merge request easycorp/zentaopms!3759
 2022-06-06 09:30:11 +00:00
liumengyi
645d5230da * Fix bug #23327. 2022-06-06 17:28:54 +08:00
tanghucheng
1705f5c756 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-06 17:18:04 +08:00
xieqiyu
36e609f808 * Fix bug#23116. 2022-06-06 16:52:30 +08:00
孙广明
6b9c4f9deb Merge branch 'sprint/fixbug_liumengyi_23271' into 'master' 
* Fix bug #23271.

See merge request easycorp/zentaopms!3756
 2022-06-06 08:50:48 +00:00
孙广明
05fad2dfbb Merge branch 'sprint/fixbug_liumengyi_23290' into 'master' 
* Fix bug #23290.

See merge request easycorp/zentaopms!3753
 2022-06-06 08:50:26 +00:00
孙广明
284a43c780 Merge branch 'fix_bug#23320' into 'master' 
* Fix bug #23320.

See merge request easycorp/zentaopms!3755
 2022-06-06 08:35:03 +00:00
liumengyi
5c552b5dff * Fix bug #23271. 2022-06-06 16:34:32 +08:00
孙广明
4faa6d598d Merge branch 'sprint/tianshujie_bug23113' into 'master' 
* Fix bug #23113.

See merge request easycorp/zentaopms!3754
 2022-06-06 08:34:27 +00:00
mayue
d5bc70122f * Fix bug #23320. 2022-06-06 16:33:00 +08:00
tianshujie
2e9e3ccebd * Fix bug #23113. 2022-06-06 16:31:40 +08:00