commonplaceusa / commonplace

COMMUNITY!
www.commonplaceusa.com
3 stars 0 forks source link

Whilependingmerge #74

Closed pehrlich closed 12 years ago

pehrlich commented 12 years ago
maxtilford commented 12 years ago

/whereami will only work when logged out. is that intended?

On Thu, Nov 10, 2011 at 3:25 PM, Peter Ehrlich < reply@reply.github.com>wrote:

  • some stylistic changes for the community page (when logged in) -- infinite scroll happens sooner -- colorings and paddings
    • a /whereami method in the site controller. We'll give to organizers to see what kind of geo data we get back, and work from there to automate.

You can merge this Pull Request by running:

git pull https://github.com/pehrlich/commonplace whilependingmerge

Or you can view, comment on it, or merge it online at:

https://github.com/commonplaceusa/commonplace/pull/74

-- Commit Summary --

  • info box style tweeks, infinite scroll triggers sooner
  • Merge branch 'master' of github.com:commonplaceusa/commonplace into whilependingmerge
  • test page for geolocation

-- File Changes --

M app/controllers/site_controller.rb (32) M app/javascripts/info_boxes/base.js (46) M app/stylesheets/main_page/profile_box.css.sass (12) M config/routes.rb (4)

-- Patch Links --

https://github.com/commonplaceusa/commonplace/pull/74.patch https://github.com/commonplaceusa/commonplace/pull/74.diff


Reply to this email directly or view it on GitHub: https://github.com/commonplaceusa/commonplace/pull/74

pehrlich commented 12 years ago

we want it to be as close as possible to the actual index action it is intended to replace, so yes. We'll have to log out to test it

On Thu, Nov 10, 2011 at 6:36 PM, Max Tilford < reply@reply.github.com>wrote:

/whereami will only work when logged out. is that intended?

On Thu, Nov 10, 2011 at 3:25 PM, Peter Ehrlich < reply@reply.github.com>wrote:

  • some stylistic changes for the community page (when logged in) -- infinite scroll happens sooner -- colorings and paddings
    • a /whereami method in the site controller. We'll give to organizers to see what kind of geo data we get back, and work from there to automate.

You can merge this Pull Request by running:

git pull https://github.com/pehrlich/commonplace whilependingmerge

Or you can view, comment on it, or merge it online at:

https://github.com/commonplaceusa/commonplace/pull/74

-- Commit Summary --

  • info box style tweeks, infinite scroll triggers sooner
  • Merge branch 'master' of github.com:commonplaceusa/commonplace into whilependingmerge
  • test page for geolocation

-- File Changes --

M app/controllers/site_controller.rb (32) M app/javascripts/info_boxes/base.js (46) M app/stylesheets/main_page/profile_box.css.sass (12) M config/routes.rb (4)

-- Patch Links --

https://github.com/commonplaceusa/commonplace/pull/74.patch https://github.com/commonplaceusa/commonplace/pull/74.diff


Reply to this email directly or view it on GitHub: https://github.com/commonplaceusa/commonplace/pull/74


Reply to this email directly or view it on GitHub: https://github.com/commonplaceusa/commonplace/pull/74#issuecomment-2702986