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 |
|