 Skud
|
028e1194e5
|
Merge pull request #392 from Skud/moreb3
changed layout of planting list on homepage
|
2014-08-28 12:10:42 +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
|
698a13ef70
|
Merge pull request #391 from Skud/moreb3
Tweak formatting of images with popovers (used mostly on homepage)
|
2014-08-28 12:01:24 +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
|
f6c2873f97
|
Add page content test suggested by tygriffin
|
2014-08-27 18:43:44 +10:00 |
|
|
Skud
|
1103e2719f
|
Fixed up label with link to field it relates to
|
2014-08-27 18:42:42 +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 |
|
|
Taylor Griffin
|
2a51f66d88
|
fix seed view tests
|
2014-08-24 12:11:10 +10:00 |
|
|
Taylor Griffin
|
fd651de7ea
|
implement auto suggest on new seed page
|
2014-08-24 12:02:53 +10:00 |
|
|
Taylor Griffin
|
d038ac6d8a
|
test that input value is not affected by auto suggest
|
2014-08-24 10:53:24 +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 |
|
|
Skud
|
1250206c5e
|
Ongoing coverage improvements
|
2014-08-22 14:44:00 +10:00 |
|
|
Skud
|
9c5f7753ca
|
Show coverage locally and send to coveralls
|
2014-08-22 14:09:12 +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 |
|
|
Taylor Griffin
|
ca41f86d93
|
add validation for case when user input is not in the database
|
2014-08-17 11:34:00 +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 |
|
|
Taylor Griffin
|
e0d81f5693
|
improve and abstract auto_suggest api
|
2014-08-02 22:14:10 +10:00 |
|
|
Taylor Griffin
|
7aef1264ce
|
fix edge case where user types in full name of crop and doesn't use autocomplete suggestions
|
2014-08-02 20:44:19 +10:00 |
|
|
Taylor Griffin
|
957fa3417d
|
remove exclusion of assets group gems
|
2014-08-01 20:27:26 +10:00 |
|
|
Taylor Griffin
|
c282b3b208
|
abstract crop suggest autocomplete tests into a shared example
|
2014-08-01 20:18:28 +10:00 |
|
|
Taylor Griffin
|
69162cf228
|
write feature specs for harvesting a crop
|
2014-08-01 19:38:47 +10:00 |
|
|
Taylor Griffin
|
1bed42876c
|
write instructions for using crop_suggest.js in a view
|
2014-08-01 19:30:30 +10:00 |
|
|
Taylor Griffin
|
8352807d5a
|
add presence validation for crop association on harvest
|
2014-08-01 19:27:51 +10:00 |
|
|
Taylor Griffin
|
63673112a7
|
repair failing view tests after implementing crop-suggest on harvest
|
2014-08-01 19:26:33 +10:00 |
|
|
Taylor Griffin
|
a49880d4da
|
make crop_suggest.js more abstract so it works for other resources, not just planting
|
2014-08-01 19:19:27 +10:00 |
|
|
Taylor Griffin
|
b4fdf97056
|
switch to poltergeist-phantomjs from selenium for js webdriver
|
2014-07-31 14:48:35 +10: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 |
|