Commit Graph

11959 Commits

Author SHA1 Message Date
Skud
97065314f2 Fixed bug in "all test1's seeds" link
and added similar links to plantings and harvests
2013-10-01 12:43:01 +10:00
Skud
294a163918 Removed duplicate edit buttons 2013-10-01 12:37:03 +10:00
Skud
668cb33f15 Added more units for harvests 2013-10-01 12:35:41 +10:00
Skud
233d740df8 Fixed error with blank planting/plant_before dates 2013-10-01 12:21:31 +10:00
pozorvlak
bc6adc8840 Merge pull request #324 from Skud/csv
CSV data dumps
2013-09-27 08:14:12 -07:00
Skud
c23f27e8b0 Added CSV for seeds 2013-09-25 17:15:42 +10:00
Skud
9a48edc187 Fixed erroneous date 2013-09-25 17:12:58 +10:00
Skud
9cf770a200 Adjusted crops.rss to show most recent 2013-09-25 16:59:28 +10:00
Skud
013234c882 Added CSV for plantings 2013-09-25 16:57:27 +10:00
Skud
0116547c96 added links to CSV and JSON data 2013-09-25 16:23:58 +10:00
Skud
9cef31e646 allow per-owner CSV downloads 2013-09-25 16:11:08 +10:00
Skud
c452d38717 If quantity == 0, set it to nil 2013-09-25 16:07:22 +10:00
Skud
92ebf1a43c Added harvest CSV 2013-09-25 16:02:40 +10:00
Skud
1202a48131 Tweaked crop CSV to include added_by and license 2013-09-25 15:51:04 +10:00
Skud
a881ec2250 Merge commit '24255411c9d5907ebb6e8fcb39b6bca1833559d9' into csv 2013-09-25 15:41:47 +10:00
Skud
c5e8e4298f Separated informal/human units from measured weights 2013-09-25 15:39:17 +10:00
Joseph Caudle
00ef1b03d4 Merge pull request #322 from Skud/harvests
Harvests
2013-09-24 16:43:39 -07:00
Skud
4ba7a3a48e added harvest link to signed-in homepage 2013-09-23 10:03:22 +10:00
Skud
c3c3c435d5 improve display of quantities 2013-09-23 10:03:08 +10:00
Skud
78ee229205 Merge pull request #321 from Growstuff/dev
Production push: order referral codes and some CSS fixes
2013-09-19
2013-09-18 18:23:22 -07:00
Skud
9af9d2ac04 Merge pull request #320 from Skud/order_referral_code
Order referral code
2013-09-18 18:16:00 -07:00
Skud
2ee11e19e5 removed spurious puts 2013-09-19 10:57:11 +10:00
Skud
e425a3f7f4 added error message if your referral code has invalid chars 2013-09-19 10:57:00 +10:00
Skud
9667f43874 Added friendly urls to harvests 2013-09-17 18:02:48 +10:00
Skud
c63fc97736 Validate quantity/unit for harvests
If quantity is blank, we also set unit to blank.
2013-09-17 17:56:00 +10:00
Skud
40ce4ab77b Validate units (must be one of individual/bunches/kg/lb)
Also changed "units" attribute to "unit". Oops, we weren't following the
Rails naming convention.
2013-09-17 17:26:18 +10:00
Skud
ebf6034659 Prettified all the harvest views 2013-09-17 17:09:17 +10:00
Skud
ccb0e42c95 Prettified harvest form
Also renamed "notes" to "description" in database
2013-09-17 16:08:41 +10:00
Skud
67b88e8e18 set cancan abilities for harvests 2013-09-17 15:53:51 +10:00
Skud
2196bc8373 Added associations between harvests, crops, and members 2013-09-17 15:51:30 +10:00
Skud
37383ba451 rails g scaffold Harvest... 2013-09-17 15:39:25 +10:00
Skud
3d42e4bce9 Merge pull request #319 from Skud/css-fixes
Css fixes
2013-09-16 17:55:17 -07:00
Skud
4e03e5abbd Merge pull request #318 from Skud/order_referral_code
Order referral code
2013-09-16 00:15:50 -07:00
Skud
24255411c9 added dates created/modified to crops csv 2013-09-16 17:04:39 +10:00
Skud
d014343667 A basic implementation of a CSV dump for crops 2013-09-16 15:33:34 +10:00
Skud
9e374779c0 Fixed navbar display CSS
1) Made sure padding is applied to the body *only* for the larger screen
sizes (by doing so before the responsive CSS is loaded)

2) Fixed indentation on the footer, which was incorrectly putting it
inside the main body container, and thus making it do this weird
narrowing thing at smaller screen sizes.
2013-09-16 11:09:52 +10:00
Skud
df3254135f Made li list style dots more specific
We set all li elements to use list-style disc, but it was affecting our
navbar.  Changed it to use a specific class in the crop hierarchy (where
we actually cared about it).
2013-09-16 10:49:02 +10:00
Skud
ab588bd21b add referral code to order admin table 2013-09-16 10:39:12 +10:00
Skud
a250bc162f Fixed up db/schema to remove spurious payments table 2013-09-16 10:22:42 +10:00
Skud
fef92f0d14 Added tests for admin order controller 2013-09-13 14:19:46 +10:00
Skud
faea1904c2 Added referral code search to admin forms 2013-09-13 13:47:46 +10:00
Skud
1adcedb534 moved admin order search into a model method 2013-09-13 13:38:11 +10:00
Skud
0ce821aacf added referral_code to order form/checkout code 2013-09-13 13:12:11 +10:00
Skud
2422182aa8 Added referral_code to Order
Also added validation (alphanumeric), but we're fairly lax about
whitespace and case, and clean up for them if they make minor errors.
2013-09-13 12:14:17 +10:00
Skud
065005395f Merge pull request #317 from Skud/crop-hierarchy-caching
Hotfix: Added caching of full crop hierarchy
2013-09-12 18:30:36 -07:00
Skud
950a333ac7 Merge pull request #316 from Skud/crop-hierarchy-caching
Added caching of full crop hierarchy
2013-09-12 18:30:15 -07:00
Skud
8994b5f5fc Added caching of full crop hierarchy
... as that page is really slow to load at present.
2013-09-13 11:24:03 +10:00
Skud
22cb6d2ad5 Merge pull request #315 from Skud/one-more-places-fix
(hotfix) Removed deploy script reminders, as no longer necessary
2013-09-12
2013-09-12 05:07:21 -07:00
Skud
dbe542f3d2 Merge pull request #314 from Skud/one-more-places-fix
Removed deploy script reminders, as no longer necessary
2013-09-12 05:06:32 -07:00
Skud
c64499881d Removed deploy script reminders, as no longer necessary 2013-09-12 22:05:35 +10:00