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

Commits on Aug 18, 2015

  1. JS Update – further separate original forge.jquery.js functions into … 

    …individuated scripts. The controllers (docJSCtrl.js, newsJSCtrl.js, etc.) could probably all be consolidated to one script but I'm not sure about that functionality.
    @visuale
    visuale committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    e0e9752 View commit details
    Browse the repository at this point in the history

  2. Changed index.html to remove conflict

    @visuale
    visuale committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    3937eba View commit details
    Browse the repository at this point in the history

  3. Conflict merge of app/index.html

    @visuale
    visuale committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    f3d08d3 View commit details
    Browse the repository at this point in the history

  4. Extended the setTimeout in both the news and doc. sub-page templates … 

    …to wait an extra couple of hundredths of a second before activating script
    @visuale
    visuale committed Aug 18, 2015
    Configuration menu
    Copy the full SHA
    2b3240d View commit details
    Browse the repository at this point in the history
Loading