168 Commits

Include renames

Author	SHA1	Message	Date
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
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
zhouxudong	e2aa928abe	* Fix bug #22038.	2022-04-28 02:57:42 +00:00
liyuchun	537c1bea2d	* Fix bug #15039.	2022-04-28 02:06:10 +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
liyuchun	13d354ba8c	* Fix bug #21518.	2022-04-18 11:35:36 +08:00
zenggang	784e153159	* Finish task#51115,51116,51120,51121,51133	2022-03-22 07:11:57 +00:00
liyuchun	0187fb80c7	Merge branch 'devops24'	2022-03-22 08:28:32 +08:00
王怡栋	b3cca161cc	* adjust for install page in lite.	2022-03-18 09:49:05 +08:00
liyuchun	b6db2c5c55	* Fix bug #50908.	2022-03-17 16:11: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
王怡栋	6ee64dffe7	Merge branch 'api_doc' into sprint/167	2021-10-19 11:36:19 +08:00
孙广明	148b2e5612	Merge branch 'sprint/167_liyuchun_43187' into 'sprint/167' ... Finish task #43187. See merge request easycorp/zentaopms!66	2021-10-14 06:03:12 +00:00
liyuchun	cfdce3652f	* Finish task #43187.	2021-10-14 13:51:47 +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
zhujinyong	a224eed92b	* Ajust code style.	2021-09-29 08:18:05 +08:00
thanatos	c0e6b93d3f	fix bug	2021-09-26 13:33:22 +08:00
thanatos	0d116021db	finish api doc. first commit	2021-09-16 16:10:49 +08:00
thanatos	960a67884a	fix dao class commit & commit api doc 15.5	2021-09-09 13:16:00 +08:00
zenggang	f495f058ed	* Finish task#42421,42411,42409,42403,42392,42388,42386,42374	2021-09-08 15:31:11 +08:00
zenggang	e343a14e23	* Fix bug#14927	2021-09-07 21:50:03 +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