gnattery
6da3e4fae5
Added associations and tested them
2013-02-06 15:20:44 +11:00
gnattery
3cff543184
rails g scaffold Comment
2013-02-06 14:49:49 +11:00
pozorvlak
7beaf4afa4
Merge pull request #102 from Skud/nomemberjson
...
No member json
2013-02-05 03:44:55 -08:00
Skud
e41293c121
fixed placement of curly braces. tests now pass.
2013-02-05 22:30:28 +11:00
Skud
1ccaab3085
Don't allow members to be accessible with JSON
...
One of the tests is failing and I can't for the life of me figure out
why. Everything looks fine when I try it with curl from the command
line. Hmm.
2013-02-02 23:37:24 +11:00
pozorvlak
2f2ec81345
Merge pull request #101 from Skud/spike-cancan
...
Controller security
2013-02-01 04:33:58 -08:00
Skud
58e5d04d50
controller tests for plantings now pass
2013-02-01 22:55:48 +11:00
Skud
302a32c768
that can? check was superflous; controller does it for us.
2013-02-01 22:03:05 +11:00
Skud
75e8ea1119
I'd rather not use Member.new
2013-02-01 13:37:33 +11:00
Skud
21960a5494
Tried to get controller tests passing.
...
All are fine except for plantings. I'm pretty sure hte problem is to do
with these two lines in app/model/ability.rb
can :update, Planting, :garden => { :owner_id => member.id }
can :destroy, Planting, :garden => { :owner_id => member.id }
I'm pretty sure that's the right syntax (according to
https://github.com/ryanb/cancan/wiki/Defining-Abilities ) but since it's
the update and delete actions that are failing, I guess I must have it
wrong somehow. Any hints?
2013-02-01 13:25:06 +11:00
Skud
87f14247e0
modified views to use CanCan
2013-02-01 13:24:32 +11:00
Skud
2d6f1ae210
redirect to previous page if available
2013-02-01 11:29:14 +11:00
Skud
3697c28a00
Added more informative error message.
2013-02-01 11:23:54 +11:00
Skud
cd469264bd
this seems to mostly work
2013-02-01 11:21:13 +11:00
Skud
ed2e73832d
sorta kinda works, but login/homepage are b0rked
2013-02-01 11:10:12 +11:00
Skud
f25729ce3b
First cut of a set of permissions
2013-02-01 10:41:38 +11:00
Skud
ea8f30bd8d
tweaked cancan defaults (we don't have current_user)
2013-02-01 10:25:54 +11:00
Skud
71760a4369
added cancan gem
2013-02-01 10:24:37 +11:00
pozorvlak
d442e3fcce
Merge pull request #98 from Skud/mobile-homepage
...
Fixed the homepage so it doesn't look messy on phones.
2013-01-29 05:39:13 -08:00
pozorvlak
4a18710fe8
Merge pull request #99 from sauramaia/prettify-login
...
Prettify login
2013-01-29 05:35:27 -08:00
pozorvlak
ce9e4b2e8d
Merge pull request #100 from sabreuse/plantings-rss
...
Plantings rss
2013-01-29 05:14:08 -08:00
Amy
99540d63b4
Add RSS feed for plantings
2013-01-28 20:23:03 -05:00
Amy
887d9c03f7
Specify recent version of rspec-rails
2013-01-28 19:34:55 -05:00
Amy
0d84f0dde1
Added recent_plantings variable
...
Wrote tests for recent_plantings, recent_posts, new_crops
2013-01-28 19:30:23 -05:00
Maia Sauren
5d362a8882
made login page look like the signup page
2013-01-28 22:01:07 +11:00
Skud
836dcff67e
Fixed the homepage so it doesn't look messy on phones.
...
Basically the "hero unit" was rendering horribly on very small screens
(eg. phones). I've made it so that the hero unit is only shown on
"desktop" and "tablet" devices, not "phone".
I also moved the actual content of the hero-unit out into a partial to
avoid repeating myself.
2013-01-28 21:07:03 +11:00
Maia Sauren
b1a912c4e0
added .DS_Store to gitignore
2013-01-28 20:53:50 +11:00
Skud
ca4e632870
Merge pull request #97 from Skud/planting-defaults
...
Planting defaults
2013-01-28 01:43:11 -08:00
Skud
6113be1e69
sorting gardens alphabetically, so behaviour is clearer
2013-01-28 18:19:59 +11:00
Skud
c5547041e0
added test for remembering the right crop/garden
2013-01-28 17:59:39 +11:00
Skud
5c804650b6
this fixes #43277457 - reversion of crop and garden
2013-01-27 23:33:30 +11:00
pozorvlak
c89e8b0828
Merge pull request #96 from Skud/fix-responsive
...
Fixed responsive HTML by removing duplicate JS
2013-01-26 03:57:36 -08:00
Skud
4003234e3e
Fixed responsive HTML by removing duplicate JS
2013-01-26 21:43:57 +11:00
Skud
3fcd17533f
Merge pull request #94 from pozorvlak/alphabet
...
Sort crops case-insensitively in the plantings form.
2013-01-25 16:02:09 -08:00
Miles Gould
5be099bb64
Remove crop-ordering code from the Plantings form.
2013-01-25 11:21:32 +00:00
Miles Gould
dc1ab0912f
Order crops case-insensitively by default.
2013-01-25 11:19:15 +00:00
Miles Gould
8d2fe8809d
Add an uppercase crop factory.
...
Use it to test that crops are sorted alphabetically in the plantings
form.
2013-01-25 11:12:44 +00:00
Miles Gould
9ebbeb125d
Sort crops case-insensitively in the plantings form.
2013-01-25 00:16:50 +00:00
Skud
4448468ee7
fixed problems with tab display on member profile
2013-01-20 21:46:53 +11:00
pozorvlak
73d1eb0879
Merge pull request #89 from Skud/planting-links
...
Planting links
2013-01-18 13:06:57 -08:00
pozorvlak
e7a735185e
Merge pull request #91 from gnattery/friendly-plantings
...
Friendly plantings
2013-01-18 13:06:09 -08:00
pozorvlak
956486f1ab
Merge pull request #90 from gnattery/garden-description
...
Garden description
2013-01-18 12:59:42 -08:00
gnattery
9f788ba8df
added friendly IDs for plantings, and tests
2013-01-18 16:06:20 +11:00
gnattery
72f38118d9
Slight tweak to garden slug tests
2013-01-18 15:39:10 +11:00
gnattery
dea5d2399c
Migration for planting slugs
2013-01-18 15:37:36 +11:00
Skud
9e4e1746e1
Link to the planting, not the crop.
...
Also, a subheading for the gardens page.
2013-01-18 15:14:40 +11:00
gnattery
d1e3f8ce32
Added description field to gardens
2013-01-18 15:11:11 +11:00
Skud
46dd7ed346
Display thumbnail inside a .well, optionally hide description
2013-01-18 14:04:45 +11:00
Skud
54965654bd
Small refactoring: use the date format we made
2013-01-18 13:42:20 +11:00
Skud
1503cbddad
Plantings show on members, gardens, and crops pages
...
Created a thumbnail to standardise the display. It's not pretty but it
has the basic info.
2013-01-18 13:40:30 +11:00
