Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
54,071 Commits 2 Branches 292 Tags
0dc041fbcfde4bae4c868ab19e121def684e2ec9
Commit Graph
1331 Commits
Author SHA1 Message Date
朱金勇 c76fa5317e * Fix bug#34204. 2023-04-17 06:12:22 +00:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
tianshujie e279e91070 * Resolve issue #775. 2023-04-13 16:22:45 +08:00
tianshujie 0c935c7eea * Modify jump link. 2023-04-13 15:45:51 +08:00
zhaoke 9a7ade5b64 * Fix formatting issues. 2023-04-13 15:22:20 +08:00
zhaoke a64bc7d5ab * Move xmind functions to lib. 2023-04-13 13:51:34 +08:00
zhaoke eb833be4e5 Merge branch 'zenops_66' into zenops_69 2023-04-13 09:31:12 +08:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
tianshujie b8fc22feee * Fix bug #34066. 2023-04-12 10:57:08 +08:00
tianshujie ab05c059eb * Code for task #90780. 2023-04-12 09:28:15 +08:00
tianshujie 324dfe4650 * Code for task #90780. 2023-04-12 09:08:51 +08:00
王怡栋 a0868cb0ff Merge branch 'master' into 'tsj_dynamic' 
# Conflicts:
#   module/doc/model.php
 2023-04-11 08:46:26 +00:00
tianshujie 81e7153c8e * Code for task #90780. 2023-04-11 16:34:29 +08:00
xieqiyu e8123d02ec * Code for bug#33846. 2023-04-11 07:55:34 +00:00
tianshujie 1f026f246a * Code for task #90780. 2023-04-11 15:38:44 +08:00
tianshujie 1ce64ff3c9 * Fix bug #33985. 2023-04-11 08:47:05 +08:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
tianshujie e1eaf74466 * Add space. 2023-04-04 15:16:29 +08:00
tianshujie 49666e311e * Code for task #89927. 2023-04-04 13:24:18 +08:00
zhaoke 49d18cf72c Merge remote-tracking branch 'origin/master' into zenops_69 2023-04-03 16:46:41 +08:00
tianshujie 651edfc559 * Fix bug #33614. 2023-03-31 15:46:50 +08:00
zhaoke 8522e6fb58 * Add scene control and view file to testcase module. 2023-03-29 16:26:59 +08:00
tianshujie 7c16060b2c * Fix bug #33479. 2023-03-29 10:48:01 +08:00
hufangzhou f33fe4ed04 * Fix bug #32962. 2023-03-21 10:08:41 +08:00
孙广明 5a69ec2c98 Merge branch 'wxp_bug32706' into 'master' 
* Fix bug 32706.

See merge request easycorp/zentaopms!7195
 2023-03-17 00:52:21 +00:00
wangxuepeng 8dcfe4a48a * Fix bug 32706. 2023-03-17 00:48:22 +00:00
liumengyi a168008406 * Fix bug #33001. 2023-03-16 05:29:54 +00:00
孙广明 7ec8ece76a Merge branch 'wxp_bug86288' into 'master' 
* Fixed #bug86288.

See merge request easycorp/zentaopms!7153
 2023-03-08 02:43:45 +00:00
wangxuepeng 4db7af7e52 * Fixed #bug86288. 2023-03-08 02:37:40 +00:00
wangxuepeng 21c915dc36 * Fixed #bug86288. 2023-03-08 02:33:35 +00:00
tianshujie a67515ae02 * Modify language items for project common. 2023-03-08 09:21:58 +08:00
tianshujie 4ac15934cd * Modify language items for project common. 2023-03-08 08:53:44 +08:00
wangxuepeng 76016e1b78 * Fixed #bug86288. 2023-03-07 07:43:26 +00:00
tianshujie b2eafe0106 * Modify language items for product common. 2023-03-06 15:43:55 +08: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