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: kylestlb/BlockLight
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: NicoleBranch
Choose a base ref
...
head repository: kylestlb/BlockLight
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.
  • 12 commits
  • 123 files changed
  • 2 contributors

Commits on Apr 7, 2013

  1. Merge pull request #6 from kylestlb/NicoleBranch

    Merge pull request #5 from kylestlb/master
    nang1 committed Apr 7, 2013
    Configuration menu
    Copy the full SHA
    8e20d5e View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2013

  1. Jordan: Push

    Pushing my code I should have pushed forever ago (no new updates since
    last meeting)
    Jordan Nguyen authored and Jordan Nguyen committed Apr 8, 2013
    Configuration menu
    Copy the full SHA
    dd903f4 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2013

  1. Jordan: changed sidebar

    took TVNavigationController code online and used it to swap the detail
    views when clicking on a button in the master view's sidebar
    Jordan Nguyen authored and Jordan Nguyen committed Apr 11, 2013
    Configuration menu
    Copy the full SHA
    1e066e6 View commit details
    Browse the repository at this point in the history
  2. Jordan: added media button

    which I shouldn't have taken out in the first place >.>
    gives room for expansion (to shows the calendar & upcoming events I
    presume)
    Jordan Nguyen authored and Jordan Nguyen committed Apr 11, 2013
    Configuration menu
    Copy the full SHA
    e354bdf View commit details
    Browse the repository at this point in the history
  3. Jordan: Update file names

    we no longer have a homeDetailViewController. TVNavigationController
    handles the navigation between three views.
    
    The root view starts off with GroupViewController (before:
    homeDetailViewController) which shows list of groups.
    
    When choosing a group, uses ProductionViewController (before:
    GroupViewController) to show list of productions.
    
    MainView is now MainStageView and MasterView is now HomeMasterView to
    differentiate between the stage and master sidebar.
    
    StageEditor is now DimensionsView to avoid confusion between editing
    stage frames (in MainStageView) and editing the stage dimensions.
    Jordan Nguyen authored and Jordan Nguyen committed Apr 11, 2013
    Configuration menu
    Copy the full SHA
    10ee46c View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2013

  1. Jordan : Merged master & NicoleBranch

    Hopefully this works
    Jordan Nguyen authored and Jordan Nguyen committed Apr 15, 2013
    Configuration menu
    Copy the full SHA
    037da75 View commit details
    Browse the repository at this point in the history
  2. Jordan : commit

    nothing new, just trying to fix some bugs I was getting
    Jordan Nguyen authored and Jordan Nguyen committed Apr 15, 2013
    Configuration menu
    Copy the full SHA
    b8efd86 View commit details
    Browse the repository at this point in the history
  3. Jodan : I think I went in a circle...

    Jordan Nguyen authored and Jordan Nguyen committed Apr 15, 2013
    Configuration menu
    Copy the full SHA
    535f8f7 View commit details
    Browse the repository at this point in the history
  4. Jordan : I pushed the wrong copy my last commit

    Jordan Nguyen authored and Jordan Nguyen committed Apr 15, 2013
    Configuration menu
    Copy the full SHA
    23ae677 View commit details
    Browse the repository at this point in the history
  5. Jordan : pushing part of the renaming process

    Jordan Nguyen authored and Jordan Nguyen committed Apr 15, 2013
    Configuration menu
    Copy the full SHA
    73476ac View commit details
    Browse the repository at this point in the history
  6. Jordan : Scene.m

    For some reason, it was missing
    Jordan Nguyen authored and Jordan Nguyen committed Apr 15, 2013
    Configuration menu
    Copy the full SHA
    9d1d599 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2013

  1. Jordan : rearranging files

    Groups in Xcode are NOT the same as folders (i.e. directories) in the
    system. Moved all the files into their correct directories and set the
    corresponding references (i.e. filepaths) in Xcode.
    Jordan Nguyen authored and Jordan Nguyen committed Apr 18, 2013
    Configuration menu
    Copy the full SHA
    4e18925 View commit details
    Browse the repository at this point in the history
Loading