11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Taylor Griffin	094d9c509a	write feature spec for create planting functionality	2014-07-29 10:14:20 +10:00
Taylor Griffin	012f37f366	set autoFocus to true for jquery autocomplete	2014-07-29 08:42:35 +10:00
Taylor Griffin	1054f08206	write feature spec for crop-suggest functionality on new planting form	2014-07-28 00:23:13 +10:00
Taylor Griffin	a707d9a2ea	write feature spec that tests crop suggest functionality in new planting form	2014-07-28 00:15:31 +10:00
Taylor Griffin	9d6e787883	set up database_cleaner so js specs will use the same database connection as regular specs	2014-07-28 00:14:06 +10:00
Taylor Griffin	b28ce28703	replace mapbox_map_id and nominatim_user_agent_email with benign values if Rails env is test	2014-07-28 00:12:40 +10:00
Taylor Griffin	ec060b9cc0	fix most view tests that broke after changing new planting form to auto-suggest crop name	2014-07-27 22:40:14 +10:00
Taylor Griffin	948aeb1289	working on getting Selenium tests to pass	2014-07-27 21:04:52 +10:00
Taylor Griffin	1ee79c25f1	set up selenium test but encountering jQuery not defined error	2014-07-27 07:38:56 +10:00
Taylor Griffin	29752e049e	remove stray reference to capybara	2014-07-26 20:19:46 +10:00
Taylor Griffin	8a1dd9d171	implement autocomplete for crop name on new planting form	2014-07-26 20:16:22 +10:00
Taylor Griffin	5df0c9c71a	sketch feature test for planting a crop	2014-07-26 08:36:48 +10:00
Taylor Griffin	b940644ef3	add capybara and selenium gems	2014-07-26 07:58:05 +10: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