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

V2.10.x #774

Open
wants to merge 37 commits into
base: v2.10.x
Choose a base branch
from
Open

V2.10.x #774

wants to merge 37 commits into from

Conversation

LeezQ
Copy link
Contributor

@LeezQ LeezQ commented Sep 5, 2022

  1. update ui
  2. update bootstrap
  3. update webpack

LeezQ and others added 30 commits January 17, 2022 11:44
# Conflicts:
#	biz/webui/htdocs/js/index.js
# Conflicts:
#	biz/webui/htdocs/js/index.js
#	biz/webui/htdocs/src/css/base.css
#	biz/webui/htdocs/src/css/btn-group.css
#	biz/webui/htdocs/src/css/context-menu.css
#	biz/webui/htdocs/src/css/index.css
#	biz/webui/htdocs/src/css/req-data.css
#	biz/webui/htdocs/src/js/req-data.js
# Conflicts:
#	biz/webui/htdocs/js/index.js
# Conflicts:
#	biz/webui/htdocs/index.html
#	biz/webui/htdocs/src/css/context-menu.css
#	biz/webui/htdocs/src/css/index.css
#	biz/webui/htdocs/src/css/list.css
#	biz/webui/htdocs/src/js/about.js
#	biz/webui/htdocs/src/js/composer.js
#	biz/webui/htdocs/src/js/index.js
#	biz/webui/htdocs/src/js/list-dialog.js
#	biz/webui/htdocs/src/js/list.js
#	biz/webui/htdocs/src/js/recycle-bin.js
#	biz/webui/htdocs/src/webpack.config.js
#	package.json
# Conflicts:
#	biz/webui/htdocs/index.html
#	biz/webui/htdocs/js/index.js
#	package-lock.json
avwo and others added 7 commits October 15, 2022 14:42
# Conflicts:
#	biz/webui/htdocs/index.html
#	biz/webui/htdocs/js/index.js
#	biz/webui/htdocs/src/css/composer.css
#	biz/webui/htdocs/src/js/composer-list.js
#	biz/webui/htdocs/src/js/composer.js
#	biz/webui/htdocs/src/js/detail.js
#	biz/webui/htdocs/src/js/files-dialog.js
#	biz/webui/htdocs/src/js/index.js
#	biz/webui/htdocs/src/js/tools.js
#	biz/webui/htdocs/src/js/win.js
#	package-lock.json
@avwo
Copy link
Owner

avwo commented Oct 18, 2022

不要一次性提交这么多代码,一个个功能来

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants