Taylor Griffin
2c50c3b703
merge in a bunch of (mostly bootstrap 3) changes
2014-08-29 07:14:44 +10:00
Skud
840a5efc4e
Merge remote-tracking branch 'upstream/bootstrap3' into dev
...
Conflicts:
Gemfile.lock
2014-08-28 08:00:10 +10:00
Marlena Compton
38b9207122
remove extra method
2014-08-21 20:11:10 -07:00
Marlena Compton
ec25f2ab91
created list of crop wranglers on the crop wranglers page
2014-08-21 20:11:10 -07:00
Skud
793eecfcb7
Fixed typo
2014-08-22 10:25:40 +10:00
Skud
561b7c45ac
b3ify and improve design of edit profile page
2014-08-11 14:42:00 +10:00
Taylor Griffin
e0d81f5693
improve and abstract auto_suggest api
2014-08-02 22:14:10 +10:00
Taylor Griffin
8a1dd9d171
implement autocomplete for crop name on new planting form
2014-07-26 20:16:22 +10:00
Skud
d558353e4c
Merge branch 'scinames' of github.com:Skud/growstuff into Skud-scinames
...
Conflicts:
CONTRIBUTORS.md
2014-07-22 11:23:08 +10:00
Skud
bac836329c
Merge pull request #376 from Skud/cropbrowse
...
Show most popular crops on "browse crops" page
2014-07-20 19:29:32 +10:00
Skud
a0fc8802b2
Allow selection of crop display order (popularity or alphabetical)
...
Had some trouble with tests; apparently the counter_cache behaves
differently when it starts counting from 0, which meant that some tests
started failing unless you do @crop.reload to refresh the
plantings_count. Weird, but oh well.
2014-07-18 18:37:47 +10:00
Skud
8223025d35
Set default plantings_count to 0 not nil
2014-07-18 18:06:43 +10:00
Skud
573e555bcf
Added unpopular scope to crop
2014-07-18 17:52:11 +10:00
Taylor Griffin
82598e75f8
fix redirect after reset password bug
2014-07-15 22:57:07 +10:00
Taylor Griffin
ded464ad4c
removed call to for debugging
2014-07-13 18:00:46 +10:00
Taylor Griffin
8b45a1759c
got scientific names working on the crop page but view tests are failing
2014-07-13 17:57:55 +10:00
pozorvlak
ec9bd2bd7b
Merge pull request #361 from Skud/crop-map
...
Crop map
2014-07-03 10:44:01 +01:00
Skud
3abaca3136
Tweak what's emitted as JSON
...
(let's just emit plantings for now, as that's all we're using)
2014-06-30 11:48:58 -07:00
Skud
2f8e060b49
added plantings, seeds, and harvests to the crops JSON
2014-06-30 10:56:58 -07:00
Skud
050834734f
Fixed bug with capitalisation of usernames in map popups
2014-06-12 18:49:06 -07:00
Skud
1c34d428f2
Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search
...
Conflicts:
spec/models/crop_spec.rb
2014-04-29 11:16:20 +10:00
Skud
4ce071a0df
Fixed a bug that was deleting crops from the database!
...
Best bug of the night. TIL: don't call delete on an activerecord
collection expecting it to act like an array. D'oh!
2014-01-03 22:47:18 +11:00
Skud
0a3ecdc5ad
Added crop search controller and views
2014-01-03 22:29:44 +11:00
Miles Gould
084bdc4f40
Add friendly URLs to plant parts.
2013-10-31 00:19:48 +00:00
Miles Gould
e9a3c0f4ee
rails g scaffold PlantPart...
...
Also migration to remove the string plant_part.
2013-10-30 23:32:20 +00:00
Skud
0aa0c38f1f
Removed intentional errors accidentally left in when testing better_errors
2013-10-25 12:34:13 +11:00
Miles Gould
afa0dbcfa9
Turn on better_errors in development.
2013-10-18 11:03:57 +01: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
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
9cef31e646
allow per-owner CSV downloads
2013-09-25 16:11:08 +10:00
Skud
92ebf1a43c
Added harvest CSV
2013-09-25 16:02:40 +10:00
Skud
a881ec2250
Merge commit '24255411c9d5907ebb6e8fcb39b6bca1833559d9' into csv
2013-09-25 15:41:47 +10:00
Joseph Caudle
00ef1b03d4
Merge pull request #322 from Skud/harvests
...
Harvests
2013-09-24 16:43:39 -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
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
37383ba451
rails g scaffold Harvest...
2013-09-17 15:39:25 +10: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
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
35f3ee8948
limit things-to-map to those with locations (duh)
2013-09-11 18:20:43 +10:00
Skud
b39df447b6
Merge pull request #307 from Skud/places3
...
Places - finally fixed?
2013-09-10 21:00:54 -07:00
Skud
80b9285727
reinstate @place instance variable for title
2013-09-11 13:19:51 +10:00
Skud
138318e5f4
Moved searching for nearby members into the model
2013-09-11 13:14:52 +10:00
Skud
7d5643e30d
Sort nearby members by distance
...
Also removed distance/units from the places/show search, since you can
adjust nearness by zooming etc.
At this point the "members near here" stuff at the bottom of the page
exists mostly for accessibility and to give additional detail that we
don't currently show in the popups on the map.
So we're not using distance/units to search for members near here
anymore, but instead are just finding the 30 nearest members to the
specified location, and showing them in order of nearness.
2013-09-11 12:41:01 +10:00
Taylor Griffin