dependabot[bot]
|
e66924151a
|
[Security] Bump sprockets from 3.7.1 to 3.7.2
Bumps [sprockets](http://getsprockets.org/) from 3.7.1 to 3.7.2. **This update includes security fixes.**
Signed-off-by: dependabot[bot] <support@dependabot.com>
|
2018-06-25 03:31:45 +00:00 |
|
Brenda Wallace
|
6f1eed06cc
|
Merge pull request #1646 from robotscissors/issue-565-create-harvests-rss
Issue 565 create harvests RSS
|
2018-06-19 10:52:10 +12:00 |
|
robotscissors
|
605e2e1392
|
Add to contributors file
|
2018-06-18 15:22:27 -07:00 |
|
Brenda Wallace
|
77d2dc6144
|
Merge branch 'dev' into issue-565-create-harvests-rss
|
2018-06-17 20:58:32 +12:00 |
|
Brenda Wallace
|
678dabf710
|
Merge branch 'master' into dev
|
2018-06-17 10:42:55 +12:00 |
|
Brenda Wallace
|
3a7be86ef9
|
Merge pull request #1607 from Br3nda/fix/plants-parts-dupe
Don't allow duplicate plant parts names
|
2018-06-17 10:42:14 +12:00 |
|
Brenda Wallace
|
a5fa69c7c7
|
Merge branch 'dev' into fix/plants-parts-dupe
|
2018-06-17 08:47:27 +12:00 |
|
Brenda Wallace
|
1d8c2db674
|
Merge branch 'dev' into issue-565-create-harvests-rss
|
2018-06-17 08:47:12 +12:00 |
|
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
|
f67d39ed63
|
Merge branch 'dev' into issue-565-create-harvests-rss
|
2018-06-16 07:53:38 +12:00 |
|
Brenda Wallace
|
103d7375d3
|
Merge branch 'dev' into fix/plants-parts-dupe
|
2018-06-16 07:52:51 +12: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 |
|
robotscissors
|
82b83ca7a4
|
Fix linter issues
|
2018-06-12 10:00:45 -07:00 |
|
robotscissors
|
e784790e19
|
add .to_s to accomodate hound
|
2018-06-11 11:16:47 -07:00 |
|
robotscissors
|
f9bdae77d3
|
add tests for harvests/index.rss
|
2018-06-11 10:38:26 -07:00 |
|
robotscissors
|
dff6827761
|
create rss feed for harvests
|
2018-06-10 20:38:43 -07:00 |
|
Brenda Wallace
|
2f65939d5c
|
Pin coverage badge to dev branch
|
2018-06-10 11:47:15 +12:00 |
|
Brenda Wallace
|
d7e71c8fc3
|
Use factory bot to make a harvest.plant_part
|
2018-06-07 11:46:29 +12:00 |
|
Brenda Wallace
|
47ddc915ef
|
Generate random number in plant_part.name in factorybot
|
2018-06-07 11:44:29 +12:00 |
|
Brenda Wallace
|
0d303ee6df
|
Don't allow duplicate plant parts names
Make factort's plant_part.name unique
Setting plant_part.name in specs
Unique names for plant parts
|
2018-06-04 17:42:41 +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 |
|
pozorvlak
|
caa59df3bd
|
Merge pull request #1625 from Growstuff/dev
Release 46
|
2018-04-27 17:04:31 +01: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 |
|