11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel O'Connor	13bfdeaa1a	Pin Kaminari for the moment, until https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md#100 assessed	2017-02-23 14:31:47 +10:30
Daniel O'Connor	e2fb7c940f	Upgrade js-routes	2017-02-23 14:30:10 +10:30
Daniel O'Connor	5bd7d9aa43	Upgrade to the 4.x series of d3-rails	2017-02-23 14:28:19 +10:30
Daniel O'Connor	117c717391	Upgrade capybara, codeclimate-test-reporter	2017-02-23 14:25:51 +10:30
Daniel O'Connor	72603a2db0	Pin to specific omniauth versions for the moment, to avoid login test regression	2017-02-23 14:24:29 +10:30
Daniel O'Connor	9f8cfa8de3	Update sexp_processor, ruby-units	2017-02-23 14:23:01 +10:30
Daniel O'Connor	221dd45681	Upgrade to d3 3.5 “Mount Sharp”	2017-02-23 14:19:33 +10:30
Daniel O'Connor	fb2a600433	Pin d3-rails for the moment	2017-02-23 14:18:31 +10:30
Daniel O'Connor	296f8dddfa	Update selenium-webdriver, haml_lint, jasmine	2017-02-23 14:15:27 +10:30
Daniel O'Connor	da16a38d1f	Upgrade rails	2017-02-23 14:12:27 +10:30
Brenda Wallace	5abc1fb80e	duplicate alt name spec (and adding to crop)	2017-02-23 15:35:29 +13:00
Brenda Wallace	86d5f5febd	sciname/altnames adding code is very similar	2017-02-23 15:35:29 +13:00
Brenda Wallace	0a840abc58	Added specs for duplicate sci names	2017-02-23 15:35:29 +13:00
Brenda Wallace	968e9bd3ad	Rubocop fix up in spec	2017-02-23 15:35:29 +13:00
Brenda Wallace	ddd0e0c285	Fixed typo in string causing spec to fail	2017-02-23 15:35:29 +13:00
Brenda Wallace	00952d5ef6	Updating more specs for new csv importer interface	2017-02-23 15:35:29 +13:00
Brenda Wallace	a0e1d8b11d	Update scientific name model spec	2017-02-23 15:35:29 +13:00
Brenda Wallace	3d7f2ec20c	Updating specs to match new csv importer	2017-02-23 15:35:29 +13:00
Brenda Wallace	abbd2cf0a4	fix bug: look up parent crop by name in csv import	2017-02-23 15:35:29 +13:00
Brenda Wallace	2f9961651f	Call new csv importer from specs	2017-02-23 15:35:29 +13:00
Brenda Wallace	3089c28233	Adding validations to sci names and alt names	2017-02-23 15:35:29 +13:00
Brenda Wallace	4e722dd123	Move crop csv import to own file	2017-02-23 15:35:29 +13:00
Brenda Wallace	5698a78d9b	DRY the accounts controller	2017-02-23 09:45:57 +13:00
Daniel O'Connor	71804a0b41	Merge pull request #1235 from Br3nda/accounttypes-controller-DRY ... DRY the account types controller	2017-02-22 11:03:00 +10:30
Brenda Wallace	d500c9093d	DRY the account types controller	2017-02-22 13:21:59 +13:00
Shiny	9ff468aa50	Merge pull request #1228 from Growstuff/dev ... Release 20 release20	2017-02-22 09:21:01 +13:00
Shiny	4261f16cd0	Merge pull request #1133 from pozorvlak/test_runners ... Refactor test-runners	2017-02-21 11:59:09 +13:00
Shiny	b8884beb2f	Merge branch 'dev' into test_runners	2017-02-21 11:31:02 +13:00
pozorvlak	bc88c4d8c7	Merge pull request #1231 from Br3nda/seeds-controller ... DRY seeds controller	2017-02-20 13:49:29 +00:00
pozorvlak	3ac4fbcdb8	Merge branch 'dev' into seeds-controller	2017-02-20 13:36:50 +00:00
pozorvlak	549426e3e0	Merge pull request #1230 from Br3nda/gardens-controller ... DRY the gardens controller	2017-02-20 13:36:40 +00:00
pozorvlak	25a1f0da9a	Merge branch 'dev' into gardens-controller	2017-02-20 13:11:18 +00:00
pozorvlak	3be2fc6241	Merge pull request #1229 from Br3nda/harvests-controller ... DRY the Harvests controller	2017-02-20 13:11:04 +00:00
pozorvlak	837934167b	Merge branch 'dev' into harvests-controller	2017-02-20 13:02:58 +00:00
pozorvlak	d43d8ae0e7	Merge pull request #1217 from Br3nda/MultilineMethodCallBraceLayout ... Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation	2017-02-20 12:46:17 +00:00
Brenda Wallace	035b2399ca	DRY seeds controller	2017-02-20 20:54:06 +13:00
Brenda Wallace	1a3e976ba5	DRY the gardens controller	2017-02-20 02:36:51 +00:00
Brenda Wallace	d31739f86a	Further code clarity on the harvest csv filename	2017-02-20 10:07:14 +13:00
Brenda Wallace	0f523381f0	DRY the harvest controller	2017-02-20 09:58:36 +13:00
Brenda Wallace	550848a513	ParenthesesAroundCondition fixup	2017-02-19 16:20:45 +13:00
Brenda Wallace	ae3752e021	DefWithParentheses fixup	2017-02-19 16:19:16 +13:00
Brenda Wallace	50624fb2cb	Style/MultilineBlockLayout fix	2017-02-19 16:17:03 +13:00
Brenda Wallace	818466a142	MethodCallWithoutArgsParentheses fixup	2017-02-19 16:17:03 +13:00
Brenda Wallace	e184503caa	Fix up to match rubocop's MultilineMethodCallBraceLayout recommendation	2017-02-19 16:17:03 +13:00
Brenda Wallace	d00f743c47	rubocop fix up on spec	2017-02-17 16:00:11 +13:00
pozorvlak	b19a991106	Merge pull request #1226 from Br3nda/scinames-controller ... DRY scientific names controller	2017-02-16 23:00:29 +00:00
pozorvlak	88e019a19f	Merge branch 'dev' into scinames-controller	2017-02-16 22:52:07 +00:00
pozorvlak	e954ba801b	Merge pull request #1225 from Br3nda/comments-controller ... DRY comments controller	2017-02-16 22:51:42 +00:00
Brenda Wallace	be23bfc419	DRY scientific names controller	2017-02-17 10:18:34 +13:00
Shiny	5e984ce04a	Merge branch 'dev' into comments-controller	2017-02-17 09:57:29 +13:00