Commit Graph

843 Commits

Author SHA1 Message Date
taojinlong
4399978965 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 11:56:09 +08:00
taojinlong
d1d9596624 fix: 国际化 2021-05-19 11:56:00 +08:00
fit2cloud-chenyw
f15253368f feat: <关于>中按钮使用user.isAdmin过滤 2021-05-19 11:52:01 +08:00
fit2cloud-chenyw
e9dc99526e fix: 删除菜单中目录 2021-05-19 11:42:09 +08:00
junjie
7a4488bbcc feat(数据集):数据集通过授权给普通用户 2021-05-19 11:16:21 +08:00
junjie
27b0ea6df2 feat(dashboard):新建一级目录 按钮fix 2021-05-19 10:52:46 +08:00
fit2cloud-chenyw
851d8edb86 fix: 修复flyway中菜单配置 2021-05-19 10:47:38 +08:00
fit2cloud-chenyw
5f8a0126d5 feat: 路由名称改为英文 2021-05-19 10:30:51 +08:00
taojinlong
14a5d7f667 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 10:18:12 +08:00
taojinlong
144fb84535 fix: 国际化 2021-05-19 10:17:36 +08:00
fit2cloud-chenyw
1107529dc1 fix: 修复线上国际化切换无效问题 2021-05-19 10:03:00 +08:00
wangjiahao
36d5a80190 feat: 授权flayway 2021-05-18 19:05:03 +08:00
wangjiahao
8a88c0bca9 Merge remote-tracking branch 'origin/main' into main 2021-05-18 18:39:32 +08:00
wangjiahao
1c48fc8848 feat: 授权国际化等 2021-05-18 18:39:18 +08:00
taojinlong
f0a39b1898 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 18:36:08 +08:00
taojinlong
901710b9b1 fix: license 产品名称 2021-05-18 18:35:54 +08:00
fit2cloud-chenyw
a0b6661c5f fix: 国际化头部参数错误 2021-05-18 18:33:52 +08:00
fit2cloud-chenyw
3970913f43 fix: 新加了组织后,编辑已有用户时,无法选择看见新加的组织 2021-05-18 18:16:04 +08:00
taojinlong
97c879f94d fix: 更改初始密码 2021-05-18 18:10:53 +08:00
taojinlong
c078c7b64a Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 18:06:14 +08:00
taojinlong
e9c6f43aa6 fix: sqlserver 2021-05-18 18:05:56 +08:00
junjie
ff37b43bdf feat(dashboard):UI fix 2021-05-18 17:48:33 +08:00
junjie
8a82c4687e Merge remote-tracking branch 'origin/main' into main 2021-05-18 17:31:42 +08:00
junjie
ec58faeee6 feat(dashboard):UI fix 2021-05-18 17:31:28 +08:00
fit2cloud-chenyw
0185c0c4af feat: 前端适配后台国际化 2021-05-18 17:30:36 +08:00
taojinlong
41deddbbfa fix: excel 数据集 2021-05-18 17:28:12 +08:00
junjie
9124a9213d feat(backend):fix 2021-05-18 17:18:47 +08:00
taojinlong
f56889e957 fix: sql 2021-05-18 17:09:55 +08:00
taojinlong
aea71643dc Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 16:58:46 +08:00
taojinlong
e44081d1a6 fix: 证书产品名称 2021-05-18 16:58:35 +08:00
junjie
5884487e2e feat(backend):flyway 2021-05-18 16:44:26 +08:00
junjie
c0e0e617f4 Merge remote-tracking branch 'origin/main' into main 2021-05-18 16:38:38 +08:00
junjie
ad0c75eacf feat(dashboard):仪表盘 Table Label支持,大小自适应;收藏取消bug fix 2021-05-18 16:38:24 +08:00
taojinlong
f024af48aa Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 16:35:37 +08:00
wangjiahao
533d466ca2 Merge remote-tracking branch 'origin/main' into main 2021-05-18 16:34:32 +08:00
wangjiahao
025feaa057 feat: 授权flayway 2021-05-18 16:34:16 +08:00
taojinlong
254444fccf fix: 保存 excel 数据集的字段出错 2021-05-18 16:33:41 +08:00
junjie
708752a6ac feat(backend):flyway 2021-05-18 16:31:59 +08:00
fit2cloud-chenyw
32ebc596a0 fix: 删除非必要代码 2021-05-18 16:19:27 +08:00
fit2cloud-chenyw
2d3eb9050c fix: lic错误信息翻译 2021-05-18 16:17:07 +08:00
wangjiahao
c9b206ccd8 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
#	backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
#	backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/views/panel/list/PanelViewShow.vue
2021-05-18 16:14:46 +08:00
wangjiahao
79e93655ec feat: 数据权限配置 2021-05-18 16:07:19 +08:00
taojinlong
19de8a5837 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 15:57:21 +08:00
taojinlong
314d886b2c fix: 保存 excel 数据集的字段出错 2021-05-18 15:56:15 +08:00
fit2cloud-chenyw
31e5cca439 feat:前端增加国际化切换 2021-05-18 15:46:14 +08:00
junjie
6d54dcece4 feat(frontend):UI fix 2021-05-18 15:33:39 +08:00
junjie
c3092ca38e feat(数据集):sql数据集最后支持加1个分号结束 2021-05-18 15:32:12 +08:00
junjie
4535dd2a5e feat(dashboard):ui fix;创建一级目录 2021-05-18 15:20:48 +08:00
taojinlong
8893d06d49 fix: 保存 excel 数据集的字段出错 2021-05-18 15:17:57 +08:00
taojinlong
f07065b6f2 Merge branch 'main' of github.com:dataease/dataease into main
# Conflicts:
#	backend/src/main/resources/db/migration/V8__system.sql
2021-05-18 15:00:31 +08:00