deppbot
|
0699716c19
|
Bundle Update on 2017-12-18
|
2017-12-18 00:08:58 +08:00 |
|
Shiny
|
5c885d675e
|
Merge branch 'master' into dev
|
2017-12-17 10:05:25 +13:00 |
|
Shiny
|
0b08691160
|
Merge pull request #1474 from Br3nda/feature/photos-1457
Polymorphic relationship to photos
|
2017-12-17 10:04:30 +13:00 |
|
Brenda Wallace
|
6f2b4b13cd
|
Only show photo pagination if there are photos
|
2017-12-17 09:55:52 +13:00 |
|
Brenda Wallace
|
970da53873
|
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
|
2017-12-17 09:15:24 +13:00 |
|
Brenda Wallace
|
3aa2f0bd3b
|
Paginate photos on seeds#show (inc feature specs)
|
2017-12-17 08:55:08 +13:00 |
|
Shiny
|
8c1514bc04
|
Merge branch 'dev' into feature/photos-1457
|
2017-12-15 17:13:12 +13:00 |
|
Daniel O'Connor
|
d2e39f58d5
|
Merge pull request #1494 from Br3nda/fix/ordering
More ordering fixes
|
2017-12-15 12:57:08 +10:30 |
|
Brenda Wallace
|
3d3a3b669e
|
Order posts by most recent
|
2017-12-15 13:28:41 +13:00 |
|
Brenda Wallace
|
8697e56323
|
Order the plantings on the front page
|
2017-12-15 13:26:48 +13:00 |
|
Shiny
|
472b2eb192
|
Merge branch 'dev' into feature/photos-1457
|
2017-12-15 12:10:36 +13:00 |
|
Cesy
|
1698157d8d
|
Merge pull request #1492 from Growstuff/bundle-update-2017-12-14-201051
Bundle Update on 2017-12-14
|
2017-12-14 12:25:49 +00:00 |
|
deppbot
|
ff652ae234
|
Bundle Update on 2017-12-14
|
2017-12-14 20:10:52 +08:00 |
|
Shiny
|
b4fcf004cd
|
Merge pull request #1484 from Growstuff/dev
Release 36
release36
|
2017-12-14 19:37:02 +13:00 |
|
Brenda Wallace
|
25e9ef892d
|
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
|
2017-12-14 08:45:40 +13:00 |
|
Shiny
|
82149d4565
|
Merge branch 'dev' into feature/photos-1457
|
2017-12-14 08:44:31 +13:00 |
|
Brenda Wallace
|
fcd3e36e36
|
Removed commented out code
|
2017-12-14 08:42:51 +13:00 |
|
pozorvlak
|
b783448ec3
|
Merge pull request #1485 from Br3nda/planting-harvests
Show photos of a planting's harvests
|
2017-12-13 12:08:23 +00:00 |
|
pozorvlak
|
e8b5850bfe
|
Merge branch 'dev' into planting-harvests
|
2017-12-13 10:57:40 +00:00 |
|
pozorvlak
|
bca72680c4
|
Merge pull request #1490 from Br3nda/dependabot/npm_and_yarn/coffeelint-2.0.7
Bump coffeelint from 1.16.0 to 2.0.7
|
2017-12-13 10:57:18 +00:00 |
|
pozorvlak
|
358eb96684
|
Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7
|
2017-12-13 10:29:18 +00:00 |
|
pozorvlak
|
05807d41f4
|
Merge pull request #1491 from Br3nda/flickr-auth-fix
Fix Growstuff::OauthSignupAction not found error when connecting flickr
|
2017-12-13 10:27:16 +00:00 |
|
Shiny
|
96f1995768
|
Merge branch 'dev' into dependabot/npm_and_yarn/coffeelint-2.0.7
|
2017-12-13 23:26:07 +13:00 |
|
Shiny
|
deefbbce71
|
Merge branch 'dev' into planting-harvests
|
2017-12-13 23:25:56 +13:00 |
|
Brenda Wallace
|
f8e51f4b45
|
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
|
2017-12-13 22:35:29 +13:00 |
|
Brenda Wallace
|
1c8b75b7cb
|
add and show photos for seeds
close #1457
|
2017-12-13 22:34:16 +13:00 |
|
Brenda Wallace
|
1f66df0743
|
Fixed link to associated flickr, twitter, facebook accountss
fixes #1479
|
2017-12-13 22:23:22 +13:00 |
|
Brenda Wallace
|
72f52230a1
|
Fix Growstuff::OauthSignupAction not found error when connecting flickr account
|
2017-12-13 22:19:41 +13:00 |
|
Shiny
|
700fba58e8
|
Merge branch 'dev' into feature/photos-1457
|
2017-12-13 21:52:55 +13:00 |
|
Daniel O'Connor
|
acecbe93c1
|
Merge pull request #1487 from Growstuff/bundle-update-2017-12-11-160933
Bundle Update on 2017-12-11
|
2017-12-13 16:20:36 +10:00 |
|
dependabot[bot]
|
bafe2b7fd1
|
Bump coffeelint from 1.16.0 to 2.0.7
Bumps [coffeelint](https://github.com/clutchski/coffeelint) from 1.16.0 to 2.0.7.
- [Commits](https://github.com/clutchski/coffeelint/commits)
|
2017-12-12 11:00:57 +00:00 |
|
Shiny
|
3be1454a69
|
Merge branch 'dev' into bundle-update-2017-12-11-160933
|
2017-12-12 12:36:54 +13:00 |
|
Shiny
|
232e5d50ac
|
Merge branch 'dev' into planting-harvests
|
2017-12-12 12:36:33 +13:00 |
|
pozorvlak
|
7207a39039
|
Merge pull request #1486 from Br3nda/cleanup/routes
Convert hashes in routes
|
2017-12-11 10:47:18 +00:00 |
|
deppbot
|
291f865f7f
|
Bundle Update on 2017-12-11
|
2017-12-11 16:09:34 +08:00 |
|
Brenda Wallace
|
47e82eb0a7
|
Convert hashes in routes
|
2017-12-10 19:50:08 +13:00 |
|
Brenda Wallace
|
08dc2a0513
|
Show photos of a planting's harvests
|
2017-12-09 22:24:51 +13:00 |
|
Brenda Wallace
|
4f64698403
|
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
|
2017-12-09 20:59:56 +13:00 |
|
Brenda Wallace
|
14551b6ec8
|
Merge remote-tracking branch 'upstream/dev' into feature/photos-1457
Conflicts:
spec/models/crop_spec.rb
|
2017-12-09 20:59:20 +13:00 |
|
Shiny
|
5d44196947
|
Merge branch 'master' into dev
|
2017-12-09 13:28:10 +13:00 |
|
Shiny
|
1c41cb7b66
|
Merge pull request #1483 from Growstuff/bundle-update-2017-12-08-121126
Bundle Update on 2017-12-08
|
2017-12-09 08:25:36 +13:00 |
|
Shiny
|
c3c55eaa09
|
Merge branch 'dev' into bundle-update-2017-12-08-121126
|
2017-12-09 08:15:28 +13:00 |
|
pozorvlak
|
98aa9521fe
|
Merge pull request #1482 from Br3nda/ordering
Fixes to ordering
|
2017-12-08 12:04:48 +00:00 |
|
Shiny
|
96bb345ca9
|
Merge branch 'dev' into ordering
|
2017-12-08 20:20:27 +13:00 |
|
Shiny
|
9de991a075
|
Merge branch 'dev' into bundle-update-2017-12-08-121126
|
2017-12-08 20:19:39 +13:00 |
|
Shiny
|
f76619864c
|
Merge pull request #1477 from Br3nda/upgrade-rubocop
Rubocop upgrade (and some style fixes)
|
2017-12-08 20:19:08 +13:00 |
|
deppbot
|
ec149997b0
|
Bundle Update on 2017-12-08
|
2017-12-08 12:11:27 +08:00 |
|
Brenda Wallace
|
ac07f18b2d
|
Show most recent seeds first
|
2017-12-07 15:00:16 +13:00 |
|
Brenda Wallace
|
4ce3e8968f
|
crops#show order posts by most recent first
|
2017-12-07 14:58:57 +13:00 |
|
Brenda Wallace
|
cd35538b83
|
Order forums by name
|
2017-12-07 13:42:48 +13:00 |
|