From b81cd76d10058cc8b37541ae4385c9755917bf84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Thu, 21 Jan 2016 15:17:19 +0100
Subject: [PATCH 1/4] Change language in detail pages:

- "BY" => "CREATED BY"
- "REGISTREE" => "ASCRIBED BY"
---
 js/components/ascribe_detail/edition.js         | 2 +-
 js/components/ascribe_detail/piece_container.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/components/ascribe_detail/edition.js b/js/components/ascribe_detail/edition.js
index 803d73bb..df9d41a0 100644
--- a/js/components/ascribe_detail/edition.js
+++ b/js/components/ascribe_detail/edition.js
@@ -70,7 +70,7 @@ let Edition = React.createClass({
                     <div className="ascribe-detail-header">
                         <hr className="hidden-print" style={{marginTop: 0}}/>
                         <h1 className="ascribe-detail-title">{edition.title}</h1>
-                        <DetailProperty label="BY" value={edition.artist_name} />
+                        <DetailProperty label="CREATED BY" value={edition.artist_name} />
                         <DetailProperty label="DATE" value={Moment(edition.date_created, 'YYYY-MM-DD').year()} />
                         <hr/>
                     </div>
diff --git a/js/components/ascribe_detail/piece_container.js b/js/components/ascribe_detail/piece_container.js
index f7ef024f..8ee3111f 100644
--- a/js/components/ascribe_detail/piece_container.js
+++ b/js/components/ascribe_detail/piece_container.js
@@ -269,7 +269,7 @@ let PieceContainer = React.createClass({
                         <div className="ascribe-detail-header">
                             <hr className="hidden-print" style={{marginTop: 0}} />
                             <h1 className="ascribe-detail-title">{piece.title}</h1>
-                            <DetailProperty label="BY" value={piece.artist_name} />
+                            <DetailProperty label="CREATED BY" value={piece.artist_name} />
                             <DetailProperty label="DATE" value={Moment(piece.date_created, 'YYYY-MM-DD').year() } />
                             {piece.num_editions > 0 ? <DetailProperty label="EDITIONS" value={ piece.num_editions } /> : null}
                             <hr/>
@@ -277,7 +277,7 @@ let PieceContainer = React.createClass({
                         }
                     subheader={
                         <div className="ascribe-detail-header">
-                            <DetailProperty label={getLangText('REGISTREE')} value={ piece.user_registered } />
+                            <DetailProperty label={getLangText('ASCRIBED BY')} value={ piece.user_registered } />
                             <DetailProperty label={getLangText('ID')} value={ piece.bitcoin_id } ellipsis={true} />
                             <LicenseDetail license={piece.license_type} />
                         </div>

From d9755f35636eaaead32b37253c6aa7f9e7ced33a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Thu, 21 Jan 2016 16:24:17 +0100
Subject: [PATCH 2/4] Extract file extension from amazon S3 link

---
 js/components/ascribe_detail/media_container.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/components/ascribe_detail/media_container.js b/js/components/ascribe_detail/media_container.js
index e4270132..cb86e558 100644
--- a/js/components/ascribe_detail/media_container.js
+++ b/js/components/ascribe_detail/media_container.js
@@ -14,7 +14,9 @@ import CollapsibleButton from './../ascribe_collapsible/collapsible_button';
 
 import AclProxy from '../acl_proxy';
 
-import { getLangText } from '../../utils/lang_utils.js';
+import { getLangText } from '../../utils/lang_utils';
+import { extractFileExtensionFromString } from '../../utils/file_utils';
+
 
 const EMBED_IFRAME_HEIGHT = {
     video: 315,
@@ -63,6 +65,7 @@ let MediaContainer = React.createClass({
         // We also force uniqueness of usernames, so this check is safe to dtermine if the
         // content was registered by the current user.
         const didUserRegisterContent = currentUser && (currentUser.username === content.user_registered);
+        const fileExtension = extractFileExtensionFromString(content.digital_work.url);
 
         let thumbnail = content.thumbnail.thumbnail_sizes && content.thumbnail.thumbnail_sizes['600x600'] ?
             content.thumbnail.thumbnail_sizes['600x600'] : content.thumbnail.url_safe;
@@ -120,7 +123,7 @@ let MediaContainer = React.createClass({
                             className="ascribe-margin-1px"
                             href={content.digital_work.url}
                             target="_blank">
-                            {getLangText('Download')} .{mimetype} <Glyphicon glyph="cloud-download"/>
+                            {getLangText('Download')} .{fileExtension} <Glyphicon glyph="cloud-download"/>
                         </Button>
                     </AclProxy>
                     {embed}

From aef3bf5094c2a40d1c225f39737c63c6332af3f1 Mon Sep 17 00:00:00 2001
From: Brett Sun <brett@ascribe.io>
Date: Thu, 21 Jan 2016 17:20:45 +0100
Subject: [PATCH 3/4] Remove hash option for thumbnail

---
 js/components/ascribe_forms/form_register_piece.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/components/ascribe_forms/form_register_piece.js b/js/components/ascribe_forms/form_register_piece.js
index 596f8a56..10fb54d3 100644
--- a/js/components/ascribe_forms/form_register_piece.js
+++ b/js/components/ascribe_forms/form_register_piece.js
@@ -216,9 +216,7 @@ let RegisterPieceForm = React.createClass({
                             plural: getLangText('Select representative images')
                         }}
                         isFineUploaderActive={isFineUploaderActive}
-                        disabled={!isFineUploaderEditable}
-                        enableLocalHashing={enableLocalHashing}
-                        uploadMethod={location.query.method} />
+                        disabled={!isFineUploaderEditable} />
                 </Property>
                 <Property
                     name='artist_name'

From 64c02d4d65c2b343bf444ad70d95f323c6c2d7b8 Mon Sep 17 00:00:00 2001
From: Brett Sun <brett@ascribe.io>
Date: Fri, 22 Jan 2016 00:03:49 +0100
Subject: [PATCH 4/4] Remove duplicate 'name' propType in PieceExtraDataForm

You would not believe how much pain this has caused me with PhantomJS...
---
 js/components/ascribe_forms/form_piece_extradata.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js/components/ascribe_forms/form_piece_extradata.js b/js/components/ascribe_forms/form_piece_extradata.js
index 9ba53f3b..6a475fb6 100644
--- a/js/components/ascribe_forms/form_piece_extradata.js
+++ b/js/components/ascribe_forms/form_piece_extradata.js
@@ -20,7 +20,6 @@ let PieceExtraDataForm = React.createClass({
         editable: React.PropTypes.bool,
         extraData: React.PropTypes.object,
         handleSuccess: React.PropTypes.func,
-        name: React.PropTypes.string,
         title: React.PropTypes.string
     },