Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Sep 10, 2014
  1. @danielberkompas

    Merge pull request #64 from berkompasacademy/send_contact_form_emails

    danielberkompas authored
    Send emails from contact form using Pony
  2. @danielberkompas
Commits on Jul 24, 2014
  1. @danielberkompas

    Merge pull request #14 from berkompasacademy/fix_merge_conflicts

    danielberkompas authored
    Fix Zach's attempt to resolve conflicts
  2. @danielberkompas

    Merge pull request #15 from berkompasacademy/fix_home_links

    danielberkompas authored
    Fix 'Home' and logo links
Commits on Jul 23, 2014
  1. @danielberkompas

    Fix 'Home' and logo links

    danielberkompas authored
    Even though the root file for a website is usually called `index`, you
    shouldn't actually link to `/index` when you try to go there. The index
    should be hosted at `/`, not `/index`.
  2. @danielberkompas

    Redo view and CSS changes

    danielberkompas authored
    These didn't make it in with the merge. So, I re-did them.
  3. @danielberkompas

    Fix Zach's attempt to resolve conflicts

    danielberkompas authored
    You should have removed this stuff, since we don't want it. The conflict
    was this:
    
    - You/Matthew added stuff to the home_page.css file. Some of these
      things included `#container` styles we didn't need.
    - At the same time, I removed the container styles.
    
    Git marked this conflict for you this way:
    
    ```
    <<<<<<<<<< HEAD
    (my changes, empty because I removed everything)
    ===============
    (Your stuff)
    >>>>>>>>>> master
    ```
    
    When you resolved the conflict, you should have removed the whole block,
    since my change was to get rid of it all.
    
    Hopefully that makes sense.
Commits on Jul 22, 2014
  1. @danielberkompas
  2. @danielberkompas
Commits on Jul 18, 2014
  1. @danielberkompas

    Merge pull request #1 from berkompasacademy/basic_homepage

    danielberkompas authored
    Add bootstrap, basic home page
  2. @danielberkompas
Commits on Apr 24, 2014
  1. @danielberkompas
Commits on Apr 6, 2014
  1. @danielberkompas

    Add the Rerun gem for auto-reloading

    danielberkompas authored
    This will allow you to make changes to the code and have your server
    automatically restart, provided you use `rerun 'rackup -p PORT'` to
    start the app.
Commits on Apr 5, 2014
  1. @danielberkompas
  2. @danielberkompas

    Simplify the Minitest configuration

    danielberkompas authored
    Don't need to explicitly reference the default progress bar
    implementation.
  3. @danielberkompas
  4. @danielberkompas
Commits on Apr 3, 2014
  1. @danielberkompas
  2. @danielberkompas

    Add a README file

    danielberkompas authored
    Describes the basics of getting the app set up and configured.
  3. @danielberkompas

    Initial Commit

    danielberkompas authored
    A working Sinatra application with an asset pipeline and tests.
Something went wrong with that request. Please try again.