1139 Commits

Author SHA1 Message Date
Pang
ff64a1a510 Merge commit 'f328a5a43934ce720c50f9ebd155c11e1277a065' into pro 2023-07-27 07:52:43 +08:00
kuaifan
5d52cb823f Merge commit 'c5114203b27d2ff530897843e0816a3c97990bfe' into tmp
# Conflicts:
#	public/site/css/log.css
#	public/site/en/about.html
#	public/site/en/download.html
#	public/site/en/help.html
#	public/site/en/index.html
#	public/site/en/log.html
#	public/site/en/price.html
#	public/site/en/product.html
#	public/site/en/solutions.html
#	public/site/zh/about.html
#	public/site/zh/download.html
#	public/site/zh/help.html
#	public/site/zh/index.html
#	public/site/zh/log.html
#	public/site/zh/price.html
#	public/site/zh/product.html
#	public/site/zh/solutions.html
2023-07-26 19:14:51 +08:00
weifashi
df627b0ad5 feat:用户选择组件 - 返回用户ids 2023-07-26 18:47:48 +08:00
kuaifan
395ccaad22 no message 2023-07-26 18:31:16 +08:00
kuaifan
a19ee35ca4 perf: 优化添加任务样式 2023-07-25 17:26:34 +08:00
kuaifan
39211297e2 perf: 优化任务默认时间 2023-07-25 17:11:28 +08:00
weifashi
46967f1e00 feat:微应用调整 2023-07-25 16:01:53 +08:00
kuaifan
40b52d8f3b perf: 优化深色模式 2023-07-25 15:15:21 +08:00
kuaifan
c5f7073cc1 fix: 修复无法从任务消息对话中打开任务详情的情况 2023-07-25 12:00:44 +08:00
kuaifan
a1a8e8a962 perf: 任务详情发送文件时防止按esc关闭发送窗口 2023-07-25 11:52:40 +08:00
kuaifan
3d30f4e6c2 perf: 深色模式下无法扫描登录二维码的情况 2023-07-25 11:45:21 +08:00
kuaifan
1be7e67655 perf: 优化iOS深色模式 2023-07-24 18:19:54 +08:00
weifashi
b8eab81ad2 feat:聊天打开okr - 10% 2023-07-24 18:13:31 +08:00
ganzizi
89260dc751 feat: okr信息面板新增"打开OKR"按钮 2023-07-24 15:34:19 +08:00
weifashi
dd7e24850d feat:更改路由 2023-07-24 13:58:06 +08:00
weifashi
42f805d7cc fix:1.仪表盘显示可见性有我,但不是我负责的任务的bug ,2.审批评论间距样式调整与可评论emoj表情加评论通知 ,3,添加任务判断是否存在交集时间内任务调整 ,4. 审批流程撤回后显示错误修复, 5. 审批添加评论后自动滚动到下方 2023-07-21 20:59:08 +08:00
kuaifan
189986dd88 build 2023-07-21 18:11:29 +08:00
kuaifan
b8c2b3a97a perf: Safari支持暗黑模式 2023-07-21 15:46:03 +08:00
kuaifan
5b079018e8 perf: 优化任务时间冲突提示 2023-07-21 12:15:07 +08:00
kuaifan
dac34c8988 perf: iOS部分点击事件存在阻塞的情况 2023-07-20 22:59:13 +08:00
kuaifan
026dca2d84 Merge commit 'f73ee2c13bd3eff393a768ecd2e83a213a75b678' into pro
# Conflicts:
#	public/site/css/help.css
#	public/site/en/help.html
2023-07-20 16:58:34 +08:00
weifashi
11b152cfbb feat:一些配合okr微应用的改动 2023-07-20 16:31:20 +08:00
ganzizi
af5db70c07 feat: 新增OKR信息推送 2023-07-19 18:26:12 +08:00
weifashi
f73ee2c13b style:整理代码格式 2023-07-19 10:50:40 +08:00
weifashi
e272c06028 fix:修改任务时间给提示功能,排除当前任务 2023-07-19 00:50:30 +08:00
weifashi
ada0de8dbc refactor:更改模板名称 2023-07-19 00:41:55 +08:00
weifashi
874bf4b051 feat:添加任务 - 提示功能 - 100% 2023-07-19 00:35:06 +08:00
weifashi
f8e70bd7f7 feat:添加任务 - 提示功能 - 60% 2023-07-18 19:03:09 +08:00
kuaifan
bbb69b3ec2 no message 2023-07-13 22:58:16 +08:00
weifashi
ddc7aecd53 feat:微应用逻辑补充 2023-07-12 18:44:28 +08:00
weifashi
f6fd9a5edf feat:添加配置 2023-07-12 15:29:17 +08:00
weifashi
fead758660 feat:多应用配置 2023-07-12 14:58:52 +08:00
weifashi
10d68790e7 feat:组件共享研究 2023-07-11 18:59:34 +08:00
kuaifan
56da2a5725 perf: 整理官网页面 2023-07-11 15:48:22 +08:00
kuaifan
925667d840 perf: 任务详情页可见性选项默认不显示 2023-07-11 14:43:16 +08:00
kuaifan
87669010e3 perf: 避免删除后不关闭任务窗口 2023-07-11 13:59:31 +08:00
kuaifan
4703b03b82 perf: 添加任务支持自定义协助人 2023-07-11 13:39:38 +08:00
kuaifan
e27ea9e117 fix: 前端取消会议屏幕常亮 2023-07-11 11:31:24 +08:00
kuaifan
1df0a1dfb4 Merge commit '7b02bc006b397990c055e80a006e0d104387f40c' into pro
# Conflicts:
#	resources/assets/js/pages/manage/components/MeetingManager.vue
2023-07-11 11:29:11 +08:00
weifashi
7b02bc006b feat:修复加入会议的loadIng 2023-07-10 20:35:44 +08:00
weifashi
ccea4b5b1b feat:添加微应用配置 2023-07-10 18:41:15 +08:00
weifashi
3096a6be79 feat:1.补充翻译,2给原生传翻译好的文本,3加入会议时appid不对,给出提示 2023-07-10 18:21:20 +08:00
kuaifan
ab23311851 Merge commit '035fba3fe5dacaae8ea00d8a5d296233e947ebf4' into pro 2023-07-09 18:17:39 +08:00
weifashi
035fba3fe5 fix:修复声网 id 改动问题 2023-07-09 17:52:27 +08:00
kuaifan
5152cee99e Merge commit '220ce21a4aec28adb018cf71a8f472bfd54da433' into dev
# Conflicts:
#	resources/assets/js/App.vue
#	resources/assets/js/store/actions.js
2023-07-09 16:33:05 +08:00
weifashi
220ce21a4a fix:发送会议名称给原生那边 2023-07-07 19:49:34 +08:00
weifashi
01b50c442e feat:发送会议名称给原生那边 2023-07-07 17:40:31 +08:00
weifashi
371c87f5a4 fix:统一字段名称 2023-07-07 17:02:13 +08:00
weifashi
155f42dd37 fix:打开会议窗口更改 2023-07-07 16:54:50 +08:00
kuaifan
9289591ba0 整理代码 2023-07-07 12:03:32 +08:00