mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-07 15:47:21 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 60 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
a2e4863f00 Fixing up prediction specs 2018-01-09 14:37:21 +13:00
Brenda Wallace
2d58099f2d Merge remote-tracking branch 'origin/charts' into charts 2018-01-09 14:33:50 +13:00
Brenda Wallace
c5c6f7ad47 Removed ignore of highcharts 2018-01-09 14:31:03 +13:00
Brenda Wallace
2c3fe3c204 updated prediction spec 2018-01-09 13:18:58 +13:00
Brenda Wallace
1fbbc50940 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-01-09 13:11:33 +13:00
Shiny
b0afbe571f Merge branch 'dev' into charts 2018-01-09 13:09:52 +13:00
Brenda Wallace
74ff648f90 Moved chart includes to application.js, attempting to fix json parse error 2018-01-09 12:51:21 +13:00
Awesome Code
a5fa033f2d Auto corrected by following EmptyLine 2018-01-08 23:46:57 +00:00
Awesome Code
29a9643f00 trigger awesomecode.io notification 2018-01-08 23:46:00 +00:00
Brenda Wallace
9172d21f1d Merge branch 'charts' into upgrade/rails-5 
Conflicts:
	app/assets/stylesheets/predictions.sass
 2018-01-08 18:14:24 +13:00
Brenda Wallace
f3ec7e0c4e Add a green border around predictions boxes 2018-01-08 18:12:57 +13:00
Brenda Wallace
59122d6938 Merge branch 'charts' into timeline 2018-01-08 18:03:40 +13:00
Brenda Wallace
d8cce280e2 Remove highcharts.js, we're not using it 2018-01-08 18:03:20 +13:00
Brenda Wallace
c569961029 Add timeline to gardens 2018-01-08 11:30:06 +13:00
Brenda Wallace
34280123e5 Convert to use chartkick gem 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/assets.rb
 2018-01-08 11:28:59 +13:00
Brenda Wallace
865fe106ad Unique member name on notifications spec 2018-01-07 22:10:27 +13:00
Brenda Wallace
386dc5ad7f Use factory bot in specs 2018-01-07 19:37:03 +13:00
Brenda Wallace
8e59e68dd7 Add valid DNS entry to feature spec, so it doesn't fail 2018-01-07 19:30:52 +13:00
Brenda Wallace
52e3f03bb5 Add timeline to gardens 2018-01-07 19:25:05 +13:00
Brenda Wallace
73ffbb0272 crop creator is optional 
doesn't get set when crop has just been requested
 2018-01-07 18:44:03 +13:00
Brenda Wallace
9e5aba75d8 Added full path to jpeg in spec, so does'nt throw asset pipeline errors 2018-01-07 18:35:28 +13:00
Brenda Wallace
ac16347f0d Small change to plantings model, so feature spec passes again 2018-01-07 18:23:42 +13:00
Brenda Wallace
bf34feacba Convert to use chartkick gem 2018-01-07 17:25:16 +13:00
Brenda Wallace
482d15e36d Fixed spec to specify login name before checking 2018-01-06 16:48:28 +13:00
Brenda Wallace
ca40d07148 Fixed up crops view spec 2018-01-06 16:42:18 +13:00
Brenda Wallace
f02d328d1c commented out a cms link 2018-01-06 15:34:51 +13:00
Brenda Wallace
a9043b8f5a specify login name and post body in spec 
don't rely on factory to produce predictable results, specify what we're
gonna be looking for in spec
 2018-01-06 15:10:25 +13:00
Brenda Wallace
4800f405ea Two more fixes to tests for slug generation 2018-01-06 12:35:05 +13:00
Brenda Wallace
987400526e Use distinct for plant parts 2018-01-06 12:32:04 +13:00
Brenda Wallace
c95630e249 Fixed api request specs after rails 5 upgrade 2018-01-06 12:19:42 +13:00
Brenda Wallace
dd980d3f41 Harvests#edit needs to respond with something 2018-01-06 12:06:26 +13:00
Brenda Wallace
22fd422a6d Look for eq false in member spec 2018-01-06 11:49:35 +13:00
Brenda Wallace
d642e7cf40 set login name on member so we know what to look for in slug spec 2018-01-06 11:48:45 +13:00
Brenda Wallace
5eae80bc6d Specify login name in spec, so we know what to look for 
Becuase we're using the faker gem now
 2018-01-06 11:38:47 +13:00
Brenda Wallace
e5beb066a0 Moved members.create_account_and_garden to private 2018-01-06 11:32:49 +13:00
Brenda Wallace
7bb49f337f Fixing up member's account model creation, post rails 5 upgrade 2018-01-06 11:31:04 +13:00
Brenda Wallace
fcbb57e659 Respond with data on gardens#edit, so non-html formats don't break specs 2018-01-06 10:47:04 +13:00
Brenda Wallace
a0fe19651e Plant parts model using distinct query 2018-01-06 09:31:39 +13:00
Brenda Wallace
19382a8a36 Random login name generator was running out of names 
So here's a name plus a random number instead
It might collide sometimes alas
 2018-01-06 09:23:34 +13:00
Brenda Wallace
62fd16e6b2 Notifications don't have a post if they are a message 2018-01-06 09:01:18 +13:00
Brenda Wallace
a2190dc984 Fixed a matcher in posts controller spec 2018-01-06 08:54:44 +13:00
Brenda Wallace
462654f26e Fixed gardens controller specs 2018-01-06 08:51:11 +13:00
Brenda Wallace
641d227a87 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	app/assets/javascripts/application.js
	package-lock.json
 2018-01-06 08:46:52 +13:00
Brenda Wallace
a0cc9c0a00 fixed photo controller specs 2018-01-06 08:41:34 +13:00
pozorvlak
ace0d7ab77 Merge pull request #1505 from Br3nda/js/cleanup 
Js clean up
 2018-01-05 11:35:17 +00:00
Brenda Wallace
4e5aa8077c Re-wrote harvests#update controller spec 2018-01-05 21:34:11 +13:00
Brenda Wallace
2b69db77bf Use faker gem for Member factorybot 2018-01-05 21:33:21 +13:00
Brenda Wallace
2f9610a60f Http positional arguments in rails 5 2018-01-04 21:28:48 +13:00
Brenda Wallace
46cfe527bc add in gem 'rails-controller-testing' 2018-01-04 16:38:09 +13:00
Brenda Wallace
fefc218b4c Merge branch 'js/cleanup' of github.com:Br3nda/growstuff into js/cleanup 2018-01-04 15:12:30 +13:00