Commit Graph
1184 Commits
Author SHA1 Message Date
Yagami a75976fa94 * Fix bug #35363. 2023-05-18 16:38:14 +08:00
Yagami 3d80c2e547 * Fix bug #35240. 2023-05-17 09:57:41 +08:00
Yagami ffd2b525c8 * Change judgment condition. 2023-05-04 17:05:52 +08:00
tanghucheng 45321653ca Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-28 13:10:24 +08:00
caoyanyi d02b3f1946 * Modify qrcode imgae. 2023-04-27 10:48:11 +08:00
caoyanyi a83cb3fc39 * Modify download qrcode. 2023-04-27 09:16:36 +08:00
caoyanyi 365e76bbe3 * Adjust code. 2023-04-26 19:00:29 +08:00
caoyanyi 5d4ce7e138 * Modify app download qrcode. 2023-04-26 17:43:01 +08:00
wangyidong 75e4b26c52 * fix bug #34717. 2023-04-24 19:07:05 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
tianshujie 2059a74de0 * Fix bug #34461. 2023-04-20 11:32:34 +08:00
tanghucheng 8bf4bbccf0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-20 09:50:22 +08:00
caoyanyi 658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
朱金勇 72155fc3b8 * Fix bug for dmdb. 2023-04-19 01:41:34 +00:00
tanghucheng 5667eeab9d * Adjust for common::buildIconButton. 2023-04-18 09:46:46 +08:00
tanghucheng 93ffc06caa * Code for task #91093. 2023-04-17 17:13:30 +08:00
tanghucheng 0a944b7e11 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-14 16:38:09 +08:00
tianshujie d2782dc46a * Resolve issue #775. 2023-04-13 16:37:20 +08:00
tanghucheng 0af9b86b70 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-13 10:23:19 +08:00
朱金勇 cecf04b069 Fix bug: show tables and desc table. 2023-04-12 16:40:08 +00:00
wangyidong a3715fa226 * fix bug. 2023-04-12 16:20:53 +08:00
wangyidong 7e3b1a1881 * fix bug for global create doc. 2023-04-10 13:52:08 +08:00
wangyidong a5421e4940 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 10:30:52 +08:00
wangyidong 56791f12ef * code for task #89916. 2023-04-06 10:29:23 +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
liugang 9339533b7a * Display the main navagator if user has permission to access any menu under it. 2023-04-04 08:13:08 +00:00
tanghucheng c89ecac12b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-31 09:19:02 +08:00
wangyidong 2bcbd46898 * fix bug. 2023-03-29 10:18:29 +08:00
Lufei b498d4d677 * Change User-agent for http requests. 2023-03-28 10:41:54 +08:00
Yagami 35614d6bfc * Finish task #88396. 2023-03-22 17:08:02 +08:00
tianshujie 01857a4874 * Fix bug #33138. 2023-03-21 10:51:12 +08:00
曾刚 2da060b171 Gitlab optimize 2023-03-09 08:05:10 +00:00
tianshujie ac3cf573b7 * Modify language items for execution common. 2023-03-09 14:00:31 +08:00
孙广明 59c05f91c7 Merge branch 'fixbug_liumengyi_32633' into 'master'
* Fix bug 32603 32632 32633.

See merge request easycorp/zentaopms!7142
2023-03-08 01:24:54 +00:00
liumengyi 47c874ae0c * Fix bug #32633. 2023-03-06 00:41:04 +00:00
caoyanyi 58fb43d90a * Modify devops sub menu. 2023-03-02 11:17:09 +08:00
tianshujie 3886a5f25b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 08:27:28 +08:00
liumengyi bc5bdab5d4 * Fix bug #32569. 2023-03-01 08:22:01 +00:00
wangyidong cdb476bc4b * adjust for safe file timeout. 2023-03-01 15:58:56 +08:00
guofeilong c62dbb7792 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-24 13:47:19 +08:00
zhujinyong 7de18de447 * Fix bug: No 'more' menu. 2023-02-24 11:27:45 +08:00
caoyanyi 83a64cb3cf * Update home button text. 2023-02-24 09:02:48 +08:00
caoyanyi 1be6a534a8 * Modify home btn title. 2023-02-23 17:20:17 +08:00
caoyanyi 653c393eb1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 09:01:07 +08:00
tianshujie 3962b7a087 * Code for finish task #84575. 2023-02-20 08:40:32 +08:00
tianshujie 5aee651454 * Code for finish task #84575. 2023-02-18 18:39:07 +08:00
caoyanyi c8374b1e14 Merge branch 'master' into zentaopms_289 2023-02-17 10:11:16 +08:00
tianshujie 792f1c5a98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-17 08:33:25 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00