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: marmelab/ng-admin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: noteon/ng-admin
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.
  • 6 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 20, 2015

  1. fix path "../src/javascript/bower-components"

    @qing-hai
    qing-hai committed Jan 20, 2015
    Configuration menu
    Copy the full SHA
    6d86b85 View commit details
    Browse the repository at this point in the history

  2. fix path "../src/javascript/bower-components"

    @qing-hai
    qing-hai committed Jan 20, 2015
    Configuration menu
    Copy the full SHA
    eb83bab View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/noteon/ng-admin 

    Conflicts:
	build/ng-admin.min.css
    @qing-hai
    qing-hai committed Jan 20, 2015
    Configuration menu
    Copy the full SHA
    a6adbd9 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2015

  1. place dev edition ng-admin.min.js

    @qing-hai
    qing-hai committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    2b9b64c View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2015

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	build/ng-admin.min.css
	build/ng-admin.min.js
    @qing-hai
    qing-hai committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    550c788 View commit details
    Browse the repository at this point in the history

  2. use build:dev 生成ng-admin.min.js and css

    @qing-hai
    qing-hai committed Feb 28, 2015
    Configuration menu
    Copy the full SHA
    f3fd1fd View commit details
    Browse the repository at this point in the history
Loading