Merge branch 'video-support' into group-merge

Conflicts:
	src/html/assets/themes/fabrizio1.0/config/settings.ini
	src/html/assets/themes/fabrizio1.0/javascripts/fabrizio.js
	src/html/assets/themes/fabrizio1.0/javascripts/op/Lightbox.js
	src/html/assets/themes/fabrizio1.0/stylesheets/less/components/lightbox.less
	src/html/assets/themes/fabrizio1.0/templates/partials/underscore.php

.gitignore

@@ -13,4 +13,6 @@ src/html/assets/cache
 src/plugins/*
 src/libraries/plugins/*
 src/userdata/**/*
+composer.phar
 !default
+

src/composer.json

@@ -0,0 +1,5 @@
+{
+    "require": {
+        "aws/aws-sdk-php": "2.*"
+    }
+}

src/configs/template.ini

@@ -15,6 +15,7 @@ templates="{templates}"
 themes="{themes}"
 temp="{temp}"
 userdata="{userdata}"
+vendor="{vendor}"
 
 [plugins]
 activePlugins=""

src/html/assets/javascripts/openphoto-upload.js

@@ -17,7 +17,7 @@ OPU = (function() {
         var uploaderEl = $("#uploader");
         if(uploaderEl.length === 0)
           return;
-     
+
         if(typeof(uploaderEl.pluploadQueue) == 'undefined') {
           $("#uploader .insufficient").show();
           return;
@@ -26,18 +26,19 @@ OPU = (function() {
         uploaderEl.pluploadQueue({
             // General settings
             runtimes : 'html5',
-            url : '/photo/upload.json', // omit 409 since it's somewhat idempotent
+            url : '/media/upload.json', // omit 409 since it's somewhat idempotent
             max_file_size : '32mb',
             file_data_name : 'photo',
             //chunk_size : '1mb',
             unique_names : true,
             keep_droptext : true,
-     
+
             // Specify what files to browse for
             filters : [
-                {title : "Photos", extensions : "jpg,jpeg,gif,png"}
+                {title : "Photos", extensions : "jpg,jpeg,gif,png"},
+                {title : "Videos", extensions : "mov,mp4,webm,ogg"}
             ],
-     
+
             // Flash settings
             flash_swf_url : 'plupload.flash.swf',
             multipart_params:{
@@ -108,7 +109,7 @@ OPU = (function() {
                   groups = '';
                 else if(groups !== null)
                   groups = groups.join(',');
-                
+
                 uploader.settings.multipart_params.license = license;
                 uploader.settings.multipart_params.tags = tags;
                 uploader.settings.multipart_params.permission = permission;

src/html/assets/themes/fabrizio1.0/javascripts/fabrizio.js

@@ -343,6 +343,7 @@
           running: false,
           init: function() {
             var options, _pages = TBX.init.pages, _this = _pages.photos, batchModel = _pages.photos.batchModel, $batchEl = $('.batch-meta');
+
             $(window).scroll(function() { util.scrollCb(_this); });
             _this.load();
             (new op.data.view.BatchIndicator({model:batchModel, el: $batchEl})).render();