mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-06 07:07:33 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,327 Commits 64 Branches 82 Tags
release16
Commit Graph

1214 Commits

Author SHA1 Message Date
Mackenzie
391111a5bf Merge pull request #1088 from maco/rename_scientific_name 
rename scientific_names.scientific_name to scientific_names.name
 2016-11-29 12:04:21 -05:00
Mackenzie Morgan
832719b01a merge from upstream dev 2016-11-29 09:37:25 -05:00
Miles Gould
0d8cbc5bf2 Fix comment-style weirdness 
We had an inline comment that had been split over two lines; whitespace
fixes made this look very weird.
 2016-11-29 10:44:04 +00:00
Mackenzie Morgan
69980d9ec6 tests 2016-11-28 22:50:53 -05:00
Mackenzie Morgan
fe860aa1ab clean up some tests 2016-11-28 22:33:00 -05:00
Mackenzie Morgan
e1a2b168c9 rename scientific_names.scientific_name to scientific_names.name 
this mirrors alternate_names.name and allows making code more DRY
 2016-11-28 21:57:51 -05:00
Brenda Wallace
8763c22284 Merge remote-tracking branch 'upstream/dev' into bw/indentation-for-great-glory 
Conflicts:
	app/models/crop.rb
 2016-11-29 02:33:30 +00:00
Mackenzie
0952d7d32f Merge pull request #1078 from Br3nda/bw/garden-names-one-line 
Limit garden names to one line
 2016-11-28 09:55:16 -05:00
Daniel O'Connor
8b5c63e898 Merge pull request #1077 from Br3nda/bw/wikipedia-url-regex 
Narrow-ed regex on wikipedia url
 2016-11-28 10:08:11 +10:00
Brenda Wallace
9cce0e39f6 Limit garden names to one line 2016-11-27 14:52:07 +13:00
Brenda Wallace
10c20c7f91 Narrow-ed regex on wikipedia url 
and more tests
 2016-11-27 14:35:49 +13:00
Brenda Wallace
38fbc52a6f String interp doesn't need .to_s 2016-11-27 10:17:01 +13:00
Brenda Wallace
723ebff923 Spacing fixes 2016-11-26 12:13:17 +13:00
Brenda Wallace
62e7c716dd Removed extra empty blank lines 2016-11-26 12:06:02 +13:00
Brenda Wallace
b17e4eed7d Block indentation fixups 2016-11-26 12:02:47 +13:00
Brenda Wallace
2e46cccd21 Hash alignment 2016-11-26 11:52:10 +13:00
Brenda Wallace
bbc19a5436 Array indentation fixed 2016-11-26 11:49:51 +13:00
Brenda Wallace
d268d2b09e Fixed indentation on comments 2016-11-26 11:45:25 +13:00
Brenda Wallace
c878baa886 Indented parameters cleanup 2016-11-26 11:41:07 +13:00
Brenda Wallace
564731667e Fixed up all remaining hash alignment 2016-11-26 11:17:42 +13:00
Brenda Wallace
5f3dd04068 Fixed array indentation 2016-11-26 11:00:49 +13:00
Brenda Wallace
83392ddda1 Indentation clean ups 2016-11-26 10:51:54 +13:00
Brenda Wallace
be67b858b4 Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed 
Conflicts:
	lib/tasks/growstuff.rake
 2016-11-25 08:18:18 +13:00
Brenda Wallace
dac2343b68 Further code duplication reduction 2016-11-20 21:18:07 +13:00
Brenda Wallace
f24e02fd11 reduced code duplication again in photos cont spec 2016-11-20 21:13:57 +13:00
Brenda Wallace
dddc7b020d Corrected description in spec 2016-11-20 21:13:33 +13:00
Brenda Wallace
12a9a0b97d one more check no alert was generated 2016-11-20 21:13:08 +13:00
Brenda Wallace
6a8f48693b Reduce code duplication in photos cont spec 2016-11-20 21:12:43 +13:00
Brenda Wallace
50a0668c1d Check no alert message was generated 2016-11-20 21:11:54 +13:00
Brenda Wallace
a7e88a55b3 Spec for trying to attach photo when not allowed. 2016-11-20 21:03:08 +13:00
Brenda Wallace
d0a1a113b6 Multi-line block changed from {} to do end 2016-11-20 20:29:01 +13:00
Brenda Wallace
a8bffd3bce White space fix in spec 2016-11-20 20:28:34 +13:00
Brenda Wallace
f6aac07c3d Flatten params passed in photos controller spec 2016-11-20 20:27:59 +13:00
Brenda Wallace
72f1d83af4 Removed a bunch of blank lines 2016-11-20 20:19:14 +13:00
Brenda Wallace
917e33bccf Merge remote-tracking branch 'upstream/dev' into bw/long-lines-fixed 2016-11-20 19:24:53 +13:00
Brenda Wallace
2872a1c29d Wrapped all long lines. 
reduced rubocop's line length limit to 120
 2016-11-17 22:02:18 +13:00
Brenda Wallace
5e0cff5b8e Merge remote-tracking branch 'upstream/dev' into bw/covert-tabs-to-spaces 
Conflicts:
	app/helpers/seeds_helper.rb
	spec/support/controller_macros.rb
 2016-11-17 19:04:44 +13:00
Brenda Wallace
5ec2877577 Covert all tabs to spaces 2016-11-16 13:18:26 +13:00
Brenda Wallace
6bd9bd98d9 Removed extra blank lines, & added a end of file 2016-11-16 12:52:48 +13:00
Brenda Wallace
0475954acf Removed extra blank lines 2016-11-16 12:50:14 +13:00
Brenda Wallace
bdb057ca0f Removed all trailing white space 2016-11-14 15:05:32 +13:00
Brenda Wallace
faf117b002 test for link to member's harvest 2016-09-19 18:02:44 +12:00
Daniel O'Connor
36c64bd8dc #1038 Add links to OpenFarm 2016-09-14 14:57:08 +09:30
Daniel O'Connor
29765ebc19 rubocop --only HashSyntax --auto-correct 2016-08-22 19:02:27 +09:30
Daniel O'Connor
0f034523e1 Only maximize if the driver supports such a thing 2016-08-22 18:26:08 +09:30
Daniel O'Connor
bcb0a19dea Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-08-22 16:37:50 +09:30
Daniel O'Connor
4e2311e8d7 Indent 2016-08-22 16:36:30 +09:30
Daniel O'Connor
1c3016a31e Adjust for when running with selenium-webdriver to avoid clicks being placed in the wrong location; and for drivers that don't support blacklisting 2016-08-22 16:17:36 +09:30
Daniel O'Connor
4b066ec37f Merge pull request #1028 from CloCkWeRX/minor_gem_upgrades_august_2016 
Minor gem upgrades for August 2016
 2016-08-15 23:28:30 +09:30
Daniel O'Connor
7f6a1a424d Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-08-15 23:13:55 +09:30