Commit Graph

11959 Commits

Author SHA1 Message Date
Skud
fbeafd4299 Improving test coverage for gardens 2014-08-30 11:28:52 +10:00
Skud
4ebc184188 Add finished planting data (and buttons) to plantings index
I also removed description from the table as it was getting way too full
2014-08-30 11:11:19 +10:00
Skud
46e20f0562 Add finished planting data (and buttons) to plantings index 2014-08-30 11:04:31 +10:00
Skud
af2d0e22ee Automatically set plantings to finished when a garden is marked inactive 2014-08-30 10:51:33 +10:00
Skud
170d6b474e Updated garden page with "finished" plantings
Also added a similar "mark as inactive" button for the garden itself
and rearranged some things on the page.
2014-08-30 10:42:16 +10:00
Taylor Griffin
480e67bf2f add default id to hidden input in auto suggest view helper to make edit work 2014-08-30 10:20:29 +10:00
Skud
facba15154 Added a button on the planting details page to mark as finished 2014-08-30 10:14:11 +10:00
Skud
9f9ef10b6a Added finished fields to planting form and display 2014-08-30 09:52:26 +10:00
Skud
e7dd50c3f1 Added scopes for finished and current plantings 2014-08-30 09:28:02 +10:00
Skud
b07d9d8db0 Added finished fields for plantings 2014-08-30 09:27:41 +10:00
Skud
40c7124769 Merge pull request #379 from tygriffin/crop-suggest
Crop suggest
2014-08-29 11:35:25 +10:00
Skud
19a0a914c5 Merge pull request #393 from Skud/moreb3
A few bootstrap3 tweaks
2014-08-29 10:44:55 +10:00
Skud
8a5d1f2e5e Fixed crop wrangler tests to not be order dependent 2014-08-29 10:38:35 +10:00
Skud
30d436cb5d Fixed inline form on places page to make it b3-ish 2014-08-29 10:19:37 +10:00
Skud
e3627f6dcd Fixed devise forms to make them b3ish and pretty 2014-08-29 10:02:56 +10:00
Taylor Griffin
3beae6f500 add request crop link to seeds 2014-08-29 08:43:02 +10:00
Taylor Griffin
83d3c369c2 style noscript warning 2014-08-29 08:42:43 +10:00
Taylor Griffin
7fa05d81e9 fix tests to match new implementation of of auto_suggest 2014-08-29 07:38:55 +10:00
Taylor Griffin
d8c7aba725 pass options hash into auto_suggest helper to allow setting class 2014-08-29 07:31:32 +10:00
Taylor Griffin
6bb74039a7 fix slug bug 2014-08-29 07:31:02 +10:00
Taylor Griffin
2c50c3b703 merge in a bunch of (mostly bootstrap 3) changes 2014-08-29 07:14:44 +10:00
Taylor Griffin
550cb4b265 put validation in the correct place this time 2014-08-29 06:56:02 +10:00
Taylor Griffin
62e1c3bb93 add server side validation 2014-08-29 06:45:37 +10:00
Taylor Griffin
cd6fc7e804 add noscript tag 2014-08-29 06:45:11 +10:00
Taylor Griffin
4e0d62b28d remove client side validation 2014-08-29 06:44:48 +10:00
Skud
028e1194e5 Merge pull request #392 from Skud/moreb3
changed layout of planting list on homepage
2014-08-28 12:10:42 +10:00
Skud
55c2fceffb changed layout of planting list on homepage
... as b3 seems to have more gutter space between columns
2014-08-28 12:09:43 +10:00
Skud
698a13ef70 Merge pull request #391 from Skud/moreb3
Tweak formatting of images with popovers (used mostly on homepage)
2014-08-28 12:01:24 +10:00
Skud
848b583d94 Tweak formatting of images with popovers (used mostly on homepage) 2014-08-28 11:46:36 +10:00
Skud
b260169d2d Merge pull request #389 from Growstuff/bootstrap3
Bootstrap3
2014-08-28 11:15:53 +10:00
Skud
d6e957e2fb Merge pull request #390 from Skud/cropwranglertests
Switch to match_array to get around spuriously failing tests
2014-08-28 10:44:36 +10:00
Skud
c68b029d50 Switch to match_array to get around spuriously failing tests 2014-08-28 10:16:31 +10:00
Skud
a3220653cf Merge branch 'dev' into bootstrap3 2014-08-28 08:00:48 +10:00
Skud
840a5efc4e Merge remote-tracking branch 'upstream/bootstrap3' into dev
Conflicts:
	Gemfile.lock
2014-08-28 08:00:10 +10:00
pozorvlak
5add85cd7c Merge pull request #387 from Skud/contact-twitter
Fixed contact page error
2014-08-27 19:52:22 +01:00
pozorvlak
ea31d89bd0 Merge pull request #385 from Skud/b3forms
Fixed various forms to be bootstrap3-ified
2014-08-27 14:17:27 +01:00
Skud
e5b15fae1a got rid of ugly scaffolding 'back' links 2014-08-27 19:02:49 +10:00
Skud
501fda3fc9 b3ified a few of the lesser-used forms 2014-08-27 19:02:06 +10:00
Skud
f6c2873f97 Add page content test suggested by tygriffin 2014-08-27 18:43:44 +10:00
Skud
1103e2719f Fixed up label with link to field it relates to 2014-08-27 18:42:42 +10:00
Skud
a5c2c0bb5c Fixed twitter link on contact page 2014-08-25 13:41:15 +10:00
Skud
03ecb7e238 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2014-08-25 09:30:46 +10:00
Taylor Griffin
2a51f66d88 fix seed view tests 2014-08-24 12:11:10 +10:00
Taylor Griffin
fd651de7ea implement auto suggest on new seed page 2014-08-24 12:02:53 +10:00
Taylor Griffin
d038ac6d8a test that input value is not affected by auto suggest 2014-08-24 10:53:24 +10:00
Skud
b91bab117f Merge pull request #383 from Marlena/pg_crop_wranglers
created list of crop wranglers on the crop wranglers page
2014-08-22 14:50:52 +10:00
Skud
1250206c5e Ongoing coverage improvements 2014-08-22 14:44:00 +10:00
Skud
9c5f7753ca Show coverage locally and send to coveralls 2014-08-22 14:09:12 +10:00
Marlena Compton
36199054c0 changed method so that you can now call crop_wranglers and admins. meta-programming ftw 2014-08-21 20:11:10 -07:00
Marlena Compton
13e015b441 fixed role factory to not create extra roles when new members 2014-08-21 20:11:10 -07:00