mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-03 21:57:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 63 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud
817663bdaf Merge branch 'dev' of https://github.com/Growstuff/growstuff into regularemail 
Conflicts:
	db/schema.rb
 2014-07-20 19:30:20 +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
846a2c89c5 Tweaked FactoryGirl to use create_list 2014-07-20 19:29:06 +10:00
Skud
f67732e125 Added checkbox for whether to send planting reminder 2014-07-20 19:17:59 +10:00
Skud
7c09188bb8 Renamed email to planting_reminder 2014-07-20 18:54:58 +10:00
Skud
f4c2c2481d Include plantings/harvests in regular email 2014-07-20 18:45:48 +10:00
Skud
a7d56d4f92 Added stub code for sending regular (eg. weekly) emails 2014-07-20 17:39:27 +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
aeb14021f3 Removed unpopular scope (guess it really was unpopular) 2014-07-18 18:17:37 +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
Skud
c9857bf1c8 popular scope for crops 2014-07-18 17:38:15 +10:00
Skud
6c048dec77 Merge pull request #371 from tygriffin/dev 
Fix for bug when redirecting after password reset
 2014-07-18 17:30:14 +10:00
Skud
7184a0d5d5 Added scientific name field tests for edit form 2014-07-18 17:29:10 +10:00
Skud
e63b2fb472 Set up sci names in spec file so fields are shown 2014-07-18 17:27:25 +10:00
Skud
e412184737 Merge pull request #374 from Growstuff/dev 
Production push: crop map, crop images, case insensitive search, navbar tweaks
 2014-07-18 17:00:51 +10:00
Skud
6cbe194615 Merge pull request #373 from Skud/brandfix 
Make centering specific to footer
 2014-07-18 16:47:39 +10:00
Skud
48bc019419 Make centering specific to footer 2014-07-18 16:45:42 +10:00
Skud
aeba4acf0d Merge pull request #372 from Skud/brandfix 
fixed broken brand link in navbar
 2014-07-18 16:34:59 +10:00
Skud
90c43336ca fixed broken brand link in navbar 
the "float:none" was causing trouble; removing it doesn't seem to change
the display at all.
 2014-07-18 16:34:07 +10:00
Taylor Griffin
82598e75f8 fix redirect after reset password bug 2014-07-15 22:57:07 +10:00
Skud
7ef6942694 Merge pull request #370 from sabreuse/bootstrap3 
Initial Bootstrap3 push
 2014-07-15 12:59:44 +10:00
Amy Hendrix
863f1dfae7 Update planting form 2014-07-14 22:19:07 -04:00
Taylor Griffin
3509b6e403 Merge branch 'master' of https://github.com/Growstuff/growstuff into dev 2014-07-15 11:52:00 +10:00
Amy Hendrix
8da3430852 override some thumbnail styles 2014-07-14 21:42:44 -04:00
Amy Hendrix
98cbac8a70 Remove an extra class on member thumbs 2014-07-14 21:18:15 -04:00
Amy Hendrix
81a996b8cc New markup for thumbnails 2014-07-14 20:50:35 -04:00
Amy Hendrix
8004632b41 Thumbnail style on individual planting page 2014-07-14 20:39:40 -04:00
Amy Hendrix
48d3488b2d B3 thumbnails for crops 2014-07-14 00:06:40 -04:00
Amy Hendrix
e93d4df3c0 Responsive thumbnails for members 2014-07-14 00:02:53 -04:00
Amy Hendrix
6503b2ec7c Turn off caching in dev 2014-07-13 23:54:37 -04:00
Amy Hendrix
d910b5629a Make thumbnail avatar responsive 2014-07-13 22:39:58 -04:00
Amy Hendrix
2fbd596811 Hidden class (not visible), to disable jumbotron class on home 2014-07-13 22:25:21 -04:00
Amy Hendrix
005a31c880 Use a hidden class for phones only, rather than multiple visible classes, on member block 2014-07-13 22:19:57 -04:00
Skud
0fd10643ce Merge pull request #369 from sabreuse/dev 
Fix an issue with menu item layout at small screen sizes
 2014-07-14 12:00:59 +10:00
Amy Hendrix
4be08e261a Merge branch 'dev' into bootstrap3 2014-07-13 21:55:43 -04:00
Amy Hendrix
10af60f30d Cleanup crops.js.erb 2014-07-13 21:46:33 -04:00
Amy Hendrix
191363402a Replace crops.js.erb 2014-07-13 21:45:19 -04:00
Amy Hendrix
0714c2a38c Menu items should be block, not inline-block, at mobile screen sizes 2014-07-13 21:30:08 -04:00
Amy Hendrix
bf1821f8ce Force bootstrap overrides into sync with upstream/dev 2014-07-13 21:26:07 -04:00
Amy Hendrix
c2435cfb8a catch up with upstream 2014-07-13 21:08:44 -04:00
Amy Hendrix
db9ef0bc83 Full-width form elements 2014-07-13 20:28:20 -04:00
Amy Hendrix
b374beae35 Tweaks for bottom navbar 2014-07-13 20:20:58 -04:00
Amy Hendrix
fdd3951ed7 Green is the primary brand color 2014-07-13 20:13:44 -04:00
Amy Hendrix
84f6635679 Continue cleaning up header styling 2014-07-13 20:07:42 -04:00
Amy Hendrix
27062d2537 Button group styling for homepage plant/harvest/etc actions 2014-07-13 20:07:20 -04:00
Amy Hendrix
0263e361c5 Update footer markup to use bootstrap3 navbar classes 2014-07-13 20:06:31 -04:00
Amy Hendrix
17c822f6f3 Unitless line-height 2014-07-13 19:44:21 -04:00
Amy Hendrix
4728de5dd8 Clean up header markup for Bootstrap 3 2014-07-13 19:27:06 -04:00
Amy Hendrix
4436562dec Bootstrap3: fix vars for nav & dropdowns 2014-07-13 19:05:51 -04:00