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
Skud
1da6c83fa1
Showing plantings on crops page. Ugly for now, but works.
2013-01-17 15:35:30 +11:00
Skud
c1c218a2f3
Removed 20 random plantings
2013-01-17 15:22:30 +11:00
Skud
a0b74562f5
remote "Note" about random selection of crops
2013-01-17 15:16:38 +11:00
Skud
501cad39f9
Plantings now show up on members and gardens pages
2013-01-17 15:12:37 +11:00
pozorvlak
c07e27df14
Merge pull request #88 from jcaudle/fix-redirect-spec
...
#41633207 - Fix redirect spec
2013-01-15 15:41:13 -08:00
Joseph Caudle
fd54fe8ffe
Configure application to have UTC as default timezone
...
This commit sets the default timezone for the app as UTC for both Time
methods and for ActiveRecord. It also removes an unecessary pair of
parentheses attached to a call to `Time.now` which did not match the
style throughout the rest of the project.
[#41633207 ]
2013-01-14 22:17:36 -05:00
Joseph Caudle
a6cf755cb6
Add debugger gem
...
In order to facilitate future debugging, we are adding the debugger gem
to the project. As this is in the Gemfile generated by Rails, all that
was required to add it was uncomment the line in question and run
bundler.
[#41633207 ]
2013-01-14 22:15:16 -05:00
pozorvlak
d00b5febe8
Merge pull request #87 from Skud/user2member
...
Rename "user" to "member" throughout codebase
2013-01-13 17:12:03 -08:00
pozorvlak
aaeb5641e7
Merge pull request #85 from Skud/fg2
...
Moar factory girl
2013-01-13 13:41:47 -08:00
Skud
47719709ad
Remove broken migrations
...
It seems these should never have been migrations in the first place.
It's considered an anti-pattern to include model code in your migrations
(these referred to User and Update), and we can see why -- having
renamed the models, these migrations now fail.
Apparently the Right Thing is to write a rake task to do the work in
question, and then run it via whatever deployment mechanism you use.
Since these have already been run on our dev server, and they're not all
that important anyway (i.e. won't break people's local machines they're
developing on, etc), and on top of all that they're a couple of months
old so most active developers should have run them already... as I was
saying, considering all that, I'm just blowing them away.
2013-01-13 11:49:58 +00:00
Skud
7abe7167d3
Fixed reference to User in db/seeds.rb
2013-01-13 11:33:16 +00:00
Skud
4dec806589
FGified the login_member method
2013-01-13 21:46:46 +11:00
Skud
c4cac871d5
Fixed up tests for garden display
...
These were just wrong wrongety wrong. I think they were from before we
were auto-creating a garden for new members. Fixed now.
2013-01-13 21:43:20 +11:00
