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

Commits on Sep 12, 2016

  1. Began layout for dashboard view 

    Used bootstrap to begin designing a user dashboard view
    @1ogica1
    1ogica1 committed Sep 12, 2016
    Configuration menu
    Copy the full SHA
    e065a2b View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2016

  1. Updated GENER8 Button Colour 

    Switched to btn-primary for better button visibility
    @1ogica1
    1ogica1 committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    906b7ee View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dashboard' 

    Conflicts:
	webgen/urls.py
	webgen/views.py
    @1ogica1
    1ogica1 committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    7550ce3 View commit details
    Browse the repository at this point in the history

  3. Created Gener8.html Template 

    Updated structure of displaying html content from main.py functions
    @1ogica1
    1ogica1 committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    14ac7ea View commit details
    Browse the repository at this point in the history
Loading