Commit Graph
406 Commits
Author SHA1 Message Date
hufangzhou 2567d16674 * [bug#54866,done,1h] File path uses actual path. 2024-09-06 09:48:31 +08:00
tanghucheng 0573410901 * [task#126850] set secure default value. 2024-08-27 14:46:06 +08:00
tanghucheng ce1be1f538 * [task#126850,task#126851,done,1h,0] Optimized code. 2024-08-22 15:50:32 +08:00
tianshujie fb626900ee * [misc,1h] change unit test error. 2024-07-16 14:54:02 +08:00
sunguangming ffef5c081d Merge branch 'main' into feature/epic 2024-06-24 03:22:54 +00:00
wangyidong 89082bc0d8 * Adjust code 2024-06-21 14:29:54 +08:00
wangyidong 2420032dff * Fix bug #50934 2024-06-21 14:29:54 +08:00
wangyidong 88a42a724f * Merge mails when send. 2024-06-20 19:29:07 +08:00
wangyidong 0573738c51 * Fix bug #51274. 2024-06-20 18:55:35 +08:00
sunguangming f83f00f61f Merge branch 'main' into feature/epic 2024-06-20 07:04:51 +00:00
qixinzhi 7c833b732f * [bug#51274,done,0.5h] do not merge for browse and asyncSend. 2024-06-20 14:58:44 +08:00
wangyidong 4aa7894041 * Adjust for reset mail config. 2024-06-20 14:06:50 +08:00
qixinzhi 6d2ecfbd63 * [bug#51274,done,0.1h] fix undefined. 2024-06-19 18:58:51 +08:00
qixinzhi ade58f04c5 * [bug#51274,done,1h] fix js error. 2024-06-19 18:27:37 +08:00
qixinzhi 2499083762 * [bug#36014,done,0.1h] fix send fail. 2024-06-12 07:57:01 +00:00
liugang 28c3683680 + mailModal: set embedded images in the email. 2024-05-30 16:54:07 +08:00
liugang 33ea4c77d6 * mailModel: get key-value pairs of image URL and physical file in mail content and replace image url with them. 2024-05-30 16:54:07 +08:00
liugang 5cf3e5e675 * mailTao: replace image url by the key-value pairs of image URL and physical file. 2024-05-30 16:54:07 +08:00
liugang 9a4003e5c9 + mailTao: add a method to get key-value pairs of image URL and physical file in mail content. 2024-05-30 16:54:07 +08:00
liugang f77e49d270 + mailTao: add a method to get key-value pairs of image URL and physical file by file ID. 2024-05-30 16:54:07 +08:00
liugang 009e540732 + mailTao: add a method to get key-value pairs of image URL and physical file by path. 2024-05-30 16:54:07 +08:00
sunguangming acdf92c08f Merge branch 'release20.1' into story 2024-05-30 09:12:45 +08:00
liugang 06a4a7226f + mailModal: set embedded images in the email. 2024-05-29 16:40:15 +08:00
liugang 6eddb3d64c * mailModel: get key-value pairs of image URL and physical file in mail content and replace image url with them. 2024-05-29 16:39:31 +08:00
liugang 210a3e06df * mailTao: replace image url by the key-value pairs of image URL and physical file. 2024-05-29 16:37:38 +08:00
liugang e6712ba71e + mailTao: add a method to get key-value pairs of image URL and physical file in mail content. 2024-05-29 16:36:53 +08:00
liugang 2d0e6de7e3 + mailTao: add a method to get key-value pairs of image URL and physical file by file ID. 2024-05-29 16:36:19 +08:00
liugang 028801d1fc + mailTao: add a method to get key-value pairs of image URL and physical file by path. 2024-05-29 16:35:34 +08:00
sunguangming 1cfbf7d74b Merge branch 'master' into story 2024-05-15 15:04:13 +08:00
tianshujie 9f07d44b5e * Init zt_user data. 2024-05-10 08:59:39 +08:00
tianshujie 23021c03eb * Fix bug #48685. 2024-05-10 08:54:18 +08:00
sunguangming 28b2b78698 Merge branch 'master' into story 2024-05-09 15:04:07 +08:00
caoyanyi acc26ba24d Merge remote-tracking branch 'remotes/origin/release-20.0'
# Conflicts:
#	db/update20.0.beta2.sql
#	lib/zin/func.php
#	lib/zin/wg/fileselector/v1.php
#	lib/zin/wg/upload/v1.php
#	module/action/model.php
#	module/backup/js/index.ui.js
#	module/block/lang/vi.php
#	module/block/ui/recentprojectblock.html.php
#	module/block/zen.php
#	module/common/lang/vi.php
#	module/custom/lang/vi.php
#	module/execution/js/kanban.ui.js
#	module/execution/ui/story.html.php
#	module/kanban/js/view.ui.js
#	module/metric/test/calc/project/hour/ac_of_weekly_all_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_in_waterfall.php
#	module/metric/test/calc/project/rate/cv_weekly_in_waterfall.php
#	module/mr/control.php
#	module/mr/ui/browsebyexecution.html.php
#	module/product/zen.php
#	module/programplan/zen.php
#	module/project/model.php
#	module/repo/lang/de.php
#	module/repo/lang/en.php
#	module/repo/lang/fr.php
#	module/repo/lang/zh-cn.php
#	module/space/ui/createapplication.html.php
#	module/testcase/ui/view.html.php
#	module/upgrade/model.php
#	www/js/zui3/zen-editor/p-0aaccc7e.js
#	www/js/zui3/zen-editor/p-276dd30f.js
#	www/js/zui3/zen-editor/p-2b13cc9a.js
#	www/js/zui3/zen-editor/p-38d18c5d.js
#	www/js/zui3/zen-editor/p-3f6cad83.js
#	www/js/zui3/zen-editor/p-51e3a048.js
#	www/js/zui3/zen-editor/p-617d463f.js
#	www/js/zui3/zen-editor/p-62c0132e.js
#	www/js/zui3/zen-editor/p-6d22490c.js
#	www/js/zui3/zen-editor/p-a563f50b.js
#	www/js/zui3/zen-editor/p-bf31230c.js
#	www/js/zui3/zen-editor/p-c6c95773.js
#	www/js/zui3/zen-editor/p-d83dd3f0.js
#	www/js/zui3/zen-editor/p-d8bedd14.js
#	www/js/zui3/zen-editor/p-eaaa4129.js
#	www/js/zui3/zen-editor/zen-editor.esm.js
#	www/js/zui3/zui.zentao.css
#	www/js/zui3/zui.zentao.js
2024-05-06 09:17:49 +08:00
caoyanyi f01747c983 * Adjust mail test page style. 2024-04-29 14:47:32 +08:00
daitingting c2df7d8670 * Set mail config session. 2024-04-29 05:38:53 +00:00
caoyanyi 2b192c825f * Adjust check logic for mail config exists. 2024-04-29 13:17:28 +08:00
王怡栋 546eb71a47 * Fix bug #48689. 2024-04-29 11:00:15 +08:00
liugang 1c13a31e99 * Rename $lang->colon to $lang->hyphen. 2024-04-28 14:35:26 +08:00
liyang 354c300c86 * Modify unit test directory structure and data generation method. 2024-04-22 14:25:50 +08:00
dingguodong 926744bf4f - Remove vi.php. 2024-04-17 09:11:48 +08:00
sunguangming 19cb708a28 * Finish task #115134. 2024-04-08 13:40:30 +08:00
daitingting 9ef7d0b05d * Fix bug #43298. 2024-02-20 15:31:00 +08:00
caoyanyi 706d4a46ec * Adjust error tips for mail save. 2024-01-22 15:46:33 +08:00
caoyanyi 7034f45219 * Adjust method name for mail. 2024-01-04 17:19:16 +08:00
wangyuting 7954de9f57 * Adjust unit test script `` to ~~. 2023-12-26 19:20:27 +08:00
wangyidong 3e180aa761 * Adjust for mail unit test. 2023-12-22 10:57:15 +08:00
wangyidong 8f038d4ce7 * Adjust for mail unit test. 2023-12-21 16:53:38 +08:00
wangyidong f25b5e7430 * Fix for mail send method. 2023-12-21 16:21:59 +08:00
wangyidong d899977f3a * Fix for sendmail. 2023-12-21 14:56:06 +08:00
wangyidong bc564dbf1e * Add unit test for isclickable. 2023-12-20 19:41:11 +08:00