Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Basically 4chan #1

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Basically 4chan #1

wants to merge 10 commits into from

Commits on Nov 5, 2015

  1. adds posts with image uploads

    @mmezher
    mmezher committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    8341a20 View commit details
    Browse the repository at this point in the history

  2. Basically 4chan

    @macsochor
    macsochor committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    6c6a7a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2015

  1. initial commit

    @mmezher
    mmezher committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    79b23a6 View commit details
    Browse the repository at this point in the history

  2. initial commit

    @mmezher
    mmezher committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    a424b9c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/mmezher/starter

    @mmezher
    mmezher committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    feb25b0 View commit details
    Browse the repository at this point in the history

  4. hackathon commit

    @macsochor
    macsochor committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    a64ab1e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/macsochor/starter 

    Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/posts_controller.rb
	app/views/posts/index.html.erb
	app/views/posts/show.html.erb
	config/routes.rb
	db/schema.rb
    @mmezher
    mmezher committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    b766788 View commit details
    Browse the repository at this point in the history

  6. Merge https://github.com/macsochor/starter

    @mmezher
    mmezher committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    e447e8b View commit details
    Browse the repository at this point in the history

  7. commit2

    @macsochor
    macsochor committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    aa3360a View commit details
    Browse the repository at this point in the history

  8. 3

    @macsochor
    macsochor committed Nov 14, 2015
    Configuration menu
    Copy the full SHA
    c257d4d View commit details
    Browse the repository at this point in the history