Commit Graph
85 Commits
Author SHA1 Message Date
zenggang 29f2f5187b * Merge 18.x 2023-08-28 10:27:22 +00:00
wangyidong 5789c25d12 * Fix bug #37592. 2023-08-25 15:25:39 +08:00
sunhao 3bd745233d * zin: support for using zin module. 2023-07-26 16:31:14 +08:00
sunhao e97ab9686b + add zin and zui3 files. 2023-07-25 17:42:27 +08:00
Lufei 4921d93d3e * Fix end(): Calling end() on an object is deprecated. 2023-06-07 13:24:21 +08:00
caoyanyi 5af27aa338 * Fix bug #34893, Modify back button link. 2023-04-27 13:25:35 +08:00
caoyanyi 4be7f200dd * Fix bug #34574. 2023-04-21 14:43:36 +08:00
caoyanyi 8e6fe16197 * Modify back url cookie set. 2023-04-04 09:53:28 +08:00
caoyanyi 4ee37b3d63 * Modify input section id value. 2023-03-13 10:24:15 +08:00
guofeilong 40015657cc * Code for task #85502 2023-03-02 10:16:48 +08:00
guofeilong 68e10e515e * Code for task #85502 2023-03-01 13:54:45 +08:00
Wenrui LI f03bf51121 * use static:: instead of self:: to enable extending static functions, and inject script to make js alert work on zentao client. 2023-02-13 14:00:55 +08:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
xieqiyu 80e19fe5e1 * Fix bug#29789. 2022-11-21 14:57:58 +08:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
liyuchun 00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
chaideqing cf2d303acf * resolve feedback #1128 2022-10-12 14:41:26 +08:00
wangyidong 6e6ecb4f6a * finish task #70199. 2022-09-26 17:28:15 +08:00
wangyidong 7a48c595b4 * code for add data-app attr. 2022-09-26 15:26:48 +08:00
caoyanyi 77081214f5 * Add diff editor page. 2022-09-05 16:56:06 +08:00
朱金勇 ca9adecd3f Merge branch 'sprint/xuanxuan_108' into 'master'
合并小喧喧通知卡片相关代码

See merge request easycorp/zentaopms!4452
2022-07-13 05:58:05 +00:00
wangyidong bb0fdc74c9 * code for bug #24927. 2022-07-08 17:35:06 +08:00
tianshujie 7528cdfdcf * Fix bug #24554. 2022-06-30 13:16:31 +08:00
dingyongliang d01dd34431 * electron/zentao: fix confirm. 2022-06-30 01:47:45 +00:00
tanghucheng 0a9f2056ee * Fix bug . 2022-06-28 10:47:25 +08:00
caoyanyi a0993d719a * Modify js set error. 2022-06-24 13:27:15 +08:00
tianshujie eb3f621a92 * Modify the logic of the back button. 2022-05-26 11:41:09 +08:00
tianshujie b43eed49d0 * Modify the logic of the return button. 2022-05-26 11:39:23 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
zhouxudong 48c052efad * Fix bug #22531. 2022-05-16 09:23:29 +00:00
zhouxudong fd52256122 * Fix bug #22038. 2022-04-28 03:27:09 +00:00
zhouxudong e2aa928abe * Fix bug #22038. 2022-04-28 02:57:42 +00:00
zhouxudong 0c2651b436 * Fix bug #22038. 2022-04-27 07:45:27 +00:00
Hao Sun c25231c297 * optimize helper method "js::locate", support for using app as target. 2022-04-19 16:06:19 +08:00
孙广明 7f50a2cbd9 * Fix code error. 2022-02-16 11:26:40 +08:00
zhujinyong de2e4be174 * Fix test. 2021-12-17 10:23:57 +08:00
tianshujie 4a62ededb0 * Fix bug #16968. 2021-12-02 15:27:17 +08:00
liugang c884f07868 * Remove the outdated code. 2021-10-26 14:56:48 +08:00
xieqiyu 63248e8f8f * Code for task#43168. 2021-10-14 13:47:13 +08:00
xieqiyu 601229248d * Code for task#43168. 2021-10-14 12:20:36 +08:00
xieqiyu 8b8544d129 * Finish task#43168. 2021-10-13 10:10:05 +08:00
zenggang f495f058ed * Finish task#42421,42411,42409,42403,42392,42388,42386,42374 2021-09-08 15:31:11 +08:00
zenggang a17656461e * Fix bug#13918 2021-09-02 11:13:36 +08:00
tianshujie f459105129 * Modify dynamic back link problem. 2021-08-31 09:12:58 +08:00
zhujinyong 664e290f97 * Rename openApp to tab. 2021-08-31 00:30:48 +08:00
tianshujie 7d95dc55d9 * Modify the back link of the testtask. 2021-08-30 16:04:50 +08:00
tianshujie 8ca2119f37 * Fix back link problem of execution module. 2021-08-30 13:57:21 +08:00
tianshujie e60c95725e * Modify the test module to return the link problem. 2021-08-30 13:23:07 +08:00
王怡栋 37252fbc47 * adjust for tid. 2021-08-30 13:19:56 +08:00