Merge branch 'release_sp3' into 'bugFix/#42192操作改善1'
# Conflicts: # public_new/chat_room.html # public_new/css/chat.css
Showing
public/Readme.md
deleted
100644 → 0
public/css/bootstrap.min.css
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/css/bootstrap.min.css.map
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/css/chat.css
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/css/font-awesome.css
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
6.83 KB
6.82 KB
4.44 KB
6.83 KB
4.44 KB
6.15 KB
public/css/jquery-ui.min.css
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/css/lightbox.min.css
deleted
100644 → 0
public/fontawesome/LICENSE.txt
deleted
100644 → 0
public/fontawesome/css/all.css
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/fontawesome/css/all.min.css
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/fontawesome/css/brands.css
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/fontawesome/css/regular.css
deleted
100644 → 0
public/fontawesome/css/solid.css
deleted
100644 → 0
public/fontawesome/css/solid.min.css
deleted
100644 → 0
public/fontawesome/css/v4-shims.css
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/fontawesome/js/all.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/js/all.min.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/js/brands.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/js/brands.min.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/js/fontawesome.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/fontawesome/js/regular.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/js/regular.min.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/js/solid.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/js/solid.min.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/js/v4-shims.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/fontawesome/less/_core.less
deleted
100644 → 0
public/fontawesome/less/_icons.less
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/fontawesome/less/_larger.less
deleted
100644 → 0
public/fontawesome/less/_list.less
deleted
100644 → 0
public/fontawesome/less/_mixins.less
deleted
100644 → 0
public/fontawesome/less/_shims.less
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/fontawesome/less/brands.less
deleted
100644 → 0
public/fontawesome/less/regular.less
deleted
100644 → 0
public/fontawesome/less/solid.less
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/fontawesome/scss/_core.scss
deleted
100644 → 0
public/fontawesome/scss/_icons.scss
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/scss/_larger.scss
deleted
100644 → 0
public/fontawesome/scss/_list.scss
deleted
100644 → 0
public/fontawesome/scss/_mixins.scss
deleted
100644 → 0
public/fontawesome/scss/_shims.scss
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/fontawesome/scss/brands.scss
deleted
100644 → 0
public/fontawesome/scss/regular.scss
deleted
100644 → 0
public/fontawesome/scss/solid.scss
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fontawesome/sprites/solid.svg
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
File deleted
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
File deleted
File deleted
File deleted
File deleted
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
File deleted
File deleted
File deleted
File deleted
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
File deleted
File deleted
File deleted
public/fonts/FontAwesome.otf
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/fonts/fontawesome-webfont.eot
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/fonts/fontawesome-webfont.svg
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/fonts/fontawesome-webfont.ttf
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/icon/error_footer_img.svg
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/icon/error_top_icon.svg
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/icon/home_icon_off.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/icon/home_icon_on.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/icon/ic_operation_setting.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/chat.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/close.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/config.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/file.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/group-image.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/group.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/loading.gif
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/next.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/prev.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/images/user-profile.png
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/index.html
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/chat-db.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/chat-error.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/chat-ui.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/chat-util.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/chat-websocket.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/chat.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/constant.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/language.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/language_en.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/language_ja.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/language_ko.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/bootstrap.min.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/bootstrap.min.js.map
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/js/libs/collapsible.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/deparam.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/jquery-3.3.1.min.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
public/js/libs/jquery-ui.min.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/jquery.mark.min.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/lightbox.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/locale/ja.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/locale/ko.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/moment.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/js/libs/mustache.min.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/popper.min.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/js/libs/socket.io.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/networkError.html
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/socket.io/LICENSE
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/socket.io/README.md
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/socket.io/dist/socket.io.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
public/socket.io/lib/index.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/socket.io/lib/manager.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/socket.io/lib/on.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/socket.io/lib/socket.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/socket.io/lib/url.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
public/socket.io/package.json
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment