Permalink
Browse files

More forgiving of bad PHP responses (v4.0.16)

  • Loading branch information...
1 parent 6964d7e commit 35e05dcb2496fb83164df16a27a5497b8e014051 Doug Anarino committed Jun 4, 2016
Showing with 6,192 additions and 6,173 deletions.
  1. +11 −11 README.md
  2. +283 −283 app/app.css
  3. +21 −21 app/index.html
  4. +44 −33 app/index.max.html
  5. +18 −18 app/module/chromakey/chromakey-effect.html
  6. +4 −4 app/module/chromakey/chromakey-effect.json
  7. +4 −4 app/module/color/theme.html
  8. +9 −9 app/module/color/theme.json
  9. +75 −75 app/module/colorchannelmixer/grayscale-effect.json
  10. +75 −75 app/module/colorchannelmixer/sepia-effect.json
  11. +43 −43 app/module/convolution/blur-effect.json
  12. +27 −27 app/module/convolution/emboss-effect.json
  13. +27 −27 app/module/convolution/sharpen-effect.json
  14. +24 −24 app/module/crossfade/transition.json
  15. +18 −18 app/module/font/blackout/font.json
  16. +8 −8 app/module/font/chunk/font.json
  17. +7 −7 app/module/font/fascinate/font.json
  18. +7 −7 app/module/font/graduate/font.json
  19. +7 −7 app/module/font/happyhero/font.json
  20. +8 −8 app/module/font/josefin/font.json
  21. +7 −7 app/module/font/luckiestguy/font.json
  22. +7 −7 app/module/font/philosopher/font.json
  23. +14 −14 app/module/font/tangerine/font.json
  24. +21 −21 app/module/overlay/constrained-merger.json
  25. +11 −11 app/module/overlay/direction-merger.json
  26. +14 −14 app/module/overlay/merger.html
  27. +20 −20 app/module/overlay/overlay-merger.json
  28. +20 −20 app/module/pan/scaler.html
  29. +156 −156 app/module/pan/scaler.json
  30. +7 −7 app/module/scale/scaler.html
  31. +31 −31 app/module/scale/scaler.json
  32. +42 −42 app/module/text/effect.html
  33. +47 −47 app/module/text/effect.json
  34. +46 −46 app/module/text/theme.html
  35. +61 −61 app/module/text/theme.json
  36. +25 −25 app/php/export_complete.php
  37. +19 −19 app/php/export_init.php
  38. +49 −49 app/php/export_monitor.php
  39. +12 −12 app/php/export_progress.php
  40. +49 −49 app/php/export_transfer.php
  41. +10 −10 app/php/import_api.php
  42. +30 −30 app/php/import_complete.php
  43. +10 −10 app/php/import_init.php
  44. +50 −50 app/php/import_monitor.php
  45. +12 −12 app/php/import_progress.php
  46. +70 −70 app/php/import_transfer.php
  47. +71 −71 app/php/import_upload.php
  48. +395 −395 app/php/include/apiutils.php
  49. +11 −11 app/php/include/archiveutils.php
  50. +52 −52 app/php/include/authutils.php
  51. +86 −86 app/php/include/configutils.php
  52. +165 −165 app/php/include/datautils.php
  53. +216 −216 app/php/include/fileutils.php
  54. +37 −37 app/php/include/floatutils.php
  55. +77 −77 app/php/include/httputils.php
  56. +6 −6 app/php/include/idutils.php
  57. +5 −5 app/php/include/jsonutils.php
  58. +9 −9 app/php/include/loadutils.php
  59. +19 −19 app/php/include/logutils.php
  60. +156 −156 app/php/include/mimeutils.php
  61. +33 −33 app/php/include/pathutils.php
  62. +249 −249 app/php/include/serviceutils.php
  63. +11 −11 app/php/mash.php
  64. +31 −31 app/php/media.php
  65. +12 −12 app/php/save.php
  66. +78 −78 app/php/service/local.php
  67. +6 −6 app/php/service/s3.php
  68. +13 −15 app/php/service/sqs.php
  69. +5 −5 app/views/inspector/effect_font.html
  70. +9 −9 app/views/inspector/effects.html
  71. +1 −1 app/views/inspector/effects_item.html
  72. +5 −5 app/views/inspector/font.html
  73. +4 −4 app/views/inspector/frames.html
  74. +7 −7 app/views/inspector/gain.html
  75. +2 −2 app/views/inspector/label.html
  76. +6 −6 app/views/inspector/mash.html
  77. +5 −5 app/views/inspector/merger.html
  78. +5 −5 app/views/inspector/scaler.html
  79. +4 −4 app/views/inspector/trim.html
  80. +208 −208 app/views/panels.html
  81. +5 −5 app/views/timeline/clip.html
  82. +1 −1 app/views/ui.html
  83. +30 −30 bower.json
  84. +5 −5 bower_components/moviemasher.js/.bower.json
  85. +6 −4 bower_components/moviemasher.js/README.md
  86. +1 −1 bower_components/moviemasher.js/bower.json
  87. +1 −0 bower_components/moviemasher.js/config/docker/grunt/{grunt.yml → docker-compose.yml}
  88. +2 −1 bower_components/moviemasher.js/dist/moviemasher.js
  89. +1 −1 bower_components/moviemasher.js/dist/moviemasher.min.js
  90. +1 −1 bower_components/moviemasher.js/package.json
  91. +1 −0 bower_components/moviemasher.js/src/others/loader.js
  92. 0 config/docker/development/{development.yml → docker-compose.yml}
  93. +1 −0 config/docker/grunt/{grunt.yml → docker-compose.yml}
  94. 0 config/docker/production/{production.yml → docker-compose.yml}
  95. +5 −5 config/index.html
  96. +1,275 −1,273 dist/angular-moviemasher.js
  97. +1 −1 dist/angular-moviemasher.min.js
  98. +23 −23 package.json
  99. +1,274 −1,272 src/angular-moviemasher.js
View
@@ -42,11 +42,11 @@ To stop and remove the containers:
- `docker stop moviemasher_rb`
- `docker rm moviemasher_rb`
-The project also includes several docker-compose files in version 2 format, so you might need to update your Docker installation in order to utilize them. The simplest does what the commands above do, after download the repository and `cd` into its project directory and execute:
-- `docker-compose --file config/docker/production/production.yml up -d`
+The project also includes several docker-compose files in version 2 format, so you might need to update your Docker installation in order to utilize them. The simplest does what the commands above do - after downloading the repository `cd` into the *config/docker/production* directory and execute:
+- `docker-compose up -d`
To stop and remove the containers:
-- `docker-compose --file config/docker/production/production.yml down -v`
+- `docker-compose down -v`
See Developer Setup below for several other helpful docker-compose files.
@@ -107,32 +107,32 @@ Docker is used extensively to develop this project, specifically to update compo
- `composer install`
-Or if docker is being used...
+Or if docker is being used `cd` into the *config/docker/grunt* or *config/docker/composer* directory and execute...
-- `docker-compose --file config/docker/grunt/grunt.yml run --rm grunt`
+- `docker-compose run --rm grunt`
-- `docker-compose --file config/docker/grunt/grunt.yml run --rm grunt bower install --production`
+- `docker-compose run --rm grunt bower install --production`
-- `docker-compose --file config/docker/composer/composer.yml run --rm composer`
+- `docker-compose run --rm composer`
It's also possible to run Movie Masher entirely from source code by first downloading the other two Movie Masher projects into the same directory that contains this repository:
- [moviemasher.js](https://github.com/moviemasher/moviemasher.js)
- [moviemasher.rb](https://github.com/moviemasher/moviemasher.rb)
-Then to make Movie Masher available at your Docker IP on port 8080:
+Then to make Movie Masher available at your Docker IP on port 8080, `cd` into the *config/docker/development* directory and execute:
-- `docker-compose --file config/docker/development/development.yml up -d`
+- `docker-compose up -d`
This essentially does the same as the `production` docker-compose command above, but actually builds special `development` images from source. It also mounts the relevant directories from each project, so changes to them can be made during runtime. Changes made to JavaScript typically require grunt be run (see above) and changes made to moviemasher.rb require that its container be restarted:
-- `docker-compose --file config/docker/development/development.yml restart moviemasher_rb`
+- `docker-compose restart moviemasher_rb`
If any errors are encountered during transcoding, the job related files from moviemasher.rb will all be in `tmp/error`, including its log. And there might be additional information in the logs for both projects in the `log` directory.
To stop and remove the containers:
-- `docker-compose --file config/docker/development/development.yml down -v`
+- `docker-compose down -v`
#### Known issues in this version
- timeline allows clips to be positioned atop one another
Oops, something went wrong.

0 comments on commit 35e05dc

Please sign in to comment.