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: SaltySoft/SmartBlocksTutorial
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: SaltySoft/SmartBlocksTutorial
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 56 files changed
  • 1 contributor

Commits on Dec 11, 2013

  1. * Added draft of mainblock

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    f96e5f3 View commit details
    Browse the repository at this point in the history

  2. + Added mainblock content

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    3d16e29 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into develop

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    9dff3b0 View commit details
    Browse the repository at this point in the history

  4. + Added code for mainblock : subscription, login, links

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    99212f3 View commit details
    Browse the repository at this point in the history

  5. + Added code for mainblock : subscription, login, links

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    193cc52 View commit details
    Browse the repository at this point in the history

  6. + Created Todoblock, created the task model

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    72fb6e3 View commit details
    Browse the repository at this point in the history

  7. + Added backend for todoblock

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    b95630e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'Features/block_todolist' into develop

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    ee4c654 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into Features/block_todolist

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    9c54c43 View commit details
    Browse the repository at this point in the history

  10. + Added front-end for todoblock

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    b726cdc View commit details
    Browse the repository at this point in the history

  11. Merge branch 'Features/block_todolist' into develop

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    7b4c0f1 View commit details
    Browse the repository at this point in the history

  12. + Added files for projectblock backend

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    db4946e View commit details
    Browse the repository at this point in the history

  13. + Added back end code for todoblock, untested yet

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    49a6720 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'Features/block_project' into develop

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    527b213 View commit details
    Browse the repository at this point in the history

  15. + Added project listing in front-end

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    7e33e74 View commit details
    Browse the repository at this point in the history

  16. + added project details page

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    07e2ddf View commit details
    Browse the repository at this point in the history

  17. + Front end for project block working

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    87631a6 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'Features/block_project' into develop

    @william26
    william26 committed Dec 11, 2013
    Configuration menu
    Copy the full SHA
    5cb9906 View commit details
    Browse the repository at this point in the history
Loading