Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2
# Conflicts: # abweb/common/js/constant.js # abweb/html/accountSetting.html # abweb/html/dashboard.html # abweb/html/index.html # abweb/html/pdfPrint.html # abweb/html/pickup.html # abweb/html/pushMessageDetail.html # abweb/html/pushMessageList.html # abweb/html/reportList.html # abweb/html/sendMessage.html # abweb/js/reportList/reportList.js
Showing
abweb/common/css/appCommon/login.css
deleted
100644 → 0
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
abweb/common/css/newdash/app.css
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
abweb/common/css/newdash/header.css
deleted
100644 → 0
abweb/common/css/newdash/login.css
deleted
100644 → 0
abweb/common/css/newdash/style.css
deleted
100644 → 0
abweb/common/css/web/common.css
deleted
100644 → 0
abweb/common/css/web/default.css
deleted
100644 → 0
abweb/common/css/web/footer.css
deleted
100644 → 0
abweb/common/css/web/header.css
deleted
100644 → 0
abweb/html/common/header.html
→
abweb/common/html/header.html
100755 → 100644
File moved
abweb/common/img/type_icon_questionary.svg
0 → 100644
This diff is collapsed.
Click to expand it.
abweb/common/js/web/app.js
deleted
100644 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
abweb/common/js/web/thickbox.js
deleted
100644 → 0
This diff is collapsed.
Click to expand it.
abweb/html/mainFooter.html
deleted
100644 → 0
Please
register
or
sign in
to comment