Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
52,178 Commits 2 Branches 292 Tags
a5e86054e30f4e656a137ad18954f3d3144a9467
Commit Graph
1297 Commits
Author SHA1 Message Date
wangxuepeng a5e86054e3 * Code for task #86270. 2023-03-10 05:34:34 +00:00
liumengyi 77d435f75b * Finish task #86263, #86266. 2023-03-07 06:13:33 +00:00
caoyanyi ac2891ac41 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 13:53:09 +08:00
孙广明 260c4c0528 Merge branch 'zenops_62' into 'master' 
Zenops 62

See merge request easycorp/zentaopms!7087
 2023-02-28 05:22:00 +00:00
caoyanyi e7c8ceed8d * Modify dynamic language. 2023-02-23 10:10:11 +08:00
liumengyi 09cb859c5e * Fix bug #32179. 2023-02-18 09:30:25 +00:00
zhaoke ae6dbb769c * Fix restore default snapshot history error. 2023-02-17 17:33:13 +08:00
liumengyi 61e824c548 * Fix bug #32249. 2023-02-17 07:54:54 +00:00
zhaoke 81d1e3e23a * Fix bug #32191. 2023-02-16 16:47:20 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liumengyi af5fbbab18 * Fix bug of task #84584. 2023-02-15 08:17:12 +00:00
hufangzhou 0b89cd77d5 * Fix bug of task #83954. 2023-02-14 08:49:53 +00:00
hufangzhou 56c2cdcb21 * Finish task #83954. 2023-02-14 02:46:34 +00:00
zhaoke 6e86ba1ecf * Update action label. 2023-02-10 02:18:35 +00:00
zhaoke a31485ec89 Merge branch 'master' into zenops_61 2023-02-07 02:04:56 +00:00
zhaoke 1583320705 * Merge 2023-02-03 05:41:57 +00:00
zhaoke 4ff09220ba * Fix bug #31896. 2023-02-03 05:35:22 +00:00
zhaoke ffcc487808 * Finish task #83362. 2023-02-02 09:16:09 +00:00
zenggang 597b77af82 * Edit snapshot 2023-02-02 08:31:06 +00:00
xieqiyu 7a0e43b41b * Code for bug#31453. 2023-02-02 14:12:29 +08:00
xieqiyu 1e11a3cb85 * Fix bug#31453. 2023-02-02 11:12:46 +08:00
zhaoke 81a1bbe039 * Fix bug 31405. 2023-01-04 01:14:29 +00:00
tanghucheng bf4a0d1bd7 Merge branch 'master' into zenops_46 2023-01-03 14:17:40 +08:00
hufangzhou b5859c7dc3 * Add the new version. 2023-01-03 13:56:27 +08:00
tanghucheng 0d4ae4ba95 * Fix language. 2023-01-03 13:42:04 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
zhaoke ab54a86aac * Fix bug. 2022-12-29 09:54:58 +00:00
zhouxin bf3ef7a9ab * Resolve feedback #843. 2022-12-29 06:41:40 +00:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
wangyidong 6c02c05d51 * fix bug #30676. 2022-12-15 09:18:46 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
zhaoke cfcb3be5d1 * Fix issue. 2022-12-09 07:58:14 +00:00
wangyidong 7c8f4674cf * code for task #78909. 2022-12-06 10:37:24 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
caoyanyi f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
wangyidong 93aa0dd1e9 * fix bug #30274. 2022-11-30 09:37:29 +08:00
唐胡成 90155c3eea Merge branch 'zenops_46' into 'zenops_46_tanghucheng' 
# Conflicts:
#   module/zanode/view/view.html.php
 2022-11-29 01:38:30 +00:00
tanghucheng b2ae4e15a1 * Code for task #76213. 2022-11-29 09:13:53 +08:00
孙广明 d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46' 
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
 2022-11-28 06:58:42 +00:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
caoyanyi fc95313a40 Merge branch 'master' into zenops_46 2022-11-28 08:41:37 +08:00
zhaoke 38f77f0ae4 * Remve unused code. 2022-11-25 06:17:10 +00:00
Yagami f881d7951e * Fix bug #30017. 2022-11-24 13:46:14 +08:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
lanzongjun 63e0556741 * Fix Task #77267 2022-11-23 10:54:58 +08:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
liugang b688d08312 Merge branch 'master' into sprint/biz17 2022-11-23 10:10:30 +08:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00