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: treehouse-projects/java-debugging-flashy
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ohwhatafeeling/java-debugging-flashy
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.
  • 13 commits
  • 47 files changed
  • 3 contributors

Commits on Jun 24, 2019

  1. IC-2019.1.2 <pyro_@LAPTOP-649KNALC Overwrite remote https://github.co… 

    …m/ohwhatafeeling/java-debugging-flashy to local
    pyro_ pyro_
    pyro_ authored and pyro_ committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    19dc43c View commit details
    Browse the repository at this point in the history

  2. IC-2019.1.2 <pyro_@LAPTOP-649KNALC Create baseRefactoring.xml, markdo… 

    …wn.xml, project.default.xml, laf.xml, jdk.table.xml, Default.xml, GoogleStyle.xml, path.macros.xml, vcs.xml, code.style.schemes.xml, colors.scheme.xml, github.xml, debugger.xml, updates.xml
    pyro_ pyro_
    pyro_ authored and pyro_ committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    4624780 View commit details
    Browse the repository at this point in the history

  3. IC-2019.1.2 <pyro_@LAPTOP-649KNALC Create ide.general.xml

    @ohwhatafeeling
    ohwhatafeeling committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    fc5bf2b View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2019

  1. Address issue #6 by changing the number of examples to 3

    @ohwhatafeeling
    ohwhatafeeling committed Jun 26, 2019
    Configuration menu
    Copy the full SHA
    1ef833e View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2019

  1. IC-2019.1.2 <pyro_@LAPTOP-649KNALC Delete jdk.table.xml, updates.xml

    @ohwhatafeeling
    ohwhatafeeling committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    cff1816 View commit details
    Browse the repository at this point in the history

  2. Addresses bug described in #6 where total count in call to action was… 

    … off
    @ohwhatafeeling
    ohwhatafeeling committed Jun 27, 2019
    Configuration menu
    Copy the full SHA
    6b01fbc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #25 from ohwhatafeeling/fewer-examples 

    Fewer examples on the homepage
    @ohwhatafeeling
    ohwhatafeeling authored Jun 27, 2019
    Configuration menu
    Copy the full SHA
    051e002 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2019

  1. IC-2019.1.2 <pyro_@LAPTOP-649KNALC Create find.xml

    @ohwhatafeeling
    ohwhatafeeling committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    2e04a97 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2019

  1. IC-2019.1.2 <pyro_@LAPTOP-649KNALC Update ide.general.xml

    @ohwhatafeeling
    ohwhatafeeling committed Jul 7, 2019
    Configuration menu
    Copy the full SHA
    1f9fe3f View commit details
    Browse the repository at this point in the history

  2. Fixes #5 by making the cards display more standard

    @ohwhatafeeling
    ohwhatafeeling committed Jul 7, 2019
    Configuration menu
    Copy the full SHA
    5f1de2d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #26 from ohwhatafeeling/bogus-counting 

    Fixes #5 by making the cards display more standard
    @ohwhatafeeling
    ohwhatafeeling authored Jul 7, 2019
    Configuration menu
    Copy the full SHA
    b08341d View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2019

  1. IC-2019.1.2 <pyro_@LAPTOP-649KNALC Merge branch 'master' 

    Conflicts:
	src/main/java/com/teamtreehouse/flashy/controllers/IndexController.java
	src/main/java/com/teamtreehouse/flashy/services/FlashCardServiceImpl.java
    @ohwhatafeeling
    ohwhatafeeling committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    d70bc78 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2020

  1. IC-2019.1.2 <pyro_@LAPTOP-649KNALC Create editor.xml

    @ohwhatafeeling
    ohwhatafeeling committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    5f894a8 View commit details
    Browse the repository at this point in the history
Loading