Skud
2ecbd8315d
bugfix: don't say 'not yet set' in planting form
...
PT: https://www.pivotaltracker.com/story/show/51457917
Maco found this. The problem was that if you had a blank planting date,
and then re-edited the planting, it would say "not yet set" in the form
field, then die when it later tried to convert that to a date.
I replaced Miles's planted_at_string stuff in the model with a simpler
parse_date method in the application helper.
2013-06-11 16:08:02 +10:00
Skud
e3ef27e401
turn caching off again in dev
2013-06-07 18:20:45 +10:00
Skud
903f0c808c
cache recent_posts and recent_plantings partials
2013-06-07 17:52:31 +10:00
Skud
89a5a777e6
Merge branch 'dev' into payments-new
...
Conflicts:
.gitignore
app/models/ability.rb
app/models/member.rb
db/schema.rb
2013-06-04 19:42:00 +10:00
Miles Gould
20eeec43ca
Merge branch 'dev' into photos
...
Conflicts:
db/schema.rb
2013-05-31 11:24:19 +01:00
Skud
08c3ec7dec
Vendored the activemerchant gem to help with testing
...
We needed a bogus paypal gateway as per
http://infotrope.net/2013/05/31/testing-paypal-express-with-activemerchants-bogusgateway-and-how-to-make-it-work/
Tests now pass usefully.
2013-05-31 12:15:23 +10:00
Skud
cbca8c19a5
added admin controller and index view
2013-05-31 10:23:06 +10:00
Skud
7a1eaeffee
added admin controller and index view
2013-05-29 14:37:42 +10:00
Skud
5e678d1dbd
default test paypal gateway details to 'dummy' or it fails
2013-05-29 13:22:17 +10:00
Skud
89b62e18df
Roughly got Paypal working, after much messing around.
...
Still need more tests for the orders_controller, and to store the token
when it's returned.
2013-05-28 16:37:44 +10:00
Skud
dd556d8638
Merge branch 'dev' into payments-new
2013-05-28 14:07:53 +10:00
Skud
3aaf344951
rename account details to just account
2013-05-18 10:50:36 +10:00
Skud
c595b2181d
added account_types, fixed a bunch of tests
2013-05-17 16:07:46 +10:00
Skud
0157229936
added account_details table, set up abilities
...
also tweaked some order/order_item related abilities
2013-05-17 13:05:46 +10:00
Skud
7551b7b0d4
added order completion (very basic for now)
2013-05-17 11:28:04 +10:00
Miles Gould
6b487ab1f6
Escaped_Markdown HAML filter, for use in RSS.
...
I tried to do this using Haml::Filters::Markdown so it would be
independent of our Markdown renderer, but I couldn't get
Haml::Filters::Markdown.render to work programmatically - whatever I
did, it returned its input unchanged. So I hardcoded a dependence on
bluecloth.
2013-05-16 15:08:50 +01:00
Skud
7d74203735
rails g scaffold OrderItem...
2013-05-15 13:47:16 +10:00
Skud
5ae5e0f959
rails g scaffold Photo...
2013-05-08 20:52:35 +10:00
Skud
5c96bf1541
added basic index page for shop
2013-05-08 15:05:38 +10:00
Skud
42ea14a8e5
added shop page at /shop
2013-05-08 14:02:33 +10:00
Skud
245115fd7f
rails g scaffold Order...
2013-05-07 21:14:08 +10:00
Skud
cad5f453fa
rails g scaffold Product...
2013-05-07 20:56:10 +10:00
Skud
d006854a6c
added omniauth-flickr gem
2013-04-30 22:55:40 +10:00
Skud
c2dbebb046
Merge pull request #189 from pozorvlak/nearby
...
Find users within a given distance; allow specification of units.
2013-04-30 03:04:29 -07:00
Miles Gould
8bc4d8f4ce
Use km by default.
2013-04-30 10:39:57 +01:00
Skud
58482bfbc9
added contact link to footer
2013-04-29 09:39:30 +10:00
Skud
5b2dbc571e
security fix: check ENV for rails secret token
2013-04-27 10:23:32 +10:00
Miles Gould
643c8f0917
Rename local vars in tests for greater clarity.
2013-04-25 23:17:29 +01:00
Skud
2418be18d3
added connections to settings page, fixed tests
2013-04-18 23:41:04 +10:00
Miles Gould
83ac83a076
Add omniauth to our middleware.
2013-04-09 16:39:46 +01:00
Miles Gould
a3ad8c7bf9
Stub "authentications#create" method.
2013-04-09 16:39:45 +01:00
Miles Gould
5ea91bf56a
Added an Authentications table.
...
Connects users to remote web services, as recommended at
http://asciicasts.com/episodes/235-omniauth-part-1
In addition, we store "token" and "secret" fields.
2013-04-09 16:39:09 +01:00
Miles Gould
2e3febb1d6
Change route to "search/members/nearby" for consistency.
2013-04-02 14:17:00 +01:00
Miles Gould
0f22fbf4aa
Merge branch 'dev' into members_nearby
...
Conflicts:
spec/factories/member.rb
2013-04-02 13:10:38 +01:00
Miles Gould
ae4b0cca2b
Remove extra route to notifications/new.
2013-04-02 12:29:29 +01:00
pozorvlak
195055365d
Merge pull request #161 from phazel/private_message
...
Private message
2013-04-02 04:21:19 -07:00
Skud
0ec01ab259
improved date/time formatting
...
we set defaults for date and time formatting (and override them in a few
places)
2013-04-02 12:30:05 +11:00
gnattery
2ecd996e8a
Merge branch 'dev' of github.com:phazel/growstuff into private_message
2013-04-01 13:42:09 +11:00
Miles Gould
f08a5249e5
Change route of "nearby members" page.
2013-03-29 17:28:11 +00:00
Miles Gould
5b6e51273d
Stub out geocoder calls in test environment.
2013-03-29 17:14:55 +00:00
Miles Gould
fed8ce2c17
Allow setting location in members/:id/nearby
...
It currently doesn't actually do anything, but the thought's there.
2013-03-28 12:40:18 +00:00
Miles Gould
9a3badea63
Skeleton "members near me".
2013-03-28 11:51:55 +00:00
Miles Gould
f21df1dbb9
Method to send email notifications.
2013-03-27 11:23:52 +00:00
pozorvlak
37e406d112
Merge pull request #149 from pozorvlak/password-reset
...
Password reset - make emails friendlier and fix blank page
2013-03-27 03:23:10 -07:00
Skud
dcd7df7f47
Made the password reset email friendlier.
...
Also did the same for the unlock instructions, while I was in there.
2013-03-26 19:26:29 +11:00
Skud
7f7db12f9f
added analytics tracking code w/ per-env config
2013-03-26 13:23:35 +11:00
gnattery
ac7b48406b
Members can send each other private messages.
...
Problems:
Notifications controller test fails on redirecting, but seems to work fine in practice
Send Message button doesn't look nice on page
2013-03-25 17:52:50 +11:00
Cesy
045f9bf2a0
Merge pull request #137 from Skud/confirmationwords
...
add more verbiage to confirmation email
2013-03-21 05:12:02 -07:00
Skud
7352d5a8ed
added support/faq page
2013-03-21 22:34:04 +11:00
Skud
e3a33a66cb
add more verbiage to confirmation email
2013-03-20 17:27:42 +11:00
Skud