Commits · dcff19e1f89c0883f06fe9c7ed27aa8975d16673 · syntax_j / mycard

26 Oct, 2016 3 commits
- remove candy · dcff19e1
  神楽坂玲奈 authored Oct 26, 2016
  
  dcff19e1
- lobby · 3a77c9fc
  神楽坂玲奈 authored Oct 26, 2016
  
  3a77c9fc
- login · 6ec19f15
  神楽坂玲奈 authored Oct 26, 2016
  
  6ec19f15
25 Oct, 2016 17 commits
- login · 6a532662
  神楽坂玲奈 authored Oct 25, 2016
  
  6a532662
- login · 47770a6b
  神楽坂玲奈 authored Oct 25, 2016
  
  47770a6b
- Merge remote-tracking branch 'origin/v3' into v3 · de8359d8
  wudizhanche1000 authored Oct 25, 2016
  
  de8359d8
- 除去RoutingService的使用 · ebdab037
  wudizhanche1000 authored Oct 25, 2016
  
  ebdab037
- webview hide · ad22d256
  神楽坂玲奈 authored Oct 25, 2016
  
  ad22d256
- Merge remote-tracking branch 'origin/v3' into v3 · 65b3f181
  wudizhanche1000 authored Oct 25, 2016
  
  65b3f181
- 修正在Service上使用OnInit的错误 · 73358670
  wudizhanche1000 authored Oct 25, 2016
  
  73358670
- webview hide · 76ae18c6
  神楽坂玲奈 authored Oct 25, 2016
  
  76ae18c6
- Merge branch 'v3' of github.com:mycard/mycard into v3 · e97693b2
  神楽坂玲奈 authored Oct 25, 2016
  
  e97693b2
- webview hide · dd91415e
  神楽坂玲奈 authored Oct 25, 2016
  
  dd91415e
- 修改AppsService导航方式 · bac2a8c3
  wudizhanche1000 authored Oct 25, 2016
  
  bac2a8c3
- apps.json · b8c1f277
  神楽坂玲奈 authored Oct 25, 2016
  
  b8c1f277
- apps.json · 9d4b097d
  神楽坂玲奈 authored Oct 25, 2016
  
  9d4b097d
- Merge branch 'v3' of https://github.com/mycard/mycard into v3 · ac57d1d8
  wudizhanche1000 authored Oct 25, 2016
  
  ac57d1d8
- 更改app.json的格式 · d22b570c
  wudizhanche1000 authored Oct 25, 2016
  
  d22b570c
- css · b10efc6e
  神楽坂玲奈 authored Oct 25, 2016
  
  b10efc6e
- room list · cf5f160b
  神楽坂玲奈 authored Oct 25, 2016
  
  cf5f160b
24 Oct, 2016 2 commits
- tags · 8c895171
  神楽坂玲奈 authored Oct 24, 2016
  
  8c895171
- 更新程序列表 · 34dcca76
  wudizhanche1000 authored Oct 24, 2016
  
  34dcca76
21 Oct, 2016 7 commits
- news · 7a18a6ee
  神楽坂玲奈 authored Oct 21, 2016
  
  7a18a6ee
- Merge branch 'v3' of github.com:mycard/mycard into v3 · 0083e502
  神楽坂玲奈 authored Oct 21, 2016
  
  0083e502
- app list · 518c78ba
  神楽坂玲奈 authored Oct 21, 2016
  
  518c78ba
- 合并版本 · 48dfb3ba
  wudizhanche1000 authored Oct 21, 2016
  
  48dfb3ba
- news · 07b9e520
  神楽坂玲奈 authored Oct 21, 2016
  
  07b9e520
- 添加卸载提示 · ad3c9453
  wudizhanche1000 authored Oct 21, 2016
  
  ad3c9453
- deck edit · 46a685a2
  神楽坂玲奈 authored Oct 21, 2016
  
  46a685a2
20 Oct, 2016 11 commits
- Merge branch 'v3' of github.com:mycard/mycard into v3 · a349dda6
  神楽坂玲奈 authored Oct 20, 2016
  
  a349dda6
- decks · f010d597
  神楽坂玲奈 authored Oct 20, 2016
  
  f010d597
- 完善卸载 · 7e26c85b
  wudizhanche1000 authored Oct 20, 2016
  
  7e26c85b
- bluebird · c5b54b1a
  神楽坂玲奈 authored Oct 20, 2016
  
  c5b54b1a
- Merge branch 'v3' of https://github.com/mycard/mycard into v3 · 9d964e5c
  wudizhanche1000 authored Oct 20, 2016
```
# Conflicts:
#	app/app-detail.component.html
#	app/apps.service.ts
#	apps.json
```
  9d964e5c
- 合并 · 45621de1
  wudizhanche1000 authored Oct 20, 2016
  
  45621de1
- 添加卸载 · 3bdfcb80
  wudizhanche1000 authored Oct 20, 2016
  
  3bdfcb80
- ygopro · 602ce234
  神楽坂玲奈 authored Oct 20, 2016
  
  602ce234
- ygopro · 56b61486
  神楽坂玲奈 authored Oct 20, 2016
  
  56b61486
- maxbuffer · a2adc47c
  神楽坂玲奈 authored Oct 20, 2016
  
  a2adc47c
- 更新程序列表 · 6c86bc5d
  wudizhanche1000 authored Oct 20, 2016
  
  6c86bc5d