ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity
2,483 Commits 115 Branches 0 Tags 13 MiB
Commit Graph

29 Commits

Author SHA1 Message Date
Brett Sun 84ee8f6a9b Use the right property on Image for previewing 2015-12-16 17:50:09 +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 00d93d912b Move 3rd party api urls to AppConstants 2015-11-13 13:33:27 +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 7c73b7fac7 Refactor InjectInHeadMixin to be a util class instead 2015-11-09 14:32:14 +01:00
vrde 1a6ddf67ac Add fall back if client cannot load 3rd party libs 2015-10-20 14:16:49 +02:00
Tim Daubenschütz f42f4a02f8 Merge remote-tracking branch 'origin/master' into AD-917-show-progress-when-uploading 
Resolve merge conflicts with master for easier PR.

Conflicts:
	js/components/ascribe_uploader/react_s3_fine_uploader.js
 2015-09-14 11:14:02 +02:00
Tim Daubenschütz 801227cfee remove react-progress-bar for react-bootstrap progressbar 2015-09-09 14:11:52 +02:00
vrde 4a4d4ac737 Add support for long file names 2015-09-03 16:19:02 +02:00
vrde 91078bfdd9 Fix comment 2015-07-29 18:24:54 +02:00
vrde 8f52d8bf87 Comment the solution 2015-07-29 18:19:04 +02:00
vrde ef61470b5f First iteration 2015-07-29 18:00:49 +02:00
Tim Daubenschütz a199fd08c1 replace es6-promise with Q 2015-07-24 13:44:28 +02:00
diminator 35051bf67b fixed media player text 2015-07-21 17:29:58 +02:00
diminator af59c70364 fixed media player text 2015-07-21 16:59:19 +02:00
diminator 11fb512763 s3 urls anonymous and refactored 
zencoder with multiple thumbnail sizes
 2015-07-20 18:59:32 +02:00
Tim Daubenschütz c945fc315b various visual changes 2015-07-08 14:37:20 +02:00
Tim Daubenschütz e56fbbac2b fix polling endless loop 2015-07-08 13:05:15 +02:00
vrde 1d6e3cd26c Add progressbar for encoding 2015-07-03 15:05:14 +02:00
vrde c2c0fd3ab8 Add audio player 2015-07-02 18:27:09 +02:00
vrde 7f8a36b99a Add videojs and styles 2015-07-02 17:10:32 +02:00
vrde 5165fa6c8c Fix https schema for jquery 2015-06-17 10:16:28 +02:00
vrde dfd4435e27 Fix baseUrl to load shmui 2015-06-16 14:42:36 +02:00
vrde a1bfbb8f86 [wip] add server to serve app 2015-06-08 15:24:58 +02:00
vrde 62cc6b41df Lint code 2015-06-05 14:14:59 +02:00
vrde a4b3438a2d Add shmui to handle images 2015-06-05 13:15:31 +02:00
vrde 8f65aa7a2d Add "other" type display 2015-06-04 17:37:46 +02:00
vrde ff6855970e Still working on image preview 2015-06-04 17:23:40 +02:00
vrde 13caad7794 Refactor and restyle 2015-06-04 16:15:59 +02:00