Skip to content
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

Jump to bottom

v23.0.0 PROTOTYPE! [WIP] Authentication [back-end] #583

Open
wants to merge 143 commits into
base: master
Choose a base branch
from
Open

v23.0.0 PROTOTYPE! [WIP] Authentication [back-end] #583

wants to merge 143 commits into from

Commits on Mar 21, 2016

  1. prototype! - event listeners (for demo)

    @eugene-matvejev
    eugene-matvejev committed Mar 21, 2016
    Configuration menu
    Copy the full SHA
    2e3183a View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2016

  1. Merge branch 'prototype!-event-listeners' into v7.2.0_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Mar 27, 2016
    Configuration menu
    Copy the full SHA
    2c77684 View commit details
    Browse the repository at this point in the history

  2. comments

    @eugene-matvejev
    eugene-matvejev committed Mar 27, 2016
    Configuration menu
    Copy the full SHA
    d7c7b5d View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2016

  1. Merge branch 'v19.2.3' into prototype!_event_dispacher 

    # Conflicts:
#	phpunit.xml
    @eugene-matvejev
    eugene-matvejev committed Jun 18, 2016
    Configuration menu
    Copy the full SHA
    40897d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Jun 19, 2016
    Configuration menu
    Copy the full SHA
    999fc10 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v20.0.1_update_git_ignore' into v21.0.0_prototype!_even… 

    …t_dispacher
    @eugene-matvejev
    eugene-matvejev committed Jun 19, 2016
    Configuration menu
    Copy the full SHA
    0c44a4f View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. Merge branch 'v20.1.0' into v21.0.0_prototype!_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    ff8c51f View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Jun 23, 2016
    Configuration menu
    Copy the full SHA
    d2b5999 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2016

  1. Merge branch 'v20.2.2' into v21.0.0_prototype!_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    2f519d4 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2016

  1. Merge branch 'v21.2.1' into prototype!_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Jun 29, 2016
    Configuration menu
    Copy the full SHA
    ef2b8e6 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    5c8f631 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2016

  1. Merge branch 'v21.2.5' into prototype!_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    160000b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v21.2.6' into prototype!_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Jul 5, 2016
    Configuration menu
    Copy the full SHA
    3df1d9a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    d88a98e View commit details
    Browse the repository at this point in the history

  2. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    b5a48b1 View commit details
    Browse the repository at this point in the history

  3. save progress - working version

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    43a7662 View commit details
    Browse the repository at this point in the history

  4. optimize migrations

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    78449ce View commit details
    Browse the repository at this point in the history

  5. Merge branch 'v21.2.7' into prototype!_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    22a8166 View commit details
    Browse the repository at this point in the history

  6. save progress, optimise structure

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    5ee472b View commit details
    Browse the repository at this point in the history

  7. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    ebbd90d View commit details
    Browse the repository at this point in the history

  8. prototype - cleanup

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    aa44afb View commit details
    Browse the repository at this point in the history

  9. Merge branch 'v21.2.8' into prototype!_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    1757b02 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    b08dc18 View commit details
    Browse the repository at this point in the history

  2. remove front-end part of authorization prototype - will be in separat… 

    …e PR.
    @eugene-matvejev
    eugene-matvejev committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    360583c View commit details
    Browse the repository at this point in the history

  3. remove front-end part of authorization prototype - will be in separat… 

    …e PR.
    @eugene-matvejev
    eugene-matvejev committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    f97506f View commit details
    Browse the repository at this point in the history

  4. cleanup config

    @eugene-matvejev
    eugene-matvejev committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    a804203 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    3f236f6 View commit details
    Browse the repository at this point in the history

  2. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    b62ab0e View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    4a17ac5 View commit details
    Browse the repository at this point in the history

  2. save progress

    @eugene-matvejev
    eugene-matvejev committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    d7c1d58 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2016

  1. Merge pull request #547 from eugene-matvejev/master 

    sync with master
    @eugene-matvejev
    eugene-matvejev committed Jul 17, 2016
    Configuration menu
    Copy the full SHA
    56189f7 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2016

  1. Merge branch 'v22.1.11' into prototype!_event_dispacher

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    4d2f82a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'prototype!_event_dispacher2' into fetch-prototype

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    9f120bc View commit details
    Browse the repository at this point in the history

  3. v23.0.0 update migrations

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    9beb324 View commit details
    Browse the repository at this point in the history

  4. update travis/prepare tests again SQLite

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    4838006 View commit details
    Browse the repository at this point in the history

  5. v22.2.0 update migrations

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    3001575 View commit details
    Browse the repository at this point in the history

  6. v22.2.1 try to run tests against SQLite

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    5898664 View commit details
    Browse the repository at this point in the history

  7. v22.2.1 try run tests agains SQLite

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    4cef728 View commit details
    Browse the repository at this point in the history

  8. save for rollback

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    abb4273 View commit details
    Browse the repository at this point in the history

  9. Revert "save for rollback" 

    This reverts commit abb4273.
    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    194c168 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'update_prototype_migrations' into prototype!_event_disp… 

    …acher2
    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    7205208 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'update_prototype_migrations' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    57243bd View commit details
    Browse the repository at this point in the history

  12. Merge branch 'prototype!_event_dispacher2' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    12577c5 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'prototype_save_progress' into prototype_authorization_m… 

    …erge

# Conflicts:
#	src/FoundationBundle/Resources/views/blocks/body.html.twig
#	src/FoundationBundle/Resources/views/blocks/layout.html.twig
#	src/FoundationBundle/Resources/views/blocks/sidebar.html.twig
#	src/FoundationBundle/Resources/views/index.html.twig
#	src/GameBundle/Controller/GameController.php
#	src/GameBundle/Resources/public/js/service/api-request.service.js
#	tests/phpunit/GameBundle/Controller/GameControllerTest.php
    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    e383882 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	.travis.yml
#	app/config/config.yml
#	tests/shared-environment/IntegrationTestSuite.php
    @eugene-matvejev
    eugene-matvejev committed Jul 24, 2016
    Configuration menu
    Copy the full SHA
    4a0c17d View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2016

  1. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	src/FoundationBundle/Controller/PlayerController.php
#	src/FoundationBundle/FoundationBundle.php
#	src/GameBundle/Resources/config/routing/gui.yml
#	tests/phpunit/FoundationBundle/Controller/PlayerControllerTest.php
    @eugene-matvejev
    eugene-matvejev committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    333f9b8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v22.4.3' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Jul 28, 2016
    Configuration menu
    Copy the full SHA
    6b47a72 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2016

  1. Merge branch 'v22.5.1' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    251666d View commit details
    Browse the repository at this point in the history

  2. Revert "cleanup" 

    This reverts commit a2dc723.
    @eugene-matvejev
    eugene-matvejev committed Jul 31, 2016
    Configuration menu
    Copy the full SHA
    76e133c View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2016

  1. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Aug 2, 2016
    Configuration menu
    Copy the full SHA
    563fc84 View commit details
    Browse the repository at this point in the history

  2. authorisation prototype - fix shared env.

    @eugene-matvejev
    eugene-matvejev committed Aug 2, 2016
    Configuration menu
    Copy the full SHA
    6976d1d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'v22.6.2' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Aug 2, 2016
    Configuration menu
    Copy the full SHA
    963248b View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    004e231 View commit details
    Browse the repository at this point in the history

  2. auhotization prototype: optimze MySQL migration

    @eugene-matvejev
    eugene-matvejev committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    4923a13 View commit details
    Browse the repository at this point in the history

  3. authorization prototype: improve PostgreSQL migration

    @eugene-matvejev
    eugene-matvejev committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    e591e37 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    013769a View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2016

  1. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	tests/shared-environment/MockFactory.php
    @eugene-matvejev
    eugene-matvejev committed Aug 11, 2016
    Configuration menu
    Copy the full SHA
    579532a View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Aug 14, 2016
    Configuration menu
    Copy the full SHA
    a81c14c View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2016

  1. Update services.yml

    @eugene-matvejev
    eugene-matvejev committed Sep 15, 2016
    Configuration menu
    Copy the full SHA
    03b5189 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2016

  1. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	app/AppKernel.php
#	app/config/config.yml
#	src/GameBundle/Controller/GameController.php
#	src/GameBundle/Controller/GameResultController.php
#	src/GameBundle/DataFixtures/ORM/LoadPlayerData.php
#	src/GameBundle/Model/PlayerModel.php
#	tests/phpunit/FoundationBundle/Controller/PlayerControllerTest.php
#	tests/phpunit/GameBundle/Controller/GameControllerTest.php
#	tests/phpunit/GameBundle/Controller/GameResultControllerTest.php
#	tests/phpunit/GameBundle/Model/PlayerModelTest.php
#	tests/phpunit/GameBundle/Request/GameInitiationRequestTest.php
#	tests/phpunit/GameBundle/Service/GameSystem/GameBuilderTest.php
#	tests/shared-environment/IntegrationTestSuite.php
    @eugene-matvejev
    eugene-matvejev committed Nov 13, 2016
    Configuration menu
    Copy the full SHA
    cac26a2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2016

  1. cleanup AppKernel.php

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    e5f6097 View commit details
    Browse the repository at this point in the history

  2. fix PlayerController::LogoutAction

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    a4d0f97 View commit details
    Browse the repository at this point in the history

  3. fixes after merge

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    74f494b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    f1e2a1c View commit details
    Browse the repository at this point in the history

  5. Update GameController.php

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    81d624a View commit details
    Browse the repository at this point in the history

  6. Delete IntegrationTestSuite.php

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    3b975ce View commit details
    Browse the repository at this point in the history

  7. Update services.yml

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    2edbcb6 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    5950311 View commit details
    Browse the repository at this point in the history

  9. improve LoadGameData fixture

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    ff70d97 View commit details
    Browse the repository at this point in the history

  10. improve LoadGameData fixture

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    26e82e6 View commit details
    Browse the repository at this point in the history

  11. fix PHPDoc @SInCE

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    d9d85e9 View commit details
    Browse the repository at this point in the history

  12. move class fields to private

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    772d51b View commit details
    Browse the repository at this point in the history

  13. improve PlayerSessionToken

    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    f6e7cd2 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'prototype_authorization' of github.com:eugene-matvejev/… 

    …battleship-game-api into prototype_authorization
    @eugene-matvejev
    eugene-matvejev committed Nov 20, 2016
    Configuration menu
    Copy the full SHA
    9aa260c View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2016

  1. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	src/GameBundle/DataFixtures/ORM/LoadPlayerData.php
#	src/GameBundle/Model/PlayerModel.php
    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    dc0f0a0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	tests/phpunit/GameBundle/Controller/GameControllerTest.php
#	tests/phpunit/GameBundle/Request/GameInitiationRequestTest.php
#	tests/shared-fixtures/game-initiation-requests/valid/valid-1-opponent-7x7.json
    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    c0e330c View commit details
    Browse the repository at this point in the history

  3. Update PlayerException.php

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    8ac7ce3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	tests/phpunit/GameBundle/Request/GameInitiationRequestTest.php
    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    b46dde4 View commit details
    Browse the repository at this point in the history

  5. Update AuthorizationListener.php

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    e7b316e View commit details
    Browse the repository at this point in the history

  6. Update PlayerSession.php

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    fb7f537 View commit details
    Browse the repository at this point in the history

  7. Delete MockFactory.php

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    9454165 View commit details
    Browse the repository at this point in the history

  8. Update PlayerModel.php

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    6116b15 View commit details
    Browse the repository at this point in the history

  9. fix authorization

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    bda6b72 View commit details
    Browse the repository at this point in the history

  10. fix serialization

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    b2bab18 View commit details
    Browse the repository at this point in the history

  11. fix GameController tests

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    b52432b View commit details
    Browse the repository at this point in the history

  12. fix phpunit tests

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    c868714 View commit details
    Browse the repository at this point in the history

  13. Update PlayerSessionModel.php

    @eugene-matvejev
    eugene-matvejev committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    3432413 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2016

  1. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    c6bd7cc View commit details
    Browse the repository at this point in the history

  2. fix build

    @eugene-matvejev
    eugene-matvejev committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    a3a102d View commit details
    Browse the repository at this point in the history

  3. improve build

    @eugene-matvejev
    eugene-matvejev committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    953b1f4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'prototype_authorization' of github.com:eugene-matvejev/… 

    …battleship-game-api into prototype_authorization
    @eugene-matvejev
    eugene-matvejev committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    80e34e0 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2016

  1. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	src/GameBundle/Validator/GameInitiationRequestValidator.php
    @eugene-matvejev
    eugene-matvejev committed Nov 25, 2016
    Configuration menu
    Copy the full SHA
    1e24d62 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2016

  1. improve PlayerModel

    @eugene-matvejev
    eugene-matvejev committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    cf8e805 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Dec 2, 2016
    Configuration menu
    Copy the full SHA
    8aab7de View commit details
    Browse the repository at this point in the history

  2. save progress

    @eugene-matvejev
    eugene-matvejev committed Dec 2, 2016
    Configuration menu
    Copy the full SHA
    9ac7fc6 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Dec 3, 2016
    Configuration menu
    Copy the full SHA
    22db887 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2016

  1. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Dec 7, 2016
    Configuration menu
    Copy the full SHA
    b634a0a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Dec 7, 2016
    Configuration menu
    Copy the full SHA
    44b7f73 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2016

  1. Merge branch 'update_gitignore' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Dec 8, 2016
    Configuration menu
    Copy the full SHA
    2764d0d View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2016

  1. update documentation; fix coverage

    @eugene-matvejev
    eugene-matvejev committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    2bb89ce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'prototype_authorization' of github.com:eugene-matvejev/… 

    …battleship-game-api into prototype_authorization
    @eugene-matvejev
    eugene-matvejev committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    a93076a View commit details
    Browse the repository at this point in the history

  3. add missing test case

    @eugene-matvejev
    eugene-matvejev committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    f65b212 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    059f4ca View commit details
    Browse the repository at this point in the history

  5. fix build

    @eugene-matvejev
    eugene-matvejev committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    c214e1a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'prototype_authorization' of github.com:eugene-matvejev/… 

    …battleship-game-api into prototype_authorization
    @eugene-matvejev
    eugene-matvejev committed Dec 9, 2016
    Configuration menu
    Copy the full SHA
    8645771 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2016

  1. improve behat.yml

    @eugene-matvejev
    eugene-matvejev committed Dec 10, 2016
    Configuration menu
    Copy the full SHA
    45aef6b View commit details
    Browse the repository at this point in the history

  2. try fix builld

    @eugene-matvejev
    eugene-matvejev committed Dec 10, 2016
    Configuration menu
    Copy the full SHA
    3836004 View commit details
    Browse the repository at this point in the history

  3. Update services.yml

    @eugene-matvejev
    eugene-matvejev committed Dec 10, 2016
    Configuration menu
    Copy the full SHA
    3be05c7 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    ac229d6 View commit details
    Browse the repository at this point in the history

  2. try fix build

    @eugene-matvejev
    eugene-matvejev committed Dec 19, 2016
    Configuration menu
    Copy the full SHA
    8fdcb0a View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2016

  1. save progress

    @eugene-matvejev
    eugene-matvejev committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    ba09139 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'prototype_authorization' of github.com:eugene-matvejev/… 

    …battleship-game-api into prototype_authorization

# Conflicts:
#	src/GameBundle/Resources/config/services.yml
    @eugene-matvejev
    eugene-matvejev committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    f7663f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2017

  1. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	app/config/config.yml
#	app/config/security.yml
    @eugene-matvejev
    eugene-matvejev committed Mar 5, 2017
    Configuration menu
    Copy the full SHA
    fc19e85 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Mar 5, 2017
    Configuration menu
    Copy the full SHA
    c95b515 View commit details
    Browse the repository at this point in the history

  3. Update behat.yml

    @eugene-matvejev
    eugene-matvejev committed Mar 5, 2017
    Configuration menu
    Copy the full SHA
    d46e65e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #732 from eugene-matvejev/eugene-matvejev-patch-1 

    update behat.yml
    @eugene-matvejev
    eugene-matvejev committed Mar 5, 2017
    Configuration menu
    Copy the full SHA
    20bc71c View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    ad235ea View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    2d5002a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    06c292d View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2017

  1. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    6be8f45 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2017

  1. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Aug 24, 2017
    Configuration menu
    Copy the full SHA
    f1a2953 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2017

  1. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    cc02f9c View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    ad59b48 View commit details
    Browse the repository at this point in the history

  2. Update MockFactory.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    5a2e57c View commit details
    Browse the repository at this point in the history

  3. Update valid-1-opponent-7x7.json

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    3c6744d View commit details
    Browse the repository at this point in the history

  4. Update MockFactory.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    ae20e29 View commit details
    Browse the repository at this point in the history

  5. Update MockFactory.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    f0fdffa View commit details
    Browse the repository at this point in the history

  6. Update MockFactory.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    d7a9f0d View commit details
    Browse the repository at this point in the history

  7. Update AbstractControllerTestCase.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    8c94636 View commit details
    Browse the repository at this point in the history

  8. Update WsseFactory.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    adc3e96 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	src/GameBundle/Controller/GameController.php
#	src/GameBundle/DataFixtures/ORM/LoadPlayerData.php
#	src/GameBundle/Resources/config/services.yml
#	tests/phpunit/GameBundle/Model/PlayerModelTest.php
    Eugene Matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    6b00397 View commit details
    Browse the repository at this point in the history

  10. fix typos

    Eugene Matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    3c4a989 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	src/GameBundle/Entity/Battlefield.php
#	src/GameBundle/Entity/Cell.php
#	src/GameBundle/Entity/Game.php
#	src/GameBundle/Entity/GameResult.php
#	src/GameBundle/Entity/Player.php
#	src/GameBundle/ORM/PlayerTrait.php
#	src/GameBundle/Request/GameInitiationRequest.php
#	src/GameBundle/Response/GameInitiationResponse.php
    Eugene Matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    a2b6ecd View commit details
    Browse the repository at this point in the history

  12. Update WsseProvider.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    52a34df View commit details
    Browse the repository at this point in the history

  13. Update MockFactory.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    7d48552 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'master' into prototype_authorization

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    de1fad9 View commit details
    Browse the repository at this point in the history

  15. Update CommonControllerContext.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    f4eea10 View commit details
    Browse the repository at this point in the history

  16. Update GameResultController.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    875495d View commit details
    Browse the repository at this point in the history

  17. Update CommonControllerContext.php

    @eugene-matvejev
    eugene-matvejev committed Jan 9, 2018
    Configuration menu
    Copy the full SHA
    931e21f View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	src/FoundationBundle/ORM/PlayerInterface.php
#	src/FoundationBundle/ORM/PlayerTrait.php
#	src/GameBundle/Entity/Battlefield.php
#	src/GameBundle/Entity/GameResult.php
#	src/GameBundle/Entity/Player.php
    Eugene Matvejev committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    c1630bc View commit details
    Browse the repository at this point in the history

  2. Update AbstractControllerTestCase.php

    @eugene-matvejev
    eugene-matvejev committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    798e184 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into prototype_authorization 

    # Conflicts:
#	src/GameBundle/DataFixtures/ORM/LoadPlayerData.php
#	src/GameBundle/Model/PlayerModel.php
#	src/GameBundle/Resources/config/services.yml
#	src/GameBundle/Service/GameSystem/GameProcessor.php
#	tests/phpunit/GameBundle/Service/GameSystem/GameProcessorTest.php
#	tests/shared-environment/Factory/MockFactory.php
    Eugene Matvejev committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    b072cbe View commit details
    Browse the repository at this point in the history

  4. typo

    Eugene Matvejev committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    e5d8dfd View commit details
    Browse the repository at this point in the history