Permalink
Commits on Sep 10, 2014
  1. Merge pull request #64 from berkompasacademy/send_contact_form_emails

    Send emails from contact form using Pony
    danielberkompas committed Sep 10, 2014
Commits on Jul 24, 2014
  1. Merge pull request #14 from berkompasacademy/fix_merge_conflicts

    Fix Zach's attempt to resolve conflicts
    danielberkompas committed Jul 24, 2014
  2. Merge pull request #15 from berkompasacademy/fix_home_links

    Fix 'Home' and logo links
    danielberkompas committed Jul 24, 2014
Commits on Jul 23, 2014
  1. Fix 'Home' and logo links

    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`.
    danielberkompas committed Jul 23, 2014
  2. Redo view and CSS changes

    These didn't make it in with the merge. So, I re-did them.
    danielberkompas committed Jul 23, 2014
  3. Fix Zach's attempt to resolve conflicts

    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.
    danielberkompas committed Jul 23, 2014
Commits on Jul 22, 2014
Commits on Jul 18, 2014
  1. Merge pull request #1 from berkompasacademy/basic_homepage

    Add bootstrap, basic home page
    danielberkompas committed Jul 18, 2014
Commits on Apr 24, 2014
Commits on Apr 6, 2014
  1. Add the Rerun gem for auto-reloading

    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.
    danielberkompas committed Apr 6, 2014
Commits on Apr 5, 2014
  1. Simplify the Minitest configuration

    Don't need to explicitly reference the default progress bar
    implementation.
    danielberkompas committed Apr 5, 2014
Commits on Apr 3, 2014
  1. Add a README file

    Describes the basics of getting the app set up and configured.
    danielberkompas committed Apr 3, 2014
  2. Initial Commit

    A working Sinatra application with an asset pipeline and tests.
    danielberkompas committed Apr 3, 2014