Commit Graph

2596 Commits

Author SHA1 Message Date
tim 1e0f56964a Import bokk styles 2016-11-07 14:55:00 +01:00
tim 20f7d1cf19 Put bokk styles into different folder 2016-11-07 14:54:45 +01:00
Oscar Rezo add4e85c7c Added new scss for book custom styles. 2016-11-07 14:50:09 +01:00
tim 751f3e3572 Revert "Added default admin bokk email in forms."
This reverts commit f190009850.
2016-11-07 14:38:03 +01:00
Oscar Rezo f190009850 Added default admin bokk email in forms. 2016-11-03 18:35:14 +01:00
Tim Daubenschütz 6534f6134b Merge pull request #209 from ascribe/bokk-integration-fix
Redirect fix
2016-10-14 14:00:49 +02:00
tim 67d589e163 Redirect fix 2016-10-14 14:00:20 +02:00
Tim Daubenschütz a7be0d82c7 Merge pull request #208 from ascribe/bokk-integration
bokk.ascribe.io
2016-10-14 11:56:31 +02:00
tim a481b3c00e bokk.ascribe.io 2016-10-14 11:51:20 +02:00
Brett Sun 2dc8d08526 Upgrade to node 6.2.x for heroku 2016-06-14 18:21:20 +02:00
Brett Sun 59e25ecf26 Merge pull request #206 from ascribe/refresh-sentry-token
Replace Sentry key after their security breach
2016-06-14 18:07:10 +02:00
Brett Sun 04b79777b8 Replace Sentry key after their security breach 2016-06-14 18:05:09 +02:00
Brett Sun 53ef5248ca Merge pull request #71 from ascribe/AD-1387-improve-redundancy-of-notifications
AD-1387 Improve robustness of notifications
2016-05-27 11:33:47 +02:00
Brett Sun 26dde8a42c Merge pull request #160 from ascribe/add-default-notifications-message
Discard (and log) global notifications that do not have a message specified
2016-05-27 11:33:39 +02:00
Brett Sun 75e8e90a4c Merge pull request #196 from ascribe/fix-edition-public-note-not-showing
Fix public notes not appearing in editions
2016-05-02 11:52:29 +02:00
Brett Sun af0b2109f9 Remove small unnecessary bits of logic in displaying notes 2016-05-02 11:14:52 +02:00
Brett Sun a8df08c01e Show the public note on editions
Public notes should be visible either when there is one already saved,
or if you can edit the field
2016-05-02 11:13:24 +02:00
Brett Sun e0a9d1ccba Merge pull request #195 from ascribe/AG-194-non-owners-can-edit-further-details
Set the default editable status of the MarketFurtherDetails to be false
2016-04-27 17:59:30 +02:00
Brett Sun c12a5f4977 Set the default editable status of the MarketFurtherDetails to be false
Non-owners don't get provided an acl_edit in their edition acls, so the
default behaviour of MarketAdditionalDetailsForm was to set the form to
be editable.
2016-04-25 17:32:59 +02:00
Brett Sun b3f34e21e3 Merge pull request #190 from ascribe/remove-leftover-phantomjs-launcher
Remove phantomjs launcher leftover from rebase merge
2016-04-21 16:04:34 +02:00
Tim Daubenschütz 6b147cdef9 Merge pull request #193 from ascribe/AG-162-stuck-piece-registration
Hide button and spinner in form instead of replace
2016-04-21 16:02:29 +02:00
tim abebbe2e51 Hide button and spinner in form instead of replace 2016-04-21 13:27:55 +02:00
Brett Sun b26b38f5d9 Merge pull request #192 from ascribe/AG-191-ikonotv-weird-further-details-placeholder
AG-191 IkonoTV weird further details placeholder
2016-04-21 12:17:43 +02:00
Brett Sun 702107258a Fix weird messaging IkonoTV empty further details placeholdher 2016-04-21 11:04:17 +02:00
Brett Sun 3b885a4f38 Remove phantomjs launcher leftover from rebase merge 2016-04-21 10:36:15 +02:00
Tim Daubenschütz 7c35a5de97 Merge pull request #189 from ascribe/AG-188-enable-amazon-s3-accelerate
Enable Amazon S3 Accelerate
2016-04-20 15:45:10 +02:00
tim 56b7071c87 Enable Amazon S3 Accelerate 2016-04-20 15:15:59 +02:00
Brett Sun 80a63e1c8c Merge pull request #186 from ascribe/add-error-json-to-sentry
Log error json payloads in Sentry
2016-04-13 10:45:33 +02:00
Brett Sun 8db7655a37 Remove deprecated global notification types 2016-04-13 10:39:19 +02:00
Brett Sun d995dc238b Log error json payloads in Sentry 2016-04-13 10:19:41 +02:00
Brett Sun 91cc3c63ff Merge pull request #175 from ascribe/fix-request-unexpected-end-of-input
Fix unexpected end of input exceptions from requests
2016-04-13 09:58:14 +02:00
tim 9f0cd93c28 quickfix wrong import 2016-04-07 13:51:12 +02:00
Tim Daubenschütz a4b69100c6 Merge pull request #182 from ascribe/liquid-gallery-wallet
Add Liquid Gallery Whitelabel Page
2016-04-07 13:45:50 +02:00
tim 76daa7edc2 Add Liquid Gallery Whitelabel Page 2016-04-06 16:22:03 +02:00
Tim Daubenschütz b6c8e5c65e Merge pull request #179 from ascribe/remove-unused-api-endpoint
Remove edition_index endpoint
2016-03-23 16:28:09 +01:00
tim ddebccbe1c Remove edition_index endpoint 2016-03-22 15:31:03 +01:00
Tim Daubenschütz 55dc1c997a Merge pull request #176 from ascribe/AG-172-fix-thumbnail-creation-for-videos
fix thumbnail rendering for video
2016-03-10 17:13:59 +01:00
Tim Daubenschütz 227cd2832d fix thumbnail rendering for video 2016-03-10 17:07:11 +01:00
Tim Daubenschütz fe77d73979 Merge pull request #172 from ascribe/AG-171-support-tiff-submissions
Add async tiff thumbnail encoding support
2016-03-10 15:37:29 +01:00
Brett Sun 55f53247ea Merge pull request #174 from ascribe/fix-digital-work-file-name
Use setTimeout instead of setInterval to refresh signed download urls
2016-03-10 15:32:37 +01:00
Tim Daubenschütz 7a59960255 Restrict thumbnail expansion if file is TIFF 2016-03-10 15:09:22 +01:00
Tim Daubenschütz 4fdab505e7 Restructure MediaPlayer
- encoding evaluation taken out to MediaContainer
2016-03-10 14:33:54 +01:00
Brett Sun 8f12e12bcc Move header_notification to be in sync with its component's name 2016-03-10 13:43:07 +01:00
Brett Sun 30911b5395 Make notification fetching dependent on if the current user is available 2016-03-10 13:41:36 +01:00
Brett Sun 114129588e Improve DRYness of HeaderNotification 2016-03-10 13:15:26 +01:00
Brett Sun 874aad05b8 Use empty array as initial state of piece and edition list notifications 2016-03-10 13:08:05 +01:00
Brett Sun 4cd093aaa8 Ignore global notifications that do not contain a message 2016-03-10 12:45:21 +01:00
Brett Sun 8952a607b7 Simplify error handling in requests 2016-03-10 12:16:30 +01:00
Brett Sun 30ba85d937 Fix "Unexpected end of input" JSON parse exceptions 2016-03-10 12:11:45 +01:00
Brett Sun 65c37b2c74 Use setTimeout instead of setInterval to refresh signed download urls 2016-03-10 12:06:58 +01:00