1
0
mirror of https://github.com/ascribe/onion.git synced 2024-06-29 00:58:03 +02:00
Commit Graph

35 Commits

Author SHA1 Message Date
Tim Daubenschütz
227cd2832d fix thumbnail rendering for video 2016-03-10 17:07:11 +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
Tim Daubenschütz
e0401de1a3 Add async tiff thumbnail encoding support
- Fixes #171
2016-03-09 16:54:11 +01:00
Tim Daubenschütz
f2c7f02480 Add component for signing S3 url 2016-02-17 11:38:01 +01:00
Tim Daubenschütz
2cb8fb2dd9 Replace bootstrap button with proper dl-link 2016-02-08 16:44:27 +01:00
Brett Sun
826ca08073 Merge with master 2016-02-05 10:38:59 +01:00
Brett Sun
2ad2ea242d Changes for PR comments 2016-01-18 17:31:56 +01:00
Brett Sun
cc9fa2378f Remove unnecessary duplication of updating encoding status in Edition
Also reduces the time between each update to 5s since 10s feels way too
long.
2016-01-12 17:55:37 +01:00
Brett Sun
eafa675760 Small code style changes 2016-01-11 17:57:35 +01:00
Brett Sun
8531b77633 Merge with master 2016-01-11 17:52:32 +01:00
Brett Sun
cc16508e64 Merge with master 2016-01-11 11:59:35 +01:00
Brett Sun
6c9e108b72 Hide unnecessary items from the piece and edition details in print 2015-12-23 09:39:02 +01:00
Brett Sun
1fc1337207 Fix React warnings 2015-12-16 17:49:47 +01:00
Brett Sun
f2f775f20c Carry down currentUser as prop to MediaContainer instead of adding state 2015-12-16 17:49:30 +01:00
Tim Daubenschütz
339421a4b7 Merge branch 'master' into AD-56-add-social-share-functionality
Conflicts:
	js/components/ascribe_detail/media_container.js
	js/components/ascribe_media/media_player.js
2015-11-16 15:54:49 +01:00
Brett Sun
cef19f427c Add comment for content registration check 2015-11-13 16:02:34 +01:00
Brett Sun
09812a1881 Forgot to unlisten to UserStore when unmounting 2015-11-13 13:33:12 +01:00
Tim Daubenschütz
66aef4886f Adjust MediaContainer and MediaPlayer to newly introduced manual-thumbnail functionality 2015-11-11 10:51:45 +01:00
Brett Sun
af58687572 Add twitter text 2015-11-10 19:33:08 +01:00
Brett Sun
a9f0a46fbd Move social share buttons to left of download button to accommodate for embed button 2015-11-10 10:29:37 +01:00
Brett Sun
8dc0470007 Add Twitter button 2015-11-09 19:01:27 +01:00
Brett Sun
d972da935a Add Facebook Share button 2015-11-09 17:46:49 +01:00
diminator
22727c2703 refactored piece container and detail 2015-08-11 17:12:12 +02:00
vrde
e9c776fec4 Add "s" to http lol 2015-08-07 14:23:59 +02:00
diminator
5c3d57ff3a Merged in AD-604-non-owner-cannot-download-pdfs-an (pull request #19)
Ad 604 non owner cannot download pdfs an
2015-07-23 15:33:54 +02:00
diminator
c415e97e42 allow download for non-renderable files 2015-07-23 15:18:58 +02:00
vrde
21f3b4504e Fix height for audio and video embed 2015-07-23 15:04:02 +02:00
diminator
e7d85d6eb8 updated thumbnails:
- support multiformat
- runs in celery (way faster registration!)

updated s3 url generation:
- anonymous "/DEPLOYMENT/USER_ID_MD5/PIECE_FILE_HASH/CATEGORY/FILENAME.EXT"
- refactored code

!!!!install postgres hstore extension
sudo apt-get install postgresql postgresql-contrib
sudo su - postgres
psql mysite_db -c 'create extension hstore;'
./manage.py migrate
2015-07-21 15:52:58 +02:00
vrde
3ad7763577 Merge branch 'AD-499-whitelabel-prize-with-sluice-as-k' of bitbucket.org:ascribe/onion into AD-499-whitelabel-prize-with-sluice-as-k
Conflicts:
	js/components/ascribe_detail/media_container.js
2015-07-15 12:21:31 +02:00
vrde
26e0957840 Fix progress bar for video encoding 2015-07-15 12:18:29 +02:00
Tim Daubenschütz
a8dd915ad7 basically reverting media player changes 2015-07-15 11:47:14 +02:00
Tim Daubenschütz
26fc2f14b3 make media container robust 2015-07-15 11:43:04 +02:00
Tim Daubenschütz
f729e3c833 add acl proxy component 2015-07-14 11:11:28 +02:00
diminator
8ac26275f5 piece view 2015-07-08 22:54:07 +02:00