Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from mindoc-org:master #1

Open
wants to merge 293 commits into
base: master
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented Nov 25, 2021

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

LawyZheng and others added 30 commits March 25, 2021 10:48
add dingtalk login and sovle some problems in mobile mode
- to avoid type check bug when comparing error, use newer api instead of
old adapter
Able to Login via Dingtalk QR Code
- using new orm api, change some related logics
- newer orm api has the concept of TxOrmer, for purpose of transaction
handling. A transaction ormer in v2 is a stateful object, it should be
dropped after using. A Ormer object is stateless and thread(routine)
    safe, and should not be used for transaction handling. More details
    count be found at official doc:
    https://beego.me/docs/mvc/model/orm.md, and pr note: #662 (comment)
- depretace all adapter/logs to core/logs
update AppVeyor CI/CD config
add i18n zh config
add i18n en-us config
i18n, get lang set from url param
load i18n langs config
fix bug, change wrong import
leilei3167 and others added 30 commits August 23, 2023 10:22
* fix: first open document, cherryMarkdown not have theme

* fix: modify prismjs style and improve image clarity

* update cherry-markdown

* optimiztion: cherry-markdown

* feat: cherry-markdown add auto-save and update icon

* fix: the mobile phone displays abnormally and Markdown does not allow conversion

---------

Co-authored-by: zhangsheng.93 <[email protected]>
* add attach_clean & change_theme

* add attach_clean & change_theme

* add

* add readme

---------

Co-authored-by: root <[email protected]>
* 修复代码库读取缓存数据不高亮的问题

* 代码块重复点击高亮样式问题修复

---------

Co-authored-by: xiangshen <[email protected]>
* [il8] 增加html 编辑器的英文模式

* [template] add window.lang

* [wangeditor v4] 更新多语音

* [i18n] update eng langure

* [i18n] update eng langure

* update releaseBook langure

---------

Co-authored-by: admin <[email protected]>
* fix: first open document, cherryMarkdown not have theme

* fix: modify prismjs style and improve image clarity

* update cherry-markdown

* optimiztion: cherry-markdown

* feat: cherry-markdown add auto-save and update icon

* fix: the mobile phone displays abnormally and Markdown does not allow conversion

* fix: cherry display not complete

* support upload pdf&word&picture

* support upload pdf&word&picture

---------

Co-authored-by: zhangsheng.93 <[email protected]>
* add prev&next read
* add prev&next in default read.tpl
* update prev&next
* update images upload

* modify js res.url
* update images upload

* modify js res.url

* add froala

* froala-editor.js
* update images upload

* modify js res.url

* add froala

* froala-editor.js

* update cherry-markdown&cherry_markdown.js
Co-authored-by: zhangsheng <[email protected]>
* feat: 首页项目拖拽排序功能

* feat: 增加首页项目拖拽排序增加只能管理员进行, 排序失败元素回到原本位置

* perf: 新建文章以后直接进入到编辑文章页面

* perf: 优化文档打开时或刷新时样式闪动问题
* feat: 首页项目拖拽排序功能

* feat: 增加首页项目拖拽排序增加只能管理员进行, 排序失败元素回到原本位置

* perf: 新建文章以后直接进入到编辑文章页面

* perf: 优化文档打开时或刷新时样式闪动问题

* perf: 优化表格样式

* feat: 支持上传视频功能

* feat: 视频样式调整

* feat: 直接粘贴视频上传功能

* perf: 优化markdown目录显示
* feat: 首页项目拖拽排序功能

* feat: 增加首页项目拖拽排序增加只能管理员进行, 排序失败元素回到原本位置

* perf: 新建文章以后直接进入到编辑文章页面

* perf: 优化文档打开时或刷新时样式闪动问题

* perf: 优化表格样式

* feat: 支持上传视频功能

* feat: 视频样式调整

* feat: 直接粘贴视频上传功能

* perf: 优化markdown目录显示

* feat: 项目配置新增是否开启打印功能

* perf: 优化模型自动更新表字段

* perf: 创建项目时增加选择编辑器功能

* perf: 优化cherry-markdown 菜单栏
* feat: 首页项目拖拽排序功能

* feat: 增加首页项目拖拽排序增加只能管理员进行, 排序失败元素回到原本位置

* perf: 新建文章以后直接进入到编辑文章页面

* perf: 优化文档打开时或刷新时样式闪动问题

* perf: 优化表格样式

* feat: 支持上传视频功能

* feat: 视频样式调整

* feat: 直接粘贴视频上传功能

* perf: 优化markdown目录显示

* feat: 项目配置新增是否开启打印功能

* perf: 优化模型自动更新表字段

* perf: 创建项目时增加选择编辑器功能

* perf: 优化cherry-markdown 菜单栏

* perf: 优化项目阅读界面, 新增打开搜索面板快捷键(Ctrl + f), esc恢复到目录快捷键功能

* perf: 优化项目搜索
)

* feat: 首页项目拖拽排序功能

* feat: 增加首页项目拖拽排序增加只能管理员进行, 排序失败元素回到原本位置

* perf: 新建文章以后直接进入到编辑文章页面

* perf: 优化文档打开时或刷新时样式闪动问题

* perf: 优化表格样式

* feat: 支持上传视频功能

* feat: 视频样式调整

* feat: 直接粘贴视频上传功能

* perf: 优化markdown目录显示

* feat: 项目配置新增是否开启打印功能

* perf: 优化模型自动更新表字段

* perf: 创建项目时增加选择编辑器功能

* perf: 优化cherry-markdown 菜单栏

* perf: 优化项目阅读界面, 新增打开搜索面板快捷键(Ctrl + f), esc恢复到目录快捷键功能

* perf: 优化项目搜索

* perf: 文章TOC样式调整

* feat: 配置管理中增加本地化切换

* feat: 配置管理中增加本地化切换

* fix: 调整页面内copyright的链接为: https://mindoc.com.cn/域名下

* fix: 创建README.md资源

* fix: 创建README.md资源

* fix: README更新

* fix: README更新

* fix: README 地址修改

* fix: 调整cherryMarkdown toc样式 兼容打印样式

fix: 修复 convertImageToDataUri not func

* fix: cherry-markdown 上传附件和样式调整
* feat: word转笔记(富文本html)
* fix: 本地化文件更新
* pref: 优化小屏幕下 cherry-markdown.css 样式

* fix: 修复 markdown 上传图片功能没有回显链接问题

* fix: #853 修复文章被删除后可以从缓存读取

* feat: #834 增加文章私有状态, 文章分类下不展示私有文章
* fix: #976 评论增加头像

* fix: update cherry markdown read comment user to avatar style
* FixedBUG: pq: 不支持 LIMIT #,# 语法

* FixedBug: 修复全文搜索时,因不兼容PostgreSQL发生的语法错误

* 读取 dbadapter 以尽可能的兼容不同数据库
* [lang] fix tiny language

* [lang] fix lang

* [lang] update document lang

---------

Co-authored-by: admin <[email protected]>
* 添加只读用户角色,不能创建、编辑,只能被设置为观察者

* Update markdown.preview.css

toc隐藏的时候,article宽度为100%

* Update cherry-markdown.css

cherry样式,隐藏toc时宽度100%

* 发布pdf时候的默认发布者(项目填写了公司名称以公司名称为准)

* 验证只读用户权限
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.