mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-02 13:41:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,075 Commits 62 Branches 76 Tags
85eea897926679d68e0486273cb45f39b38141da
Commit Graph

5075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
85eea89792 i18n for plantings#index 2018-04-23 15:40:56 +12:00
Brenda Wallace
9112d4e2bb Merge pull request #1630 from jenkr55/ProfileGardenDisplayImprovements 
Profile garden display improvements
 2018-04-22 15:33:42 +12:00
jenkr55
eed0b257fa Fixing test because I removed this line 2018-04-21 22:03:31 -05:00
jenkr55
25bba9c126 format fixes 2018-04-21 21:55:29 -05:00
jenkr55
028c2a28a5 unneeded class 2018-04-21 21:52:55 -05:00
jenkr55
fa28fe25b6 Fixing responsive design issues 2018-04-21 21:43:19 -05:00
jenkr55
77978a76f2 Fixing notes display bug on harvest card 2018-04-21 21:27:40 -05:00
jenkr55
7be10957ec WIP different profile page 2018-04-21 21:05:58 -05:00
jenkr55
c94d08c816 Moving bio to be by other profile information 2018-04-21 20:09:23 -05:00
Brenda Wallace
eba03d0662 Merge pull request #1627 from jenkr55/InActiveFixes 
Fixing broken "in-active" checkbox
 2018-04-22 12:11:34 +12:00
Brenda Wallace
53d7cddea1 Merge branch 'dev' into InActiveFixes 2018-04-22 08:54:27 +12:00
Brenda Wallace
89cfd49616 Merge pull request #1626 from Br3nda/bundle-update 
Bundle upgrade
 2018-04-22 08:52:08 +12:00
jenkr55
ef74cc293d Rubocop 2018-04-21 10:51:19 -05:00
jenkr55
0b191049b2 Undo this 2018-04-21 10:46:27 -05:00
jenkr55
e767ea6b38 Fixing planting wrapping issue 2018-04-21 10:36:33 -05:00
jenkr55
6cbf7d0bba Fixing parmas issue for owner 2018-04-21 10:29:13 -05:00
jenkr55
cb5d490b1c Fixing params not being passed to plantings controller 2018-04-21 10:26:19 -05:00
jenkr55
585e45487a Fixing button layout issue 2018-04-21 09:16:17 -05:00
jenkr55
6310c51879 Only show data prompt when there are plantings 2018-04-21 09:08:02 -05:00
Brenda Wallace
86781f3491 Bundle upgrade 2018-04-21 21:14:18 +12:00
Brenda Wallace
a7acf72f56 Merge branch 'master' into dev 2018-04-21 17:05:14 +12:00
Brenda Wallace
8dead992d3 Merge pull request #1624 from Br3nda/fix/awesome 
Revert "Auto corrected by following Style/ExpandPathArguments"
 2018-04-21 10:55:11 +12:00
Brenda Wallace
cdde3994b2 Revert "Auto corrected by following Style/ExpandPathArguments" 
This reverts commit a5b84403bb.
 2018-04-21 10:35:28 +12:00
Brenda Wallace
944af28e3c Merge pull request #1623 from Growstuff/awesomecode-style/expandpatharguments-12138 
Auto corrected by following Style/ExpandPathArguments
 2018-04-21 10:20:18 +12:00
Awesome Code
a5b84403bb Auto corrected by following Style/ExpandPathArguments 2018-04-20 22:19:28 +00:00
pozorvlak
f1a40e4305 Merge pull request #1621 from jenkr55/SecondCommentButton 
Show second comment button when many comments on a post
 2018-04-20 10:51:18 +01:00
jenkr55
4120069e4c Fixing trailing whitespace 2018-04-19 12:17:36 -05:00
jenkr55
18a7306fd0 Merge branch 'SecondCommentButton' of github.com:jenkr55/growstuff into SecondCommentButton 2018-04-19 12:11:03 -05:00
jenkr55
b3962bc9bc Comment button same style 2018-04-19 12:10:19 -05:00
Jennifer Kruse
296daa7a56 Merge branch 'dev' into SecondCommentButton 2018-04-18 20:47:53 -05:00
jenkr55
634dc936f9 Show second comment button when many comments 2018-04-18 19:32:24 -05:00
Brenda Wallace
79e0bc5206 Merge pull request #1615 from Growstuff/dev 
Release 45
 2018-04-13 11:25:40 +12:00
pozorvlak
61183509b0 Merge pull request #1612 from Growstuff/Br3nda-patch-1 
Pick the first photo
release45 		2018-04-12 15:34:22 +01:00
Brenda Wallace
6c1bbe9f1c Merge branch 'dev' into Br3nda-patch-1 2018-04-12 14:15:49 +12:00
Brenda Wallace
bab41143fa Merge branch 'master' into dev 2018-04-12 11:01:53 +12:00
Brenda Wallace
3c7688d2ed Merge branch 'dev' into Br3nda-patch-1 2018-04-09 09:57:24 +12:00
Brenda Wallace
ef20d1a333 Merge pull request #1613 from jenkr55/OnlyShowPlantingSuggestionIfMatch 
Only show planting suggestion if there's a match
 2018-04-09 09:57:04 +12:00
jenkr55
9c0ddb61e7 Prevent error when @matching_plantings is nil 2018-04-08 10:17:06 -05:00
Jennifer Kruse
19acb238fd Merge branch 'dev' into OnlyShowPlantingSuggestionIfMatch 2018-04-08 09:49:29 -05:00
jenkr55
d38167fd14 Only show planting suggestion if theres a match 2018-04-08 09:47:15 -05:00
Brenda Wallace
6b68e9ee4d Style fix 2018-04-08 10:04:43 +12:00
Brenda Wallace
3e2b4f4183 Pick the first photo 2018-04-08 09:56:19 +12:00
Brenda Wallace
65bb523d16 Merge pull request #1609 from jenkr55/FixVariousWrappingIssues 
Fix various wrapping issues
 2018-04-08 09:03:26 +12:00
jenkr55
efa8c513ea Adding myself as a contributor 2018-04-07 14:59:14 -05:00
jenkr55
43813d1318 Fixing various wrapping issues 2018-04-07 14:58:07 -05:00
Cesy
7e2aec9ec3 Merge pull request #1608 from Growstuff/dev 
Release 44
 2018-04-06 07:23:07 +01:00
Brenda Wallace
952224b2e1 Merge branch 'master' into dev release44 2018-04-03 17:46:37 +12:00
Brenda Wallace
26b1a3a6ca Merge pull request #1605 from Br3nda/feature/ownable 
Adding counter caches and ownable concern
 2018-04-03 08:54:15 +12:00
Brenda Wallace
03c9151ecd Merge branch 'dev' into feature/ownable 2018-04-03 08:46:34 +12:00
pozorvlak
1dd3d658eb Merge pull request #1606 from Br3nda/fix/dependents 
Set the behaviour of dependent models when crops are deleted from the database:

 - plantings, seeds and harvests are deleted
 - child crops are orphaned.
 2018-04-02 15:52:10 +01:00