[git][Terbium.ca] branch master updated. edfd467a1b6810c9d99c2001aad2234575baa8c2

[tr...@terbium.ca]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "[Terbium.ca]".

The branch, master has been updated
via edfd467a1b6810c9d99c2001aad2234575baa8c2 (commit)
via 01ead5c13c8ae179f7ee2f32a7885fb10b09f02d (commit)
via f0b991eeb614d12b6712cd1f4bd9e0b89806a691 (commit)
via d1ee562305cd07c7750e6f3d83607609ec49de4f (commit)
via 834abb3ef71a99c5d733bacd80c927f89e3d5bb3 (commit)
via 09e3c6e6d0577b86d505141325f79881fa523040 (commit)
via 2b334c2cebfeb03bb1471392531e17b92c855e34 (commit)
via 321dcd095fb05ff0451bc534ad3dbf9d8e03274e (commit)
via a30faca4b8b60a1f640d7089b33773621f93e740 (commit)
via 8f719278d0af842dc59e279fe9cd714959605658 (commit)
via 24dcfc080c9b213a18c2fd35fe3f543ff82e4492 (commit)
via 596bb2eb94f1c0d1a4547367e037c7a912905181 (commit)
via 470d0324fd7fe25f5957f702a888557c0a80ad2e (commit)
via 959c603f34bcd9d66817cf90a09d7826eace2a7c (commit)
via 7bdaa34659c52b15f701c84b2fd7c5ddb629847f (commit)
via b613ebb0d0d4802085ced34bb4e44ab4dc7da5e5 (commit)
via d7893144e495466af9ac402d9d897065d114c790 (commit)
from 9d01a3383acc0000c911145c80af84bec4b5c21a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit edfd467a1b6810c9d99c2001aad2234575baa8c2
Author: Shawn Sulma <sh...@terbium.ca>
Date: Sat Jun 15 15:25:29 2013 -0400

Add markdown README

commit 01ead5c13c8ae179f7ee2f32a7885fb10b09f02d
Merge: d1ee562 f0b991e
Author: Shawn Sulma <sh...@terbium.ca>
Date: Fri Jun 14 16:29:48 2013 -0400

Merge branch 'master' of /home/unayok/hus/projects/terbium/

commit f0b991eeb614d12b6712cd1f4bd9e0b89806a691
Author: Shawn Sulma <sh...@terbium.ca>
Date: Fri Jun 14 16:29:36 2013 -0400

Various improvements to neo scheme and support

commit d1ee562305cd07c7750e6f3d83607609ec49de4f
Author: Shawn Sulma <sh...@terbium.ca>
Date: Wed Aug 1 22:24:44 2012 -0400

update gitignore

commit 834abb3ef71a99c5d733bacd80c927f89e3d5bb3
Author: Shawn Sulma <sh...@terbium.ca>
Date: Thu Jul 26 03:35:59 2012 +0000

For #33. Fixes and enhancements to handle neo template styling as well as parallel/alternate stylesheets and better cruft/dirty checking.

commit 09e3c6e6d0577b86d505141325f79881fa523040
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 21:44:42 2012 -0400

add .leader to neo CSS

commit 2b334c2cebfeb03bb1471392531e17b92c855e34
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 20:07:07 2012 -0400

fix jinja endtag

commit 321dcd095fb05ff0451bc534ad3dbf9d8e03274e
Merge: a30faca 8f71927
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 20:05:07 2012 -0400

Merge branch 'master' of /home/unayok/hus/projects/terbium/

commit a30faca4b8b60a1f640d7089b33773621f93e740
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 20:05:02 2012 -0400

add postview block to neo/media

commit 8f719278d0af842dc59e279fe9cd714959605658
Merge: 24dcfc0 596bb2e
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 21:57:02 2012 +0000

Merge branch 'master' of ssh://gitosis/terbium

Conflicts:
terbium/template.py

commit 24dcfc080c9b213a18c2fd35fe3f543ff82e4492
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 21:56:27 2012 +0000

Local changes

commit 596bb2eb94f1c0d1a4547367e037c7a912905181
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 12:53:25 2012 -0400

For #33. Implement the "neo" templating style

commit 470d0324fd7fe25f5957f702a888557c0a80ad2e
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 12:46:54 2012 -0400

Fixes #32. Implement a suitable json_item

commit 959c603f34bcd9d66817cf90a09d7826eace2a7c
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 12:44:03 2012 -0400

Some additional optional exif field names.

commit 7bdaa34659c52b15f701c84b2fd7c5ddb629847f
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 12:42:36 2012 -0400

add .gitignore

commit b613ebb0d0d4802085ced34bb4e44ab4dc7da5e5
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 12:42:19 2012 -0400

Fixes #31.

commit d7893144e495466af9ac402d9d897065d114c790
Author: Shawn Sulma <sh...@terbium.ca>
Date: Tue Jul 24 12:40:56 2012 -0400

Fixes #30

-----------------------------------------------------------------------

Summary of changes:
.gitignore | 3 +
README => README.md | 18 +-
terbium/__init__.py | 207 +++++++--
terbium/gallery.py | 2 +
terbium/template.py | 5 +-
.../templates/{terbium => neo}/assets/arrow.png | Bin 476 -> 476 bytes
terbium/templates/neo/assets/arrows.xcf | Bin 0 -> 1992 bytes
.../{terbium => neo}/assets/audio.icon.png | Bin 1626 -> 1626 bytes
.../{terbium => neo}/assets/audio.thumbnail.png | Bin 14129 -> 14129 bytes
.../templates/{terbium => neo}/assets/dots-48.png | Bin 673 -> 673 bytes
.../templates/{terbium => neo}/assets/dots-64.png | Bin 978 -> 978 bytes
.../templates/{terbium => neo}/assets/envelope.gif | Bin 1280 -> 1280 bytes
terbium/templates/neo/assets/info.png | Bin 0 -> 872 bytes
terbium/templates/neo/assets/next.png | Bin 0 -> 509 bytes
terbium/templates/neo/assets/prev.png | Bin 0 -> 516 bytes
terbium/templates/neo/assets/scrubber-handle.png | Bin 0 -> 259 bytes
terbium/templates/neo/assets/scrubber.js | 134 ++++++
.../{terbium => neo}/assets/terbium-48.png | Bin 1342 -> 1342 bytes
.../{terbium => neo}/assets/terbium-64.png | Bin 2068 -> 2068 bytes
terbium/templates/neo/assets/terbium.css | 487 ++++++++++++++++++++
.../templates/{terbium => neo}/assets/terbium.js | 12 +
.../{terbium => neo}/assets/video.icon.png | Bin 1129 -> 1129 bytes
.../{terbium => neo}/assets/video.thumbnail.png | Bin 6155 -> 6155 bytes
terbium/templates/neo/base.html | 62 +++
.../{terbium/media.html => neo/folder.js} | 8 +-
.../{terbium/media.html => neo/image.html} | 4 +-
terbium/templates/neo/index.html | 77 ++++
terbium/templates/neo/item.html | 82 ++++
terbium/templates/{terbium => neo}/media.html | 7 +-
terbium/templates/{terbium => neo}/template.json | 11 +-
terbium/templates/terbium/media.html | 3 +-
terbium/templates/terbium/template.json | 11 +-
terbium/terbium.json | 4 +-
terbium/util.py | 2 +-
34 files changed, 1087 insertions(+), 52 deletions(-)
create mode 100644 .gitignore
copy README => README.md (96%)
copy terbium/templates/{terbium => neo}/assets/arrow.png (100%)
create mode 100644 terbium/templates/neo/assets/arrows.xcf
copy terbium/templates/{terbium => neo}/assets/audio.icon.png (100%)
copy terbium/templates/{terbium => neo}/assets/audio.thumbnail.png (100%)
copy terbium/templates/{terbium => neo}/assets/dots-48.png (100%)
copy terbium/templates/{terbium => neo}/assets/dots-64.png (100%)
copy terbium/templates/{terbium => neo}/assets/envelope.gif (100%)
create mode 100644 terbium/templates/neo/assets/info.png
create mode 100644 terbium/templates/neo/assets/next.png
create mode 100644 terbium/templates/neo/assets/prev.png
create mode 100644 terbium/templates/neo/assets/scrubber-handle.png
create mode 100644 terbium/templates/neo/assets/scrubber.js
copy terbium/templates/{terbium => neo}/assets/terbium-48.png (100%)
copy terbium/templates/{terbium => neo}/assets/terbium-64.png (100%)
create mode 100644 terbium/templates/neo/assets/terbium.css
copy terbium/templates/{terbium => neo}/assets/terbium.js (89%)
copy terbium/templates/{terbium => neo}/assets/video.icon.png (100%)
copy terbium/templates/{terbium => neo}/assets/video.thumbnail.png (100%)
create mode 100644 terbium/templates/neo/base.html
copy terbium/templates/{terbium/media.html => neo/folder.js} (62%)
copy terbium/templates/{terbium/media.html => neo/image.html} (71%)
create mode 100644 terbium/templates/neo/index.html
create mode 100644 terbium/templates/neo/item.html
copy terbium/templates/{terbium => neo}/media.html (75%)
copy terbium/templates/{terbium => neo}/template.json (74%)


hooks/post-receive
--
[Terbium.ca]