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: learneda/locker.dev-FE
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: learneda/locker.dev-FE
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: development
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 55 files changed
  • 3 contributors

Commits on Jan 30, 2020

  1. added spacing for the feed cards and changed powderblue to lightgrey

    @czclaxton
    czclaxton committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    65ff3fa View commit details
    Browse the repository at this point in the history

  2. added icons but still need spacing fix

    @czclaxton
    czclaxton committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    3e81c2f View commit details
    Browse the repository at this point in the history

  3. swapped icons to basic functionality, needs refining

    @czclaxton
    czclaxton committed Jan 30, 2020
    Configuration menu
    Copy the full SHA
    e7ccca9 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2020

  1. update

    @czclaxton
    czclaxton committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    56f90f1 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. swapped nav and pospt icons

    @czclaxton
    czclaxton committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    1be967f View commit details
    Browse the repository at this point in the history

  2. swapped icon on locker cards

    @czclaxton
    czclaxton committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    7ff0c1d View commit details
    Browse the repository at this point in the history

  3. updated icons and connected color variables

    @czclaxton
    czclaxton committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    346fe59 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. connected all colors to color variables

    @czclaxton
    czclaxton committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    1a4482f View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2020

  1. update

    @czclaxton
    czclaxton committed Mar 27, 2020
    Configuration menu
    Copy the full SHA
    730c5a3 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2020

  1. Merge pull request #358 from learneda/icons-swap 

    Icons swap
    @luiscmartinez
    luiscmartinez authored Apr 23, 2020
    Configuration menu
    Copy the full SHA
    3e3264e View commit details
    Browse the repository at this point in the history

  2. updated clientUrl to an env variable from a string

    @czclaxton
    czclaxton committed Apr 23, 2020
    Configuration menu
    Copy the full SHA
    99aba1a View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. updated env variables to include REACT_

    @czclaxton
    czclaxton committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    7edf8e7 View commit details
    Browse the repository at this point in the history

  2. updated env vars to include REACT_APP_

    @czclaxton
    czclaxton committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    ebfeb45 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2020

  1. update

    @czclaxton
    czclaxton committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    e8468de View commit details
    Browse the repository at this point in the history

  2. Delete .env

    @czclaxton
    czclaxton authored Apr 25, 2020
    Configuration menu
    Copy the full SHA
    059e132 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. console log

    @czclaxton
    czclaxton committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    674a1e9 View commit details
    Browse the repository at this point in the history

  2. console log

    @czclaxton
    czclaxton committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    071e4aa View commit details
    Browse the repository at this point in the history

  3. Delete .env

    @czclaxton
    czclaxton authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    9bf3a8f View commit details
    Browse the repository at this point in the history

  4. update

    @czclaxton
    czclaxton committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    0a0007a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development' of https://github.com/learneda/locker.dev-FE… 

    … into development
    @czclaxton
    czclaxton committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    5f97761 View commit details
    Browse the repository at this point in the history
Loading