55e206ae67
Merge branch 'master' into stable
2008-10-20 16:38:20 +01:00
58090cbb4d
Revert "Added streamscript option if video_store is set as filesystem"
...
This reverts commit ba7878ac22
2008-10-20 16:36:24 +01:00
24e07910a6
Merge branch 'stable' of git@github.com:newbamboo/panda into stable
2008-10-20 13:43:05 +01:00
0459a3ab31
Fixed failed test
2008-10-20 13:42:43 +01:00
05ea845a35
Merge branch 'stable'
2008-10-17 23:36:37 +01:00
12e629fb98
UUID bugfix - difference in API between versions.
2008-10-17 22:15:11 +01:00
840f3b07d4
Tweak README
2008-10-14 17:56:13 +01:00
9478f3139b
Removed README_EC2 because it's not worth keeping in sync with pandastream.com
2008-10-14 17:55:39 +01:00
8f46df5087
Merge branch 'master' of git@github.com:newbamboo/panda
2008-10-14 17:49:57 +01:00
efc99a4e4a
Rename README so that github formats it as markdown.
2008-10-14 17:39:01 +01:00
e5229f3124
Updated the README file
...
* Now contains local installation guide (as posted to website).
* Cleaned up the rest of the test.
* Now points to pandastream.com in case people find panda though github
2008-10-14 17:35:12 +01:00
76383ae3d3
- Fixed failed spec
2008-10-14 16:41:16 +01:00
d69df11951
-Added swfobject2.js to embedded javascript
2008-10-14 15:38:11 +01:00
ba7878ac22
Added streamscript option if video_store is set as filesystem
2008-10-14 15:37:44 +01:00
525ba747d4
Clean up init file.
2008-10-14 13:13:26 +01:00
56ba4bfd64
Let merb autoload lib directory.
2008-10-14 13:07:01 +01:00
9c93539e2a
Move S3 bucket creation into S3Store class (to keep all S3 stuff in one place)
...
* Kept same public API - Panda::Setup.create_s3_bucket
2008-10-14 12:58:23 +01:00
5621d986cb
Moved core extensions into their own directory in lib.
2008-10-14 12:55:27 +01:00
3efda2161e
Removed rog - not being used.
2008-10-14 12:54:06 +01:00
56b6732371
Moved notifier and encoder into bin directory.
...
* Allows us to autoload the lib directory.
* Also that's where they should be - they're scripts!
2008-10-14 12:36:40 +01:00
45e2047a0f
Don't display a crazy UUID on the login page.
2008-10-13 13:29:32 +01:00
3c664123ca
Last commit really didn't work as expected. This should do the trick.
2008-10-13 13:25:00 +01:00
7bebb43ccc
Push thumbnail updating into a render_then_call block.
...
* S3 isn't that speedy and sometimes causes the admin page to timeout.
2008-10-13 13:13:53 +01:00
4a0ec9a2cb
Minor rearranging.
2008-10-13 12:22:04 +01:00
a24b67a7ae
Merge commit 'edward/datamapper-simpledb-adapter'
...
Conflicts:
config/init.rb
lib/panda.rb
2008-10-13 12:20:19 +01:00
dfa645dee1
Fixed catch-22 where you couldn't create a domain unless it already existed :)
2008-10-13 11:28:19 +01:00
3d30c9732f
Yet more details and typo corrections for example config file.
2008-10-10 18:30:52 +01:00
25c0b847be
Further clarification to the example config file.
2008-10-10 17:17:51 +01:00
3935bea988
Bugfix: need to generate thumbnail for original video even if not changeable.
...
* Original thumbnail is now used in the Panda admin UI.
2008-10-10 16:54:57 +01:00
78d1a6dd8e
Bugfix for tests.
2008-10-10 16:50:42 +01:00
4efefd22a3
Reads s3 bucket name and SimpleDB domains from config when creating them.
...
* Panda::Setup.create_s3_bucket now creates s3 bucket
* Panda::Setup.create_sdb_domains now creates all sdb domains.
2008-10-10 16:40:48 +01:00
9a33fc5369
Sanitycheck Panda config on load and clean up the example config file
...
* Clearer example config file with more documentation
* Made defaults more sensible.
* Checks that all required config options have been set
* Warns if no encoding profiles exist.
2008-10-10 16:37:56 +01:00
25d813e450
Bugfix in init when using case sensitive filesystem.
2008-10-10 16:30:37 +01:00
3991b53322
Merge branch 'massive_refactoring'
...
Conflicts:
app/models/video.rb
2008-10-09 16:53:48 +01:00
de0268a460
Added Panda::Config[:sdb_base_url] for local sdb testing
2008-10-09 11:45:35 -04:00
d44f0b06d4
Added detail to README dependencies
2008-10-09 11:43:40 -04:00
1c9150d4b9
Nice style for the 'pick a thumbnail' pages (was unstyled).
2008-10-09 16:32:55 +01:00
fd9cd9c085
Remove unimplemented profiles controller (not used anywhere).
2008-10-09 16:27:46 +01:00
608145f1f3
Remove recent encodings from the dashboard since it doesn't actually work.
...
* SimpleDB problem with using limit and order at the same time.
2008-10-09 16:22:31 +01:00
a363fce634
Improve the HTML for the videos index page.
...
* Shows video thumbnails
* Groups original video with all encodings
2008-10-09 16:17:49 +01:00
208cdc15c6
Upload default clipping for original video as well as for encodings
...
* This will be used in the UI.
2008-10-09 15:56:19 +01:00
f7a2d300cd
Cleanup and move more logic out of Videos upload action
...
* Moved video processing logic out of the Videos upload action
* Teseted processing code in isolation in Video
* Updated and cleaned up specs on Videos controller
2008-10-09 13:30:26 +01:00
a114cc2e32
Merge branch 'edit_thumbnail' into massive_refactoring
...
Conflicts:
app/controllers/videos.rb
2008-10-09 10:48:29 +01:00
d5a134ad80
Remove sleep timeout on video/create action for now.
...
It's annoying and I'm not convinced that the problem it solves still exists.
2 second delay introduced in commit 2de31cb0
2008-10-08 18:39:05 +01:00
0e4d2176b8
Convert thumbnail position percentages to integers. Makes filenames much
...
shorter and removes the risk of floating point errors causing hard to diagnose
problems with filenames not matching.
2008-10-08 18:34:34 +01:00
9551906925
* All clippings now uploaded to store
...
* Tempoary local files are cleared up
2008-10-08 18:27:40 +01:00
3ad4902bb4
Refactor Clipping so that it is initialized with a position (makes things simpler).
...
Allow all clippings to be uploaded to store (not just the default one).
2008-10-08 16:37:54 +01:00
b0374bdcc0
Extracted private_filepath into LocalStore and speced this module.
2008-10-08 13:29:40 +01:00
d5a2e97694
Check that required directories exist when Panda starts.
2008-10-08 13:13:05 +01:00
3080e017b1
Test methods relating to thumbnail selection on video (also fixed bug in logic)
2008-10-08 12:30:33 +01:00
Makoto Inoue
Martyn Loughran
Martyn Loughran
Edward Ocampo-Gooding