mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-29 20:25:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,696 Commits 54 Branches 76 Tags
e3627f6dcd84cdffab2ebcb3dcb1a148fd688336
Commit Graph

1696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud
e3627f6dcd Fixed devise forms to make them b3ish and pretty 2014-08-29 10:02:56 +10:00
Skud
55c2fceffb changed layout of planting list on homepage 
... as b3 seems to have more gutter space between columns
 2014-08-28 12:09:43 +10:00
Skud
848b583d94 Tweak formatting of images with popovers (used mostly on homepage) 2014-08-28 11:46:36 +10:00
Skud
b260169d2d Merge pull request #389 from Growstuff/bootstrap3 
Bootstrap3
 2014-08-28 11:15:53 +10:00
Skud
d6e957e2fb Merge pull request #390 from Skud/cropwranglertests 
Switch to match_array to get around spuriously failing tests
 2014-08-28 10:44:36 +10:00
Skud
c68b029d50 Switch to match_array to get around spuriously failing tests 2014-08-28 10:16:31 +10:00
Skud
a3220653cf Merge branch 'dev' into bootstrap3 2014-08-28 08:00:48 +10:00
Skud
840a5efc4e Merge remote-tracking branch 'upstream/bootstrap3' into dev 
Conflicts:
	Gemfile.lock
 2014-08-28 08:00:10 +10:00
pozorvlak
5add85cd7c Merge pull request #387 from Skud/contact-twitter 
Fixed contact page error
 2014-08-27 19:52:22 +01:00
pozorvlak
ea31d89bd0 Merge pull request #385 from Skud/b3forms 
Fixed various forms to be bootstrap3-ified
 2014-08-27 14:17:27 +01:00
Skud
e5b15fae1a got rid of ugly scaffolding 'back' links 2014-08-27 19:02:49 +10:00
Skud
501fda3fc9 b3ified a few of the lesser-used forms 2014-08-27 19:02:06 +10:00
Skud
a5c2c0bb5c Fixed twitter link on contact page 2014-08-25 13:41:15 +10:00
Skud
03ecb7e238 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2014-08-25 09:30:46 +10:00
Skud
b91bab117f Merge pull request #383 from Marlena/pg_crop_wranglers 
created list of crop wranglers on the crop wranglers page
 2014-08-22 14:50:52 +10:00
Marlena Compton
36199054c0 changed method so that you can now call crop_wranglers and admins. meta-programming ftw 2014-08-21 20:11:10 -07:00
Marlena Compton
13e015b441 fixed role factory to not create extra roles when new members 2014-08-21 20:11:10 -07: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
25d19a25d3 err, make that secret token 2014-08-11 15:00:46 +10:00
Skud
8669907319 add secret key to travis config (needed for devise update) 2014-08-11 14:55:43 +10:00
Skud
f02f2ae77e b3ify the signup/signin pages 2014-08-11 14:49:05 +10:00
Skud
561b7c45ac b3ify and improve design of edit profile page 2014-08-11 14:42:00 +10:00
Skud
a684efcf2a b3ified some of the forms 2014-08-11 13:02:08 +10:00
Skud
0969419c84 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2014-08-11 12:02:42 +10:00
Skud
eaaceb5951 Merge pull request #384 from maco/dev 
test & task for the ping -> pint change
 2014-08-11 11:23:17 +10:00
Mackenzie Morgan
f3c3d73ef1 updating test for harvest units to list the valid units and adding a task to correct misspelled pint harvests already in the database 2014-08-10 19:49:10 -04:00
Skud
59608c5851 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2014-07-31 10:19:08 +10:00
pozorvlak
e865fc1c82 Merge pull request #382 from maco/dev 
update harvest model test for oz
 2014-07-30 15:01:02 +01:00
Mackenzie Morgan
d17ab658c8 fix typo. pint was ping 2014-07-30 09:28:08 -04:00
Mackenzie Morgan
0a256a2dd0 update harvest model test for oz 2014-07-30 09:15:53 -04:00
pozorvlak
f280ff968b Merge pull request #381 from maco/dev 
Add 'oz' as a weight unit for harvesting
 2014-07-30 11:22:58 +01:00
Mackenzie Morgan
1716de2dfc Add 'oz' as a weight unit for harvesting 2014-07-30 01:31:39 -04:00
Skud
bb0f88bc0b Small amount of b3ification when merging dev into b3 branch 2014-07-22 14:26:22 +10:00
Skud
d03bb5e849 Merge branch 'dev' into bootstrap3 2014-07-22 14:24:24 +10:00
Skud
250a2b7d02 Merge branch 'bootstrap3' into dev 
Conflicts:
	app/assets/stylesheets/overrides.css.less
 2014-07-22 14:24:07 +10:00
Skud
c0ea08ddc1 s/btn-large/btn-lg/ for bootstrap 3 2014-07-22 12:11:33 +10:00
Skud
4e9679b22a make sure all buttons are either btn-default or btn-primary 2014-07-22 12:09:08 +10:00
Skud
117fd23bea add btn-default to all btn-xs 2014-07-22 12:06:28 +10:00
Skud
0294daf423 s/btn-mini/btn-xs/ for bootstrap3 2014-07-22 12:01:49 +10:00
Skud
6e48b7d224 Merge branch 'Skud-scinames' into dev 2014-07-22 11:23:38 +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
846a2c89c5 Tweaked FactoryGirl to use create_list 2014-07-20 19:29:06 +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