mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-11 09:17:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,937 Commits 61 Branches 82 Tags
bf34feacbafc98242b31decaaa5f40c4eaa018ce
Commit Graph

4937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brenda Wallace
53c9f89bc1 Fixed up tabulation 2018-01-04 15:11:36 +13:00
Brenda Wallace
79f6f7097a updated npm package.json 2018-01-04 15:01:09 +13:00
Brenda Wallace
090bc02269 belongs_to defaults to required. setting some to optional 2018-01-04 14:55:36 +13:00
Brenda Wallace
2fd13e9b7c Updated new path to jquery autocomplete 2018-01-04 14:44:52 +13:00
Brenda Wallace
2109ee1561 Migrations need to specify a version 2018-01-04 14:42:25 +13:00
Brenda Wallace
79cf7b452c removing some cms stuff 2018-01-04 14:31:24 +13:00
Brenda Wallace
9d2732fffa removing comfortable mexican sofa for now 2018-01-04 14:29:09 +13:00
Brenda Wallace
e3a3c22e69 Merge remote-tracking branch 'origin/upgrade/rails-5' into upgrade/rails-5 2018-01-04 14:05:41 +13:00
Shiny
ba2e4b5dce Merge branch 'dev' into upgrade/rails-5 2018-01-04 14:03:19 +13:00
pozorvlak
965fb28ab3 Merge branch 'dev' into js/cleanup 2018-01-03 11:07:35 +00:00
pozorvlak
196707e6e8 Merge pull request #1508 from Br3nda/fix/1502 
Fix/1502  Missing ordering, crops form
 2018-01-03 11:07:11 +00:00
Brenda Wallace
7bc91e415a Re-instate active_median gem 2018-01-03 19:09:32 +13:00
Brenda Wallace
d456d045cd Changed order of photo association relationship declarations 2018-01-03 17:24:51 +13:00
Brenda Wallace
4917ab9ae8 Fixed order->member relationship, after change to paranoia gem 2018-01-03 17:21:40 +13:00
Brenda Wallace
46d56fde31 Application job for Rails 5 2018-01-03 17:20:08 +13:00
Brenda Wallace
65d5b2d61a Application mailer for rails 5 2018-01-03 17:18:41 +13:00
Brenda Wallace
b6c9b13d4d Models inherit from application record 2018-01-03 17:16:14 +13:00
Brenda Wallace
f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +13:00
Brenda Wallace
f1c8743623 Config for rails 5 2018-01-03 17:10:50 +13:00
Brenda Wallace
26f525e88a Upgrade gems for rails 5 
Note: Unlocks elastic search gem, and removes debuggers
 2018-01-03 17:06:54 +13:00
Brenda Wallace
00130b3c0a Merge remote-tracking branch 'origin/fix/1502' into fix/1502 2018-01-03 15:12:31 +13:00
Brenda Wallace
d86de897c7 Wrap long line 2018-01-03 15:12:09 +13:00