mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-23 17:22:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,922 Commits 65 Branches 76 Tags
a0fe19651edadfbba67b8136cf9e53e2cec9ce39
Commit Graph

4922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brenda Wallace
466a9d6d8a Merge remote-tracking branch 'upstream/dev' into dev 2018-01-03 15:10:08 +13:00
Shiny
0db3b3d532 Merge branch 'dev' into fix/1502 2018-01-03 15:10:00 +13:00
Brenda Wallace
a39c304fac Fix ordering of crops' parent on form 2018-01-03 15:06:55 +13:00
Brenda Wallace
ee1617c7c3 Added new line at end of file 2018-01-03 14:43:29 +13:00
Brenda Wallace
0a71bfe99f Tabulation and jsdoc fixes 2018-01-03 14:40:22 +13:00
Brenda Wallace
56b0562785 Removed unused variables in js 2018-01-03 14:24:08 +13:00
Brenda Wallace
2d98a7e793 Wrapped a long line 2018-01-03 14:21:29 +13:00
Brenda Wallace
978317f47a more JSDoc 2018-01-03 14:20:01 +13:00
Brenda Wallace
4570fda384 removed 2 unused variable in js 2018-01-03 13:03:10 +13:00
Brenda Wallace
122a7f17e2 Fix up JSDoc 2018-01-03 13:01:48 +13:00
Brenda Wallace
591c95dca2 added JSDoc 2018-01-03 12:56:52 +13:00
Brenda Wallace
e910bfd50f added JSDoc 2018-01-03 12:54:33 +13:00
Brenda Wallace
7c25161574 contributors/commits update 2018-01-03 12:48:13 +13:00
Brenda Wallace
0db2d6b346 converted variable to camel case 2018-01-03 12:42:20 +13:00
Brenda Wallace
5584da02c3 Some js cleanups 2018-01-03 12:35:30 +13:00