search

n0ne / Rails-Carrierwave-jQuery-File-Upload

Rails 3.2.3 + Carrierwave + jQuery-File-Upload
104 stars 37 forks source link

Version for showing Amazon S3 storage #6

Open shaunakv1 opened 11 years ago

shaunakv1 commented 11 years ago

Hello, Here is a version with amazon s3 support using carrierwave.

This looks like a rather big change because I have cleaned up the app/assets dir and moved the library js to vendor/assets. I have also removed the old template code in the gallery/views/show.rb which was no longer being used as the logic was moved to main.js.

Now expecting a merge as this is a different sample, but changes for moving assets to vendor dir and removing stale template code can be safely merged with the original one one.

It would be great if you could add a short link to this project in the original readme pointing out a s3 sample. :)

n0ne commented 11 years ago

I do not understand something: what links and where to add? I can do a merger, it is working, right? And there's no time to check :-)

2013/8/12 Shaunak Vairagare notifications@github.com

Hello, this looks like a rather big change because I have cleaned up the app/assets dir and moved the library js to vendor/assets. I have also removed the old template code in the gallery/views/show.rb which was no longer being used as the logic was moved to main.js.

Now expecting a merge as this is a different sample, but changes for moving assets to vendor dir and removing stale template code can be safely merged with the original one one.

It would be great if you could add a short link to this project in the

original readme pointing out a s3 sample. :)

You can merge this Pull Request by running

git pull https://github.com/shaunakv1/Rails-Carrierwave-S3-jQuery-File-Upload master

Or view, comment on, or merge it at:

https://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6 Commit Summary

  • Added amazon s3 support and extracted out the jquery-file-upload js libraries into vendor/assets
  • updated .gitignore
  • updated read me

File Changes

  • M .gitignorehttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-0(3)
  • A Fileupload.sublime-projecthttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-1(0)
  • A Fileupload.sublime-workspacehttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-2(0)
  • M Gemfilehttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-3(20)
  • M Gemfile.lockhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-4(105)
  • M README.mdhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-5(20)
  • A Rakefilehttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-6(0)
  • A app/assets/images/NoImageAvailable.jpghttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-7(0)
  • A app/assets/images/rails.pnghttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-8(0)
  • A app/assets/javascripts/application.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-9(0)
  • M app/assets/javascripts/bootstrap.js.coffeehttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-10(5)
  • A app/assets/javascripts/galleries.js.coffeehttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-11(0)
  • A app/assets/javascripts/locale.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-12(0)
  • M app/assets/javascripts/main.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-13(2)
  • A app/assets/javascripts/pictures.js.coffeehttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-14(0)
  • A app/assets/stylesheets/Jcrop.gifhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-15(0)
  • A app/assets/stylesheets/application.csshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-16(0)
  • M app/assets/stylesheets/bootstrap_and_overrides.css.lesshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-17(23)
  • A app/assets/stylesheets/closelabel.gifhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-18(0)
  • A app/assets/stylesheets/jquery.Jcrop.csshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-19(0)
  • A app/assets/stylesheets/jquery.fileupload-ui.csshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-20(0)
  • A app/assets/stylesheets/loading.gifhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-21(0)
  • A app/assets/stylesheets/nextlabel.gifhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-22(0)
  • A app/assets/stylesheets/pictures.csshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-23(0)
  • A app/assets/stylesheets/prevlabel.gifhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-24(0)
  • A app/assets/stylesheets/slimbox2.csshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-25(0)
  • A app/controllers/application_controller.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-26(0)
  • A app/controllers/galleries_controller.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-27(0)
  • M app/controllers/pictures_controller.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-28(2)
  • A app/helpers/application_helper.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-29(0)
  • A app/helpers/galleries_helper.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-30(0)
  • A app/helpers/pictures_helper.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-31(0)
  • A app/mailers/.gitkeephttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-32(0)
  • A app/models/.gitkeephttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-33(0)
  • A app/models/gallery.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-34(0)
  • A app/models/picture.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-35(0)
  • M app/uploaders/image_uploader.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-36(49)
  • A app/views/galleries/_form.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-37(0)
  • A app/views/galleries/edit.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-38(0)
  • A app/views/galleries/index.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-39(0)
  • A app/views/galleries/new.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-40(0)
  • M app/views/galleries/show.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-41(50)
  • M app/views/layouts/application.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-42(4)
  • A app/views/pictures/_form.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-43(0)
  • A app/views/pictures/destroy.js.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-44(0)
  • A app/views/pictures/edit.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-45(0)
  • A app/views/pictures/index.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-46(0)
  • A app/views/pictures/make_default.js.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-47(0)
  • A app/views/pictures/new.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-48(0)
  • A app/views/pictures/show.html.erbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-49(0)
  • A assets/.gitkeep b/lib/assets/.gitkeephttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-50(0)
  • A config.ruhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-51(0)
  • A config/application.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-52(0)
  • A config/boot.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-53(0)
  • A config/database.ymlhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-54(0)
  • A config/environment.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-55(0)
  • A config/environments/development.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-56(0)
  • A config/environments/production.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-57(0)
  • A config/environments/test.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-58(0)
  • A config/initializers/backtrace_silencers.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-59(0)
  • A config/initializers/carrierwave.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-60(8)
  • A config/initializers/inflections.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-61(0)
  • A config/initializers/mime_types.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-62(0)
  • A config/initializers/secret_token.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-63(0)
  • A config/initializers/session_store.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-64(0)
  • A config/initializers/wrap_parameters.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-65(0)
  • A config/locales/en.bootstrap.ymlhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-66(18)
  • A config/locales/en.ymlhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-67(0)
  • A config/routes.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-68(0)
  • A doc/README_FOR_APPhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-69(0)
  • A log/.gitkeephttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-70(0)
  • A migrate/20120529074915_create_galleries.rb b/db/migrate/20120529074915_create_galleries.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-71(0)
  • A migrate/20120529075041_create_pictures.rb b/db/migrate/20120529075041_create_pictures.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-72(0)
  • A migrate/20130319201121_add_token_to_gallery.rb b/db/migrate/20130319201121_add_token_to_gallery.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-73(0)
  • A migrate/20130319201547_add_gallery_token_to_picture.rb b/db/migrate/20130319201547_add_gallery_token_to_picture.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-74(0)
  • A public/404.htmlhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-75(0)
  • A public/422.htmlhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-76(0)
  • A public/500.htmlhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-77(0)
  • A public/favicon.icohttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-78(0)
  • A public/robots.txthttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-79(0)
  • A schema.rb b/db/schema.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-80(0)
  • A seeds.rb b/db/seeds.rbhttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-81(0)
  • A tasks/.gitkeep b/lib/tasks/.gitkeephttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-82(0)
  • A vendor/assets/javascripts/.gitkeephttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-83(0)
  • R vendor/assets/javascripts/bootstrap-image-gallery.min.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-84(0)
  • R vendor/assets/javascripts/canvas-to-blob.min.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-85(0)
  • R vendor/assets/javascripts/jquery.Jcrop.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-86(0)
  • R vendor/assets/javascripts/jquery.fileupload-ip.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-87(0)
  • R vendor/assets/javascripts/jquery.fileupload-ui.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-88(0)
  • R vendor/assets/javascripts/jquery.fileupload.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-89(0)
  • R vendor/assets/javascripts/jquery.iframe-transport.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-90(0)
  • R vendor/assets/javascripts/jquery.ui.widget.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-91(0)
  • R vendor/assets/javascripts/load-image.min.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-92(0)
  • R vendor/assets/javascripts/slimbox2.jshttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-93(0)
  • A vendor/assets/stylesheets/.gitkeephttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-94(0)
  • A vendor/plugins/.gitkeephttps://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6/files#diff-95(0)

Patch Links:

- https://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6.patch

https://github.com/n0ne/Rails-Carrierwave-jQuery-File-Upload/pull/6.diff

Best regards, Alexander