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: cloudzhou/github_timeline
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: github_user_oauth
Choose a base ref
...
head repository: cloudzhou/github_timeline
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.
  • 7 commits
  • 52 files changed
  • 3 contributors

Commits on Jun 2, 2013

  1. 初步构建前台结构

    @yandy
    yandy committed Jun 2, 2013
    Configuration menu
    Copy the full SHA
    d47aeea View commit details
    Browse the repository at this point in the history

  2. 数据直接从后台传出

    @yandy
    yandy committed Jun 2, 2013
    Configuration menu
    Copy the full SHA
    f529bd1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/cloudzhou/github_timeline 

    Conflicts:
	github_timeline/static/js/locale/ar.js
	github_timeline/static/js/locale/bg.js
	github_timeline/static/js/locale/ca.js
	github_timeline/static/js/locale/cz.js
	github_timeline/static/js/locale/de.js
	github_timeline/static/js/locale/el.js
	github_timeline/static/js/locale/en.js
	github_timeline/static/js/locale/es.js
	github_timeline/static/js/locale/eu.js
	github_timeline/static/js/locale/fi.js
	github_timeline/static/js/locale/fo.js
	github_timeline/static/js/locale/fr.js
	github_timeline/static/js/locale/hu.js
	github_timeline/static/js/locale/hy.js
	github_timeline/static/js/locale/id.js
	github_timeline/static/js/locale/is.js
	github_timeline/static/js/locale/it.js
	github_timeline/static/js/locale/iw.js
	github_timeline/static/js/locale/ja.js
	github_timeline/static/js/locale/ko.js
	github_timeline/static/js/locale/nl.js
	github_timeline/static/js/locale/no.js
	github_timeline/static/js/locale/pl.js
	github_timeline/static/js/locale/pt-br.js
	github_timeline/static/js/locale/pt.js
	github_timeline/static/js/locale/ru.js
	github_timeline/static/js/locale/sk.js
	github_timeline/static/js/locale/sl.js
	github_timeline/static/js/locale/sr-cy.js
	github_timeline/static/js/locale/sv.js
	github_timeline/static/js/locale/ta.js
	github_timeline/static/js/locale/tl.js
	github_timeline/static/js/locale/tr.js
	github_timeline/static/js/locale/zh-cn.js
	github_timeline/static/js/locale/zh-tw.js
	github_timeline/static/js/timeline-min.js
	github_timeline/static/js/timeline.js
	github_timeline/templates/home.html
    @yandy
    yandy committed Jun 2, 2013
    Configuration menu
    Copy the full SHA
    4ac39c2 View commit details
    Browse the repository at this point in the history

  4. git commit by cloudzhou

    @cloudzhou
    cloudzhou committed Jun 2, 2013
    Configuration menu
    Copy the full SHA
    825e2ff View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/cloudzhou/github_timeline

    @cloudzhou
    cloudzhou committed Jun 2, 2013
    Configuration menu
    Copy the full SHA
    31036e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2013

  1. just add a new line

    @azhoulinux
    azhoulinux committed Jun 5, 2013
    Configuration menu
    Copy the full SHA
    56a9464 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2013

  1. test push two remote url

    @azhoulinux
    azhoulinux committed Jun 6, 2013
    Configuration menu
    Copy the full SHA
    b6ab18d View commit details
    Browse the repository at this point in the history
Loading