Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coderHacker-zz/dsp-frontend
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: topcoderinc/dsp-frontend
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 71 files changed
  • 5 contributors

Commits on Dec 25, 2016

  1. update heroku env variables

    gondzo committed Dec 25, 2016
    Configuration menu
    Copy the full SHA
    83fdaf0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev'

    gondzo committed Dec 25, 2016
    Configuration menu
    Copy the full SHA
    f6b112a View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2016

  1. change api service config variables

    gondzo committed Dec 26, 2016
    Configuration menu
    Copy the full SHA
    eb068ea View commit details
    Browse the repository at this point in the history

  2. change socket url config variables

    gondzo committed Dec 26, 2016
    Configuration menu
    Copy the full SHA
    ff07fec View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2016

  1. location history challenge

    gondzo committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    5dc7870 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'locationHistory' into dev 

    # Conflicts:
#	package.json
#	src/components/Header/Header.jsx
#	src/routes/Dashboard/containers/DashboardContainer.js
#	src/routes/DronesMap/components/DronesMapView.jsx
#	src/routes/DronesMap/containers/DronesMapContainer.js
#	src/routes/DronesMap/modules/DronesMap.js
#	src/routes/MissionPlanner/modules/MissionPlanner.js
#	src/routes/MyRequest/containers/MyRequestContainer.js
#	src/services/APIService.js
#	webpack.config.js
    gondzo committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    3b8c8fd View commit details
    Browse the repository at this point in the history

  3. location history lint issues fix

    gondzo committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    c738143 View commit details
    Browse the repository at this point in the history

  4. load environment from .env file

    gondzo committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    c56dfd6 View commit details
    Browse the repository at this point in the history

  5. changes for issue topcoderinc#13

    gondzo committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    a21fee5 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2016

  1. f2f challenge 30056068

    @chqy24
    chqy24 authored and gondzo committed Dec 28, 2016
    Configuration menu
    Copy the full SHA
    e13e205 View commit details
    Browse the repository at this point in the history

  2. nfz integration

    @lstkz
    lstkz authored and gondzo committed Dec 28, 2016
    Configuration menu
    Copy the full SHA
    1102156 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'nfzManagement' into dev 

    # Conflicts:
#	package.json
#	src/routes/DronesMap/components/DronesMapView.jsx
#	src/routes/index.js
#	src/services/APIService.js
#	webpack.config.js
    gondzo committed Dec 28, 2016
    Configuration menu
    Copy the full SHA
    3794d02 View commit details
    Browse the repository at this point in the history

  4. update git ignore

    gondzo committed Dec 28, 2016
    Configuration menu
    Copy the full SHA
    046ed5a View commit details
    Browse the repository at this point in the history

  5. fix heroku memory exceed isssue

    @chqy24
    chqy24 committed Dec 28, 2016
    Configuration menu
    Copy the full SHA
    99782ae View commit details
    Browse the repository at this point in the history

  6. Merge pull request topcoderinc#16 from chqy24/master 

    fix heroku memory exceed isssue
    @gondzo
    gondzo authored Dec 28, 2016
    Configuration menu
    Copy the full SHA
    171b4ee View commit details
    Browse the repository at this point in the history
Loading