mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-12 10:02:07 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,151 Commits 57 Branches 82 Tags
945edd1cbc959ca91ec2c0eab6daea4e5c1833ca
Commit Graph

5151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cesy
945edd1cbc Merge pull request #1644 from Br3nda/fix/reminder-email-ordering 
Order plantings and harvests in email
 2018-06-16 21:37:29 +01:00
Brenda Wallace
3b2c4a7893 Merge branch 'dev' into fix/reminder-email-ordering 2018-06-16 07:49:06 +12:00
Brenda Wallace
ecf2e82e9e Merge pull request #1645 from Growstuff/Br3nda-patch-1 
Pin coverage badge to dev branch
 2018-06-16 07:48:36 +12:00
Brenda Wallace
2f65939d5c Pin coverage badge to dev branch 2018-06-10 11:47:15 +12:00
Brenda Wallace
5dc8bc5ec5 Order plantings and harvests in email 2018-06-04 17:35:06 +12:00
Brenda Wallace
78d9e3c970 Merge pull request #1622 from Growstuff/awesomecode-factorybot/createlist-12138 
Auto corrected by following FactoryBot/CreateList
 2018-05-13 07:30:24 +12:00
Daniel O'Connor
a772bdaa8d Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-10 21:35:39 +09:30
Brenda Wallace
0402fee04d Merge pull request #1637 from Br3nda/fix/remote-currency-methods 
Remove some old currency methods from application helper
 2018-05-08 07:52:36 +12:00
Brenda Wallace
7a1499d854 Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-01 13:47:44 +12:00
Brenda Wallace
152cdace75 Removed spec for currency helpers 2018-05-01 13:47:25 +12:00
Brenda Wallace
ed3ae8bbd6 Remove some old currency methods from application helper 2018-05-01 13:47:25 +12:00
Brenda Wallace
81adae77f8 Merge pull request #1639 from Growstuff/bundle-update-2018-04-29-130926 
Bundle Update on 2018-04-29
 2018-04-29 18:30:55 +12:00
deppbot
681b5bbd8c Bundle Update on 2018-04-29 2018-04-29 13:09:27 +08:00
Brenda Wallace
832cfde28d Merge pull request #1635 from Growstuff/bundle-update-2018-04-26-092357 
Bundle Update on 2018-04-26
 2018-04-28 21:15:22 +12:00
Brenda Wallace
aa9841dc7d Pinned elastic search to 5.0.0. or later 2018-04-28 18:34:26 +12:00
Brenda Wallace
102eaf3d6b Merge branch 'dev' into bundle-update-2018-04-26-092357 2018-04-26 17:39:03 +12:00
Brenda Wallace
61ebd5fe99 Merge pull request #1632 from Br3nda/feature/i18n 
i18n for plantings#index
release46 		2018-04-26 17:38:32 +12:00
Brenda Wallace
7e0e936509 Merge branch 'dev' into bundle-update-2018-04-26-092357 2018-04-26 17:27:13 +12:00
Brenda Wallace
d3faa75d1d Merge branch 'dev' into feature/i18n 2018-04-26 17:26:55 +12:00
Brenda Wallace
1575ee1ddd Merge pull request #1620 from Br3nda/feature/status 
Badges for ready to harvest, days to finished
 2018-04-26 17:26:36 +12:00
deppbot
5b5eacb738 Bundle Update on 2018-04-26 2018-04-26 09:23:58 +08:00
Brenda Wallace
85eea89792 i18n for plantings#index 2018-04-23 15:40:56 +12:00
Brenda Wallace
fc46685ab9 Renamed should_be_finshed? to late? 2018-04-23 13:44:53 +12:00
Brenda Wallace
db0c60be0d Rename zombie to super_late 2018-04-23 13:33:38 +12:00
Brenda Wallace
91e851c802 Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-23 13:00:53 +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
9fdc9e76df Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-22 12:14:23 +12: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
4c33e5ea2d Merge remote-tracking branch 'origin/feature/status' into feature/status 2018-04-21 22:11:52 +12:00
Brenda Wallace
caa5bcec4b Only show finish button if can edit planting 2018-04-21 21:55:33 +12:00
Brenda Wallace
55bfd50123 Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-04-21 21:18:30 +12:00
Brenda Wallace
86781f3491 Bundle upgrade 2018-04-21 21:14:18 +12:00
Brenda Wallace
48bf7bb2f4 Merge branch 'dev' into feature/status 2018-04-21 17:41:10 +12:00
Brenda Wallace
6677f8641f If not crop lifespan data, use parent data 2018-04-21 17:40:22 +12:00