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: zhaoyao91/fei-1
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: ShakingMap/ShakingBlog
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.
  • 13 commits
  • 21 files changed
  • 1 contributor

Commits on Apr 20, 2016

  1. update readme

    I am not shine
    I am not shine committed Apr 20, 2016
    Configuration menu
    Copy the full SHA
    2b32526 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2016

  1. update readme

    zhaoyao91
    zhaoyao91 committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    52bd00b View commit details
    Browse the repository at this point in the history

  2. move constants to context

    zhaoyao91
    zhaoyao91 committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    5794805 View commit details
    Browse the repository at this point in the history

  3. add app settings schema into constants

    zhaoyao91
    zhaoyao91 committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    ae27104 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2016

  1. add app settings schema into constants

    zhaoyao91
    zhaoyao91 committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    8160a21 View commit details
    Browse the repository at this point in the history

  2. update structure

    zhaoyao91
    zhaoyao91 committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    c7b782f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'auto-admin' of https://github.com/ShakingMap/ShakingBlo… 

    …g.git into auto-admin

# Conflicts:
#	client/configs/constants.js
    zhaoyao91
    zhaoyao91 committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    5aab875 View commit details
    Browse the repository at this point in the history

  4. aupport auto generate admin page

    zhaoyao91
    zhaoyao91 committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    9201d18 View commit details
    Browse the repository at this point in the history

  5. support brand image

    zhaoyao91
    zhaoyao91 committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    7c2a50f View commit details
    Browse the repository at this point in the history

  6. move settings of disqus to app state

    zhaoyao91
    zhaoyao91 committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    b343498 View commit details
    Browse the repository at this point in the history

  7. update readme

    zhaoyao91
    zhaoyao91 committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    10115d4 View commit details
    Browse the repository at this point in the history

  8. support hide index page title

    zhaoyao91
    zhaoyao91 committed Apr 22, 2016
    Configuration menu
    Copy the full SHA
    dba07d6 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2016

  1. support subtitle for blog page

    zhaoyao91
    zhaoyao91 committed Apr 23, 2016
    Configuration menu
    Copy the full SHA
    1ce2b60 View commit details
    Browse the repository at this point in the history
Loading