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: hacketyhack/hackety-hack.com
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: hacketyhack/hackety-hack.com
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: rss
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 9 files changed
  • 3 contributors

Commits on Aug 19, 2010

  1. Google Analytics code only for production mode 

    Google Analytics code will now only run if the site is in production mode.
    Marylou Kunkle committed Aug 19, 2010
    Configuration menu
    Copy the full SHA
    9e142a1 View commit details
    Browse the repository at this point in the history

  2. Eliminated strange warning from server 

    Caused by an unnecessary line of code in the site.sass file.
    Marylou Kunkle committed Aug 19, 2010
    Configuration menu
    Copy the full SHA
    bb6186b View commit details
    Browse the repository at this point in the history

  3. Added admin site and functionality; incomplete 

    Not everything works. The discussion and reply links are not correct. Will work on that later.
    Marylou Kunkle committed Aug 19, 2010
    Configuration menu
    Copy the full SHA
    3cb41c3 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2010

  1. Got all the links working on the admin page 

    The forum discussions and the forum replies links are both the same, because the replies are on the same page as the discussion. For now. I guess.
    Marylou Kunkle committed Aug 20, 2010
    Configuration menu
    Copy the full SHA
    9754f42 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2010

  1. The list of followers and followees are now links 

    When a hacker clicks on his followers or following links, they now have links to the fellow hackers instead of just a list.
    Marylou Kunkle committed Aug 21, 2010
    Configuration menu
    Copy the full SHA
    489cb18 View commit details
    Browse the repository at this point in the history

  2. Merge remote branch 'steve/master'

    Marylou Kunkle committed Aug 21, 2010
    Configuration menu
    Copy the full SHA
    1bfd36d View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2012

  1. Merge branch 'master' of git://github.com/hacketyhack/hackety-hack.com 

    Conflicts:
	models/hacker.rb
	views/hackers/followers.haml
	views/hackers/following.haml
	views/layout.haml
	views/stylesheets/site.sass
    Marylou Lenhart committed Jan 23, 2012
    Configuration menu
    Copy the full SHA
    81aa7c5 View commit details
    Browse the repository at this point in the history

  2. Jan 23, 2012 I'm trying to update my repo

    Marylou Lenhart committed Jan 23, 2012
    Configuration menu
    Copy the full SHA
    b85a580 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2012

  1. Temporary first Commit

    Marylou Lenhart committed Jan 25, 2012
    Configuration menu
    Copy the full SHA
    8a170ca View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2012

  1. Merge branch 'master' of git://github.com/hacketyhack/hackety-hack.com

    Marylou Lenhart committed Feb 13, 2012
    Configuration menu
    Copy the full SHA
    ba10454 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2012

  1. Atom feed midstage 

    Currently, all the content is being populated, but the actual Atom
feed is not rendering properly.
    Marylou Lenhart committed Feb 27, 2012
    Configuration menu
    Copy the full SHA
    30cf422 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2012

  1. Adding back in the blurb 

    Taking out the blurb didn't make a difference, so this puts it
back in.
    Marylou Lenhart committed Mar 3, 2012
    Configuration menu
    Copy the full SHA
    3bcfb69 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2012

  1. Intermediate Cleanup 

    The xml is being built properly with the information populating, but
it still isn't populating in a feed.
    Marylou Lenhart committed Mar 4, 2012
    Configuration menu
    Copy the full SHA
    ac121f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2012

  1. Merge remote-tracking branch 'melancholyfleur/master' into rss 

    Conflicts:
	config/routes.rb
    @steveklabnik
    steveklabnik committed Mar 6, 2012
    Configuration menu
    Copy the full SHA
    d4b6ac3 View commit details
    Browse the repository at this point in the history

  2. uuhhhh wtf was that?

    @steveklabnik
    steveklabnik committed Mar 6, 2012
    Configuration menu
    Copy the full SHA
    8764f9e View commit details
    Browse the repository at this point in the history

  3. Fixing it up

    @steveklabnik
    steveklabnik committed Mar 6, 2012
    Configuration menu
    Copy the full SHA
    ad89e25 View commit details
    Browse the repository at this point in the history

  4. Oh, let's fix that link too

    @steveklabnik
    steveklabnik committed Mar 6, 2012
    Configuration menu
    Copy the full SHA
    7e42ee7 View commit details
    Browse the repository at this point in the history
Loading