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
4,519 Commits 60 Branches 82 Tags
release31
Commit Graph

2362 Commits

Author SHA1 Message Date
Logan Gingerich
81e22d6fb2 fixes #1419 - Allows brackets in garden names 2017-11-03 14:53:20 +13:00
Logan Gingerich
10a8df47a9 Factorygirl to factorybot - fixes #1413 (#1425) 
* FactoryGirl Changed to FactoryBot

file fix

changes based on comments received

Bundle Update on 2017-10-29

style update to align hash literal

added package-lock

* indentation fixes with rubocop

* name added to contributors
 2017-11-01 15:03:31 +00:00
Brenda Wallace
f3d03c00b2 Merge remote-tracking branch 'upstream/dev' into feature/more-crop-photos 2017-10-26 20:31:23 +13:00
Brenda Wallace
a3a88c48de Randomise the crops on the homepage 2017-10-23 22:09:34 +01:00
Brenda Wallace
f3e88f5aae Include harvest photos on crop page 2017-10-24 09:34:10 +13:00
Brenda Wallace
1e81dac699 All crop photos; crops-> photos route 2017-10-24 09:34:03 +13:00
Brenda Wallace
705240014a Link harvest thumbnails to harvests 
to be consistent with the rest of the site
 2017-10-23 11:07:27 +01:00
Brenda Wallace
b356d86931 Allow inline style on the progress bar width 2017-10-21 22:48:37 +01:00
Brenda Wallace
34f91c2189 Wrap garden overview buttons to right of photo on small screens 2017-10-21 22:48:37 +01:00
Brenda Wallace
faf3f60e78 small screen gardens overview 2017-10-21 22:48:37 +01:00
Brenda Wallace
e3113fd53d Re-work gardens#index to show planting progress 2017-10-21 22:48:37 +01:00
Brenda Wallace
68768c4d6a Fixed redirection after planting is deleted 2017-10-21 22:48:37 +01:00
Brenda Wallace
191c8e4e9d Display messages even when member is deleted 2017-10-20 23:44:51 +13:00
Brenda Wallace
8d681dd90a Another code style fixup 2017-10-17 17:29:48 +13:00
Brenda Wallace
e21b95a353 Use floats, so the percentage calc works 2017-09-13 22:21:15 +12:00
Brenda Wallace
01333bf965 Use string.start_with? instead of a regexp 2017-09-01 12:11:57 +12:00
Brenda Wallace
a145abff56 Changed regex to matches? to appease rubocop 2017-08-31 21:27:22 +12:00
Brenda Wallace
910a9673dc Unsubscribes newsletter before member destroying 2017-06-09 22:39:07 +12:00
Brenda Wallace
1f916b8314 Post says Member Deleted when they are 2017-06-02 22:51:48 +12:00
Brenda Wallace
1cdcaac41e comment says "Member Deleted" when they are 2017-06-02 22:50:48 +12:00
Brenda Wallace
bbc3ca749f Removed author_exists scope. It is part of default 2017-06-02 22:43:25 +12:00
Brenda Wallace
20b980a162 Helpful comment explains why we use act_as_paranoid 2017-06-02 22:42:03 +12:00
Brenda Wallace
72f805e135 Doesn't need check the :deleted field in registraions 2017-06-02 22:40:39 +12:00
Brenda Wallace
fb012c073e leaves a record of orders and payments intact when members deleted 2017-06-02 22:34:19 +12:00
Brenda Wallace
75d2c0ea3c destroy member if password correct 2017-06-02 20:49:30 +12:00
Brenda Wallace
08996c4157 removed members#destroy. this should be on the registrations controller 2017-06-02 20:48:43 +12:00
Brenda Wallace
c48e24845e Remove owner_exists scope 2017-06-02 20:28:32 +12:00
Shiny
7621da7041 Merge branch 'dev' into issue-1044-account-deletion 2017-05-30 20:39:44 +12:00
Brenda Wallace
8bcc5104e5 Delegate planting predictions 2017-05-29 22:45:14 +12:00
Brenda Wallace
4bbeca9f3e only look up other plantings finishing, if we have a crop 2017-05-29 22:45:14 +12:00
Brenda Wallace
54748ac20d Removed current_date variable from planting_predictions 2017-05-29 22:45:14 +12:00
Brenda Wallace
3c8b80574a Small DRY of planting models -> predict added 2017-05-29 22:45:14 +12:00
Brenda Wallace
288ad782d2 Planted? = true when planted today 2017-05-29 22:45:14 +12:00
Brenda Wallace
5d97a7edac Move setting of days_before_maturity back to plant model 2017-05-29 22:45:14 +12:00
Brenda Wallace
ff1c835cda Moving the planting predictions to own service 2017-05-29 22:45:14 +12:00
Brenda Wallace
ac94b8b6d3 Fixed admin typo 2017-05-29 17:52:08 +12:00
Shiny
fedc7a7fb6 Merge branch 'dev' into issue-1044-account-deletion 2017-05-29 16:17:59 +12:00
Brenda Wallace
9f9df07390 DRY photos controller more 2017-05-29 16:17:43 +12:00
Brenda Wallace
e5a705aeae Responders on the roles controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
fb0f74c4d8 Changed location we direct to after garden destroy 2017-05-29 16:17:43 +12:00
Brenda Wallace
963aafd5ab Added missing respond_with to crops controller 
This tells rails what to use in json responses
 2017-05-29 16:17:43 +12:00
Brenda Wallace
efe2f49e7f More DRY Harvests controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
2da3cd6673 Fixed location to redirect to afver comment add/update 2017-05-29 16:17:43 +12:00
Brenda Wallace
5d50f9aec2 DRY the admin controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
cfb43ba07c DRY the homes controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
3811417d70 More DRY comments controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
9b3c77a0e6 More DRY comments controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
b5636af3be Add responders to alternate names controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
3e93fb5e2e Add responders on products controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
c22c92e9f4 Validates min price on product 
the database has this constraint already. Adding so the ruby models
match.
 2017-05-29 16:17:43 +12:00