Commits · 9ab0ae82393faa2d9d5abcf9432486a949a8d6fd · shoei.kanno / Ecsite

22 Oct, 2020 12 commits
- 調整途中 · 9ab0ae82
  keita.onoguchi authored Oct 22, 2020
  
  9ab0ae82
- Merge branch '最終調整' into 'master' · 77ae3237
  shoei.kanno authored Oct 22, 2020
```
ボタンの調整

See merge request !67
```
  77ae3237
- コンフリクト解消 · d5012da1
  shoei.kanno authored Oct 22, 2020
  
  d5012da1
- ボタンの調整 · 4f6912fb
  shoei.kanno authored Oct 22, 2020
  
  4f6912fb
- Merge branch 'カート編集' into 'master' · 5f73c2ba
  keita.onoguchi authored Oct 21, 2020
```
カート編集

See merge request !65
```
  5f73c2ba
- $DESKTOP-FI5PFC1\tevir's avatar$
  
  追加 · 5981258d
  DESKTOP-FI5PFC1\tevir authored Oct 21, 2020
  
  5981258d
- $DESKTOP-FI5PFC1\tevir's avatar$
  
  編集途中 · 81815122
  DESKTOP-FI5PFC1\tevir authored Oct 21, 2020
  
  81815122
- Merge branch 'カート編集' into 'master' · f7a017cb
  keita.onoguchi authored Oct 21, 2020
```
カート編集

See merge request !64
```
  f7a017cb
- $DESKTOP-FI5PFC1\tevir's avatar$
  
  修正 · 5cdd3b62
  DESKTOP-FI5PFC1\tevir authored Oct 21, 2020
  
  5cdd3b62
- $DESKTOP-FI5PFC1\tevir's avatar$
  
  カート機能修正 · aad90608
  DESKTOP-FI5PFC1\tevir authored Oct 21, 2020
  
  aad90608
- Merge branch 'バグの修正' into 'master' · 8f1819b0
  shoei.kanno authored Oct 21, 2020
```
バグの修正

See merge request !63
```
  8f1819b0
- バグの修正 · 6bf13d31
  shoei.kanno authored Oct 21, 2020
  
  6bf13d31
21 Oct, 2020 28 commits
- Merge branch 'カート編集' into 'master' · b3f409e5
  keita.onoguchi authored Oct 21, 2020
```
カート編集機能追加

See merge request !62
```
  b3f409e5
- カート編集機能追加 · b699ae68
  keita.onoguchi authored Oct 21, 2020
  
  b699ae68
- Merge branch '最終調整' into 'master' · 18a0ff31
  shoei.kanno authored Oct 21, 2020
```
最終調整途中

See merge request !61
```
  18a0ff31
- 最終調整途中 · 8017f2ca
  shoei.kanno authored Oct 21, 2020
  
  8017f2ca
- Merge branch 'カートアイコン調整' into 'master' · 3edb25de
  keita.onoguchi authored Oct 21, 2020
```
商品一覧画面カートに入っている商品の個数追加

See merge request !60
```
  3edb25de
- Merge branch 'cart.html' into 'master' · 65560c61
  issei.miyajima authored Oct 21, 2020
```
carthtml

See merge request !59
```
  65560c61
- 商品一覧画面カートに入っている商品の個数追加 · 5581d4b4
  keita.onoguchi authored Oct 21, 2020
  
  5581d4b4
- carthtml · e295c7d5
  issei.miyajima authored Oct 21, 2020
  
  e295c7d5
- Merge branch '財布画面デザイン' into 'master' · 402e8739
  shoei.kanno authored Oct 21, 2020
```
財布機能追加

See merge request !58
```
  402e8739
- 財布機能追加 · 2a00476e
  shoei.kanno authored Oct 21, 2020
  
  2a00476e
- Merge branch '財布画面デザイン' into 'master' · b67d62f3
  shoei.kanno authored Oct 21, 2020
```
wallets.html変更

See merge request !57
```
  b67d62f3
- wallets.html変更 · 3fc7dfcb
  shoei.kanno authored Oct 21, 2020
  
  3fc7dfcb
- Merge branch 'ウォレット機能' into 'master' · 767ccdb8
  keita.onoguchi authored Oct 21, 2020
```
ウォレット機能途中

See merge request !56
```
  767ccdb8
- ウォレット機能途中 · 416a6476
  keita.onoguchi authored Oct 21, 2020
  
  416a6476
- Merge branch 'ウォレット機能' into 'master' · 76ed8897
  keita.onoguchi authored Oct 21, 2020
```
ウォレット機能途中

See merge request !55
```
  76ed8897
- ウォレット機能途中 · c363330c
  keita.onoguchi authored Oct 21, 2020
  
  c363330c
- Merge branch '財布画面デザイン' into 'master' · 431d7163
  shoei.kanno authored Oct 21, 2020
```
財布画面デザイン完成

See merge request !54
```
  431d7163
- 財布画面デザイン完成 · 451d8589
  shoei.kanno authored Oct 21, 2020
  
  451d8589
- Merge branch 'list.html修正' into 'master' · 3d7a1fe4
  issei.miyajima authored Oct 21, 2020
```
上の空白修正(HTML)

See merge request !53
```
  3d7a1fe4
- 上の空白修正(HTML) · 3c5f169f
  issei.miyajima authored Oct 21, 2020
  
  3c5f169f
- Merge branch '管理画面修正' into 'master' · bd59bde0
  issei.miyajima authored Oct 21, 2020
```
管理画面修正

See merge request !52
```
  bd59bde0
- 管理画面修正 · 3abc295a
  issei.miyajima authored Oct 21, 2020
```
ログイン中のadminが権限変更できないように
商品編集修正
```
  3abc295a
- Merge branch '財布画面デザイン' into 'master' · 0617b3f2
  shoei.kanno authored Oct 21, 2020
```
財布画面デザイン（財布画面へのリンクも追加）

See merge request !51
```
  0617b3f2
- 財布画面デザイン（財布画面へのリンクも追加） · e1eebedc
  shoei.kanno authored Oct 21, 2020
  
  e1eebedc
- Merge branch 'カート画面js' into 'master' · fbfe7bf2
  keita.onoguchi authored Oct 21, 2020
```
カート画面編集途中

See merge request !50
```
  fbfe7bf2
- カート画面編集途中 · 1831cf9a
  keita.onoguchi authored Oct 21, 2020
  
  1831cf9a
- Merge branch 'ユニーク機能' into 'master' · 61493dbd
  shoei.kanno authored Oct 21, 2020
```
ユニーク機能完成

See merge request !49
```
  61493dbd
- ユニーク機能完成 · 57a881ef
  shoei.kanno authored Oct 21, 2020
  
  57a881ef