Code

Финал#9

Code

Open

artem1996 wants to merge 49 commits intofrontend-park-mail-ru:masterfrontend-park-mail-ru/2016_1_IOTA:masterfrom artem1996:developartem1996/2016_1_IOTA:developCopy head branch name to clipboard

+2,759-760

Commits

Commits on May 20, 2016

• Integration with new backend

  Ustimov

  committed
  401acbe

  Copy full SHA for 401acbe

• User read

  Ustimov

  committed
  4b37067

  Copy full SHA for 4b37067

• Fix proxy to support web socket

  darkwrat

  committed
  5bafcbc

  Copy full SHA for 5bafcbc

Commits on May 21, 2016

• Merge pull request Ustimov#15 from darkwrat/ws-fix

  Show description for 65e95f0
  Ustimov

  committed
  65e95f0

  Copy full SHA for 65e95f0

• Websocket

  Ustimov

  committed
  caef833

  Copy full SHA for caef833

• Preview WS

  artem1996

  committed
  f2e0732

  Copy full SHA for f2e0732

Commits on May 22, 2016

• WebSocket to backbone model

  Ustimov

  committed
  288bdfb

  Copy full SHA for 288bdfb

• Game state update from websocket

  Ustimov

  committed
  a410ddb

  Copy full SHA for a410ddb

Commits on May 23, 2016

• GET to /api/game after Start Game button click

  Ustimov

  committed
  23d9567

  Copy full SHA for 23d9567

• GET to /api/game after Start Game button click

  Ustimov

  committed
  16c4d62

  Copy full SHA for 16c4d62

• Added birthday to registration

  Ustimov

  committed
  8990a0d

  Copy full SHA for 8990a0d

• Loader

  Ustimov

  committed
  b2a5178

  Copy full SHA for b2a5178

• Merge

  Ustimov

  committed
  f710faf

  Copy full SHA for f710faf

Commits on May 27, 2016

• Bug fix

  Ustimov

  committed
  76c0649

  Copy full SHA for 76c0649

Commits on May 29, 2016

• Redisain

  artem1996

  committed
  844cf6b

  Copy full SHA for 844cf6b

• Merge pull request Ustimov#17 from artem1996/develop

  Show description for a690cc6
  Ustimov

  committed
  a690cc6

  Copy full SHA for a690cc6

• Cards down

  Ustimov

  committed
  54e0c2b

  Copy full SHA for 54e0c2b

Commits on May 30, 2016

• listener client

  artem1996

  committed
  7cfde57

  Copy full SHA for 7cfde57

• add responce

  artem1996

  committed
  9cbe97f

  Copy full SHA for 9cbe97f

• Add buttons

  artem1996

  committed
  9545b8a

  Copy full SHA for 9545b8a

• add button pass

  artem1996

  committed
  7976945

  Copy full SHA for 7976945

Commits on May 31, 2016

• Add debug conclude button

  darkwrat

  committed
  f9719a5

  Copy full SHA for f9719a5

• hand bug fix

  artem1996

  committed
  cfa2efd

  Copy full SHA for cfa2efd

• Merge branch 'develop' of https://github.com/darkwrat/2016_1_IOTA into develop

  darkwrat

  committed
  6c11d61

  Copy full SHA for 6c11d61

• Merge pull request #1 from darkwrat/develop

  Show description for 95fca52
  artem1996

  committed
  95fca52

  Copy full SHA for 95fca52

• safe point commit

  artem1996

  committed
  efd45a7

  Copy full SHA for efd45a7

• Merge branch 'temp' into develop

  artem1996

  committed
  3a92e87

  Copy full SHA for 3a92e87

• Hand fix

  artem1996

  committed
  b01644e

  Copy full SHA for b01644e

• fix dubl card

  artem1996

  committed
  8e39927

  Copy full SHA for 8e39927

Commits on Jun 2, 2016

• Exit button

  artem1996

  committed
  3fe429c

  Copy full SHA for 3fe429c

Commits on Jun 3, 2016

• RollCard

  artem1996

  committed
  15f1a41

  Copy full SHA for 15f1a41

• RollCard with server

  artem1996

  committed
  019c20c

  Copy full SHA for 019c20c

• Canvas score

  Ustimov

  committed
  b94071b

  Copy full SHA for b94071b

• Merge pull request #2 from Ustimov/develop

  Show description for f3a5863
  artem1996

  committed
  f3a5863

  Copy full SHA for f3a5863

• EExit alert

  artem1996

  committed
  d380071

  Copy full SHA for d380071

Commits on Jun 4, 2016

• Working exit

  artem1996

  committed
  1d8ff72

  Copy full SHA for 1d8ff72

• Merge New Score

  artem1996

  committed
  a3ea02d

  Copy full SHA for a3ea02d

• redesign v2.0

  artem1996

  committed
  c035a1c

  Copy full SHA for c035a1c

• Fix

  artem1996

  committed
  f8be2c7

  Copy full SHA for f8be2c7

• Fix pass

  artem1996

  committed
  d76d672

  Copy full SHA for d76d672

• Fix pass 2

  artem1996

  committed
  830ef71

  Copy full SHA for 830ef71

• Fix pass 2

  artem1996

  committed
  ef58565

  Copy full SHA for ef58565

• Fix nav-bar margin

  artem1996

  committed
  f0a3be7

  Copy full SHA for f0a3be7

• Fix nav-bar margin

  artem1996

  committed
  cd04894

  Copy full SHA for cd04894

Commits on Jun 5, 2016

• Performance improvements

  darkwrat

  committed
  384c782

  Copy full SHA for 384c782

• Bugfix

  darkwrat

  committed
  f84bd25

  Copy full SHA for f84bd25

• Remove unnecessary background clear

  darkwrat

  committed
  bafa8f7

  Copy full SHA for bafa8f7

• Small template fix

  darkwrat

  committed
  bfe8a5a

  Copy full SHA for bfe8a5a

Commits on Jun 7, 2016

• Merge pull request #3 from darkwrat/perf

  Show description for 8fa25f8
  artem1996

  committed
  8fa25f8

  Copy full SHA for 8fa25f8