Mackenzie
271d178cc8
Merge pull request #1 from Skud/maco-harvestphotos
...
Delete unused photos
2014-10-01 20:14:23 -04:00
Skud
9a9eeecb46
Removing tests for migrations
...
These were never run anyway (they don't have _spec.rb in their names)
and were obviously written when we had no idea what we were doing.
They're full of syntax errors and all sorts of stuff that just won't
work. The best thing is to remove them so they don't confuse people!
2014-10-02 10:09:21 +10:00
pozorvlak
41a4de7e74
Merge pull request #422 from Skud/crophierarchycache
...
Clear crop hierarchy view cache after uploading crops
2014-09-30 17:43:06 +01:00
Skud
8497782847
Clear crop hierarchy view cache after uploading crops
...
The crop_sweeper only acts in response to things that happen in the
controller. Since this works directly with the model, we need to clear
the cache fragment manually.
2014-09-30 23:02:09 +10:00
Skud
97699e5e6a
Removed feature test that doesn't really test anything featurelike
2014-09-30 22:38:24 +10:00
Skud
98da785d8a
Removed spurious debugging puts
2014-09-30 22:37:58 +10:00
Skud
e2571e9261
Replaced ENV vars with site_name
2014-09-30 22:37:19 +10:00
Skud
65c46c334b
Delete unused photos
...
Make sure the models are setup so that if a photo is not used for
anything, it's removed from the system.
Also wrote a rake task (which should be run on deploy) to remove older
unused photos.
2014-09-29 09:18:28 +10:00
pozorvlak
dbfa080609
Merge pull request #421 from tygriffin/customize-generators
...
stop generating helpers, constroller specs, view specs, and javascripts
2014-09-28 23:06:41 +01:00
Taylor Griffin
aebd9e1d4e
remove a file that accidentally found its way in from another unrelated branch
2014-09-28 22:03:50 +10:00
Taylor Griffin
87b6780220
stop generating helpers, constroller specs, view specs, and javascripts
2014-09-28 21:57:05 +10:00
Taylor Griffin
a7da4b9ce4
no longer necessary to pass locale quuery param in every url
2014-09-28 21:38:28 +10:00
Taylor Griffin
f9dc17c587
no longer raise exception on missing g translation in dev / test envs
2014-09-28 21:34:26 +10:00
Taylor Griffin
d10a62d336
set locale from subdomain
2014-09-28 21:32:15 +10:00
pozorvlak
a34a54d995
Merge pull request #419 from Skud/tomatoes
...
Upload tomato varieties to crop database
2014-09-28 11:22:44 +01:00
Skud
baeb5d3525
Remove old planting reminder sending stuff
2014-09-28 16:03:58 +10:00
Skud
05400a081f
tiny bit of whitespace cleanup
2014-09-28 16:02:02 +10:00
Skud
d8b75eaa66
Fixed up db migration and tests for planting reminders
2014-09-28 15:55:55 +10:00
Skud
4a62add88e
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
spec/models/planting_spec.rb
2014-09-28 15:32:53 +10:00
Skud
529c98f5dc
Move actual sending of planting reminder to rake task
2014-09-28 15:28:53 +10:00
Skud
e011b54cba
Nicer phrasing for the no-plantings use case
2014-09-28 14:35:54 +10:00
Skud
1b1f1d33e0
Add planting reminder checkbox to email settings
2014-09-28 14:35:32 +10:00
Skud
25abcdc923
Upload tomato varieties to crop database
2014-09-28 13:50:55 +10:00
pozorvlak
126cb1d191
Merge pull request #418 from wsmoak/dev
...
Renamed gardens.rb to gardens_spec.rb so that these tests will run.
2014-09-26 20:12:39 +01:00
Wendy Smoak
8ab4f885f1
Renamed gardens.rb to gardens_spec.rb so that these tests will run.
2014-09-26 10:32:06 -04:00
Taylor Griffin
984503480f
remove necessity to add locale to url if current locale is English
2014-09-25 07:00:11 +10:00
Taylor Griffin
5e48c4392a
move site name into localization
2014-09-24 18:29:59 +10:00
Taylor Griffin
d462254021
add missing translation
2014-09-21 10:26:30 +10:00
Taylor Griffin
1acba65a8b
clean up haml a bit
2014-09-21 10:22:46 +10:00
Taylor Griffin
8f14ffe560
catch up with dev
2014-09-20 23:01:35 +10:00
Taylor Griffin
93cd067fff
add two contributors
2014-09-20 21:59:05 +10:00
Taylor Griffin
e3a6742574
add sample japanese locale file to test changing languages
2014-09-20 21:56:14 +10:00
Taylor Griffin
659a68cf39
remove missing translations spec in favor of running dedicated task
2014-09-20 21:49:30 +10:00
Taylor Griffin
e3f590ede5
abstract strings in home views into locale file
2014-09-20 21:47:18 +10:00
pozorvlak
6efeb04449
Merge pull request #416 from oshiho3/bugfix_markdown
...
updated regex for crop in markdown
2014-09-19 23:45:16 +01:00
pozorvlak
52b4e27d8c
Merge pull request #415 from oshiho3/bugfix_plantphoto
...
added planting_id param to Flickr set search (new_photo_path form).
2014-09-19 16:42:49 +01:00
Shiho Takagi
60354264d6
Included PT bug# to its test description. Test using the case from the bug
2014-09-19 16:00:25 +10:00
Shiho Takagi
87643c3d1a
Merge branch 'bugfix_plantphoto' of https://github.com/oshiho3/growstuff into bugfix_plantphoto
2014-09-19 15:33:35 +10:00
Shiho Takagi
aa028db2dc
added planting_id param to Flickr set search (new_photo_path form).
2014-09-19 15:29:12 +10:00
Taylor Griffin
983fa8ede0
abstract strings out of blurb partial
2014-09-19 07:29:04 +10:00
Taylor Griffin
16f4d2f80e
fix spec to check href with newly added locale query param
2014-09-19 07:17:08 +10:00
Shiho Takagi
dd75f2aef9
updated regex for crop in markdown
2014-09-18 14:18:18 +10:00
Taylor Griffin
f8ee9d0589
don't scope routes to locale to make url prettier because it breaks tests like whoa
2014-09-18 07:14:35 +10:00
Taylor Griffin
87df8661c7
raise exception on missing translations in test and dev environment
2014-09-18 06:24:59 +10:00
Taylor Griffin
f355c393f0
basic setup
2014-09-18 06:15:59 +10:00
Shiho Takagi
eeb2bf9938
added planting_id param to Flickr set search (new_photo_path form).
2014-09-17 21:38:43 +10:00
Skud
3cf2a50a34
modified Planting.interesting to have some options re: howmany and photos
2014-09-12 13:20:41 +10:00
Skud
09bef3f9d8
Added options for if you didn't plant/harvest anything
2014-09-12 12:30:27 +10:00
Skud
2bbccfc44d
Added tests for planting reminder email
2014-09-12 12:30:04 +10:00
Skud
00f58511ac
Merge pull request #414 from Growstuff/dev
...
Production push: finished plantings, crowdfunding banner, etc
2014-09-12 10:13:44 +10:00
Mackenzie