Commit Graph

77 Commits

Author SHA1 Message Date
Brenda Wallace
182c626226 Prefer if/unless modifier 2017-12-06 14:23:12 +13:00
Brenda Wallace
878fc7ebcd Use symbol procs 2017-12-06 14:17:34 +13:00
Brenda Wallace
25b1836146 Removed nil comparison 2017-12-06 14:13:01 +13:00
Brenda Wallace
c925c95398 Use next, instead of a if wrapper 2017-12-06 14:11:27 +13:00
Brenda Wallace
e229438997 rubocop fox for numeric literals 2017-03-01 17:46:12 +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
4e722dd123 Move crop csv import to own file 2017-02-23 15:35:29 +13:00
Brenda Wallace
2b03381a24 Removed trailing commas 2017-02-15 23:33:06 +00:00
Brenda Wallace
be2426c99f Use timezone when creating dates 2017-02-10 21:53:18 +13:00
Brenda Wallace
370938c9f9 change deliver_later to deliver_now, so we don't sys.exit() crash 2017-01-22 21:22:30 +13:00
Brenda Wallace
8c7fcd9d49 Fixed all useless assignments 2016-11-26 19:36:59 +13:00
Brenda Wallace
bcdd2a9167 Changed called to rails dynamic find_by 2016-11-26 15:55:38 +13:00
Brenda Wallace
62e7c716dd Removed extra empty blank lines 2016-11-26 12:06:02 +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
18a8d6c5bf Re-instate usage info when args not as expected 2016-11-23 20:38:46 +13:00
Brenda Wallace
37d01e831f Reduced code duplication in growstuff.rake 2016-11-23 20:27:20 +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
bdb057ca0f Removed all trailing white space 2016-11-14 15:05:32 +13:00
Daniel O'Connor
5d70d822eb #951 Swap to deliver_later implementation 2016-08-16 10:55:40 +09:30
Daniel O'Connor
7fe75ee52a Fix DEPRECATION WARNING: #deliver is deprecated. 2016-06-10 15:45:01 +09:30
Daniel O'Connor
4b4e0cf69a $ rubocop --only HashSyntax --auto-correct
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
Mackenzie Morgan
87bfceb035 make the one-off save the si weight 2015-02-02 23:49:07 -05:00
Mackenzie Morgan
7ca89908cd merge from upstream 2015-02-01 22:00:52 -05:00
Mackenzie Morgan
2c94f61843 use %0.3f instead of %0.2f so we get to gram-granularity, and don't duplicate code 2015-02-01 21:59:33 -05:00
Mackenzie Morgan
de5b16e384 back to kg for si weight, also now adding si_weight to the csv correctly 2015-01-31 18:35:29 -05:00
Mackenzie Morgan
bb9695b272 add check for nil to set_si_weights and the corresponding deploy script and update test 2015-01-31 00:45:31 -05:00
Mackenzie Morgan
d436fd86f8 use ruby-units to handle conversion. note: the deploy task isn't working and i don't know why 2015-01-31 00:22:35 -05:00
Mackenzie Morgan
2567e7cd74 adding tests (not passing, need to figure out saving mid-test), fixing before_save, adding CSV column, and adding task to set the si_weight throughout the db 2015-01-29 00:27:53 -05:00
Mackenzie Morgan
0bdab0d9fc basics of harvest standardized weights 2015-01-28 23:00:16 -05:00
Shiho Takagi
04d61bd040 deployment sript 2015-01-25 16:18:26 +11:00
Shiho Takagi
5a96b7efd6 adding a rake task to generate elasticsearch index 2015-01-25 15:47:40 +11:00
Taylor Griffin
a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +11:00
Miles Gould
9f54641e95 Find crops by name when loading altnames
Crop IDs are not guaranteed to be the same on staging and production.
2014-12-01 11:03:27 +00:00
Miles Gould
4b90f6385b Merge branch 'dev' into load_alternate_names
Conflicts:
	Gemfile.lock
	script/deploy-tasks.sh
2014-12-01 10:47:10 +00:00
Taylor Griffin
8e79199766 wip: upgrading rspec 2014-11-15 22:55:37 +11:00
Skud
267c671259 cweek not cw_week 2014-11-11 20:55:04 +11:00
Skud
eb98910bea Only send planting reminders to confirmed accounts 2014-11-11 19:45:07 +11:00
Miles Gould
badb0c4fe7 Make load altnames task idempotent. 2014-10-19 22:21:29 +01:00
Miles Gould
06a4fcab71 Remove superfluous* error-checks from load_altnames
* /me crosses fingers...
2014-10-19 22:19:41 +01:00
Miles Gould
36be5e9533 Hardcode alternate-name CSV file path. 2014-10-19 21:54:46 +01:00
Miles Gould
0aea1721d8 Add altname data and include load in deploy-tasks. 2014-10-19 17:24:18 +01:00
Miles Gould
3d10553373 Add Rake task to load altnames. 2014-10-19 17:24:18 +01:00
Skud
e4cf636bef Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
Conflicts:
	app/models/harvest.rb
	db/schema.rb
	spec/models/harvest_spec.rb
2014-10-15 14:20:16 +01:00
Shiho Takagi
cf07ecfa4a improved test spec, crop page and added rake task 2014-10-05 23:16:46 +11:00
Shiho Takagi
6e02f40e0a merging from dev 2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
Skud
a5b856b506 Merge pull request #410 from maco/dev
Harvest photos
2014-10-02 17:45:59 +10:00
Skud
8497782847 Clear crop hierarchy view cache after uploading crops
The crop_sweeper only acts in response to things that happen in the
controller.  Since this works directly with the model, we need to clear
the cache fragment manually.
2014-09-30 23:02:09 +10:00
Skud
98da785d8a Removed spurious debugging puts 2014-09-30 22:37:58 +10:00
Skud
65c46c334b Delete unused photos
Make sure the models are setup so that if a photo is not used for
anything, it's removed from the system.

Also wrote a rake task (which should be run on deploy) to remove older
unused photos.
2014-09-29 09:18:28 +10:00