Skip to content
This repository was archived by the owner on Nov 6, 2022. It is now read-only.

Commit 6b2de58

Browse files
authored
Merge pull request #156 from trailimage/develop
Develop
2 parents 6cdb3fa + 88454b3 commit 6b2de58

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ dist/
55
lib/
66
public/js/maps/
77
.vscode/chrome/
8-
yarn-error.log

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 4.2.1
2+
3+
- Update dependencies and copyright date
4+
15
## 4.2.0
26

37
- Improve layout for mobile

README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
[![Build Status](https://travis-ci.org/Jason-Abbott/trail-image.svg?branch=master)](https://travis-ci.org/Jason-Abbott/trail-image)
1+
[![Build Status](https://travis-ci.org/trailimage/blog.svg?branch=master)](https://travis-ci.org/trailimage/blog)
22
[![David](https://david-dm.org/Jason-Abbott/trail-image.svg)](https://david-dm.org/Jason-Abbott/trail-image)
33

4-
54
# Purpose
5+
66
Require minimal effort to publish photo blog entries while avoiding lock-in. No data or content is lost if the site goes offline.
77

88
# Design
9+
910
### Overview
11+
1012
Leverage Lightroom's Flickr plugin and the Flickr API such that pressing "Publish" on a set of photos in Lightroom immediately creates a blog page with the ordered set of images arranged above their EXIF descriptions.
1113

1214
### Technical
13-
![Data Diagram](https://docs.google.com/drawings/d/1WBvWdW-vs6kReRAH_cVzMa6yvNkgkcK-czY-aRfD-9Y/pub?w=960&h=720)
15+
16+
![Data Diagram](https://docs.google.com/drawings/d/1WBvWdW-vs6kReRAH_cVzMa6yvNkgkcK-czY-aRfD-9Y/pub?w=960&h=720)

views/partials/footer.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<footer class="page content">
2-
<p class="rights"><strong>Text, images and video are &#169; Copyright 2018 Jason Abbott. All Rights Reserved.</strong></p>
2+
<p class="rights"><strong>Text, images and video are &#169; Copyright 2019 Jason Abbott. All Rights Reserved.</strong></p>
33
<p>Topographic background courtesy of the <a href='http://motoidaho.com/'>Idaho Adventure Motorcycling Club</a></p>
44
<p>Maps are &#169; Copyright <a href="https://www.mapbox.com/about/maps/">Mapbox</a>
55
and &#169; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>

0 commit comments

Comments
 (0)