Commit Graph
195 Commits
Author SHA1 Message Date
caoyanyi 5af27aa338 * Fix bug #34893, Modify back button link. 2023-04-27 13:25:35 +08:00
hufangzhou bccd7f677e * Fix bug #34868. 2023-04-26 15:17:11 +08:00
caoyanyi 4be7f200dd * Fix bug #34574. 2023-04-21 14:43:36 +08:00
朱金勇 e7cc2b2e5e * Fix sync repo. 2023-04-19 02:10:10 +00:00
朱金勇 2ca80b1aa3 * Fix bug#34346. 2023-04-19 00:53:12 +00:00
朱金勇 3e887438ef * Fix bug#34221. 2023-04-17 09:00:33 +00:00
朱金勇 9fe8e0393c * Fix keywords. 2023-04-17 07:16:46 +00:00
朱金勇 619077d036 * Fix replace method. 2023-04-17 07:04:03 +00:00
朱金勇 7969effc29 * Fix bug#34139, 34238, 34075. 2023-04-16 13:54:16 +00:00
朱金勇 cecf04b069 Fix bug: show tables and desc table. 2023-04-12 16:40:08 +00:00
朱金勇 d20df48faf * Fix primary key of dmdb. 2023-04-11 03:05:50 +00:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
朱金勇 4cf70fdf7e * Fix insert method of dao. 2023-04-05 15:58:43 +00:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
caoyanyi 8e6fe16197 * Modify back url cookie set. 2023-04-04 09:53:28 +08:00
朱金勇 f65d3aa417 * Install for dmdb. 2023-04-01 14:22:24 +00: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
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
王怡栋 4af7ffbfa9 Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6640
2022-12-27 08:48:41 +00:00
孔令茂 610e22f948 * Optimize code. 2022-12-27 08:45:32 +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
xieqiyu 80e19fe5e1 * Fix bug#29789. 2022-11-21 14:57:58 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
zhujinyong 05ae463eab * Adjust code of DAO. 2022-11-21 08:38:44 +08:00
zhujinyong b4d4e33e23 + Add getColumns function for dao. 2022-11-09 15:44:49 +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
wangyidong 20ec50ea8a * fix for company todo. 2022-08-03 14:01:15 +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
mayue aa0b81f0a6 * Fix bug #22246. 2022-05-18 07:19:19 +00: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
孙广明 2db91483d3 Merge branch 'sprint/master_zhouxudong_22038' into 'master'
* Fix bug #22038.

See merge request easycorp/zentaopms!3163
2022-04-28 09:11:30 +00:00
zhouxudong fd52256122 * Fix bug #22038. 2022-04-28 03:27:09 +00:00