Commit Graph

1166 Commits

Author SHA1 Message Date
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
tianshujie
d2782dc46a * Resolve issue #775. 2023-04-13 16:37:20 +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
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
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
tianshujie
4d2a846c9e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-16 08:59:34 +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
王怡栋
3a6bca8dc2 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix project extend priv bug.

See merge request easycorp/zentaopms!6966
2023-02-15 09:22:38 +00:00
wangyuting2
a86eb599d9 * Fix project extend priv bug. 2023-02-15 17:20:35 +08:00
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
wangyidong
dfb7a22c12 * adjust code. 2023-02-15 15:54:02 +08:00
liuhong
a767115e92 * Resolved feedback 2191. 2023-02-15 06:16:55 +00:00
caoyanyi
a3d9cda86b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-15 09:13:10 +08:00
tianshujie
f989173e10 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-15 08:29:48 +08:00
tianshujie
b2fef4f696 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-15 08:19:27 +08:00
wangyidong
41ddc2562b * fix bug. 2023-02-14 14:38:21 +08:00
wangyidong
ec1d388334 * fix bug. 2023-02-14 14:32:09 +08:00
wangyidong
ff5bc056bd * code for replace menu lang. 2023-02-14 13:35:12 +08:00
王怡栋
20f17196b2 Merge branch 'ticket_366' into 'master'
Ticket 366

See merge request easycorp/zentaopms!6941
2023-02-14 05:04:09 +00:00
王怡栋
5c28eb1317 Merge branch 'daitingting_bug_#31996' into 'master'
* Fix bug #31996.

See merge request easycorp/zentaopms!6940
2023-02-14 05:03:43 +00:00
liuhong
e9d2d7362a * Adjust code for feedback #2191 2023-02-14 01:43:35 +00:00
tianshujie
ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
zenggang
317ddd5fbc * Fix bug #32024 2023-02-13 02:02:32 +00:00