mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-09 16:47:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

4522 Commits

Author SHA1 Message Date
Taylor Griffin
aaf08469e6 add date when planting is marked finished from planting show page 2014-10-12 23:14:02 +11:00
Taylor Griffin
d1e0bdb534 toggling planting finished clears the finished at field or populates it with a cached value 2014-10-12 09:53:09 +11:00
Shiho Takagi
cf07ecfa4a improved test spec, crop page and added rake task 2014-10-05 23:16:46 +11:00
Shiho Takagi
6e02f40e0a merging from dev 2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
Mackenzie Morgan
a2f2508f0d don't lose the thing we're attaching the photo to when we change sets. This is a modification of oshiho3's previous fix. 2014-10-02 09:38:02 -04:00
Skud
a5b856b506 Merge pull request #410 from maco/dev 
Harvest photos
 2014-10-02 17:45:59 +10:00
Mackenzie Morgan
48ad561b76 convert tabs to spaces 2014-10-01 23:58:54 -04:00
Mackenzie Morgan
fcda8742d8 go back to the nested error handling in the photos controller and add a migration for indexing harvests_photos 2014-10-01 22:52:52 -04:00
Mackenzie Morgan
57abfa04b3 fix whitespace 2014-10-01 21:46:15 -04:00
Mackenzie Morgan
51d8b2d475 Merge branch 'dev' of github.com:maco/growstuff into dev 2014-10-01 20:17:23 -04:00
Mackenzie Morgan
a29d11a07c refactor error handling on photo upload to be easier to read 2014-10-01 20:17:11 -04: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
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
d10a62d336 set locale from subdomain 2014-09-28 21:32:15 +10: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
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
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
e3f590ede5 abstract strings in home views into locale file 2014-09-20 21:47:18 +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
Taylor Griffin
f355c393f0 basic setup 2014-09-18 06:15:59 +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
46eaf37437 Fixed mailing list link to point to Talk instead 2014-09-12 09:10:13 +10:00
Skud
29d43f4e5b Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished2 2014-09-12 08:40:57 +10:00
Skud
374987488f Fixed broken tests. 2014-09-12 08:30:44 +10:00
Skud
fa9c029493 added sitewide crowdfunding banner 2014-09-12 08:10:58 +10:00
Skud
85b5ac12ca added validation for finished_at (must be after planted_at) 2014-09-12 07:50:25 +10:00
Skud
03235f3952 Add warning about plantings being marked as finished 2014-09-12 07:43:41 +10:00
Mackenzie Morgan
550f3c5326 removing unneeded photo-related files 2014-09-09 22:18:43 -04:00
Mackenzie Morgan
ed537e583b whitespace fixes and um oops no there shouldn't be a secret key in that config file 2014-09-09 20:31:14 -04:00
Mackenzie Morgan
2b7b5bad63 including all the new files needed for harvest photos, this time 2014-09-09 20:21:16 -04:00
Mackenzie Morgan
512ccdbaa2 merging the schema changes from finished plantings and making the timestamp newer, then making the styling on harvest photos match the new styling (no li) on planting photos 2014-09-09 20:19:25 -04:00
Mackenzie Morgan
7d54ab347f Adding photo functionality to harvests 2014-09-09 19:55:40 -04:00
Skud
9d5c15a7da Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished 
Conflicts:
	spec/features/plantings/planting_a_crop_spec.rb
 2014-09-10 09:12:27 +10:00
Taylor Griffin
138904bd82 write regression test for creating plantings, harvests and seeds form crop page 2014-09-09 21:52:50 +10:00
Taylor Griffin
00b24890f4 accept a default value in options hash of autosuggest helper 2014-09-09 21:27:21 +10:00
catfriend
4caf7b9b28 added placeholder text per 78178814 2014-09-05 15:30:34 -07:00