Skip to content

Develop #174

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.

Sign up for GitHub

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

Merged
merged 27 commits into from
Jun 2, 2019
Merged

Develop #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7da4d68
optimize(book): handle no data situation (#154)
vanoneang May 15, 2019
9d85483
Unit testing (#155)：自动化测试
GongJS May 15, 2019
e5ea56b
feat(component): add switch & rate (#156)
vanoneang May 19, 2019
35dc776
feat: tab组件 (#158)
May 19, 2019
a4eb2ef
feat(avatar): 头像修改基础ui
quanquan2100 May 19, 2019
1ca27cc
Merge branch 'develop' into feature/avatar
quanquan2100 May 19, 2019
f562c7a
feat(avatar): 头像修改基础ui (#159)
quanquan2100 May 19, 2019
248702f
Feature/switch (#160): fix(avatar): add user.jpg
vanoneang May 20, 2019
cf32e2f
style(*): 更换图片
quanquan2100 May 26, 2019
6298c0e
style(*): 添加配置文件
quanquan2100 May 26, 2019
1f57aa9
Merge remote-tracking branch 'origin/develop' into feature/avatar
quanquan2100 May 26, 2019
c9f870a
Merge remote-tracking branch 'origin/feature/avatar' into feature/avatar
quanquan2100 May 26, 2019
e13a531
chore(*): 调整项目主体
quanquan2100 May 26, 2019
34aba51
chore(统一lin文件夹内部结构):
quanquan2100 May 26, 2019
39c9e84
core 调整项目结构性东西 (#161)
quanquan2100 May 26, 2019
f01b0c3
feat(plugins/linCmsUi/): 增加 Link 文字链接 UI
lucienstar May 28, 2019
3aa1d8c
Merge pull request #162 from TaleLin/feature/LinCmsUi-Link
vanoneang May 28, 2019
3e97002
feat(linCmsUi): 增加linCmsUi tag 样式组件 (#163)
May 28, 2019
250bb86
支持用户修改头像 (#165)
quanquan2100 May 29, 2019
3f4b297
Feature/about (#166)： feat(core): env & about
vanoneang May 29, 2019
5d3819d
Feature/lin cms ui (#168)
May 30, 2019
aad87ae
optimize(user): default avatar; (#169)
vanoneang May 30, 2019
82d7850
Update TableCombo.vue
vanoneang Jun 2, 2019
c1e8945
完善头像修改逻辑 (#172)
quanquan2100 Jun 2, 2019
d60269c
Feature/explain (#173):optimize(user&about): optimize some logic
vanoneang Jun 2, 2019
a74033e
change base url
vanoneang Jun 2, 2019
8bdbdb0
handle conflict
vanoneang Jun 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ENV = 'development'

VUE_APP_BASE_URL = 'http://localhost:5000/'
3 changes: 3 additions & 0 deletions .env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@


VUE_APP_BASE_URL = 'http://localhost:5000/'
83 changes: 64 additions & 19 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lin-cms",
"version": "0.1.0-beta.2",
"version": "0.1.0-beta.3",
"private": true,
"scripts": {
"serve": "node script/plugin-get-config.js && vue-cli-service serve",
Expand All @@ -20,9 +20,12 @@
"fastscan": "^1.0.4",
"good-storage": "^1.1.0",
"js-cookie": "^2.2.0",
"screenfull": "4.2.0",
"lodash": "^4.17.11",
"moment": "^2.24.0",
"screenfull": "^4.2.0",
"vue": "^2.6.8",
"vue-awesome-swiper": "^3.1.3",
"vue-croppa": "^1.3.8",
"vue-router": "~3.0.1",
"vuex": "~3.0.1",
"vuex-persist": "^2.0.0"
Expand Down
Loading