126 Commits

Author SHA1 Message Date
SunDwarf d8ab184531 Python2 is dumb. 2015-09-28 16:34:59 +01:00
SunDwarf 2bbc292b7f Update README.md 2015-08-29 14:23:23 +01:00
SunDwarf da771c6be7 Use coverage scripts. 2015-08-29 14:20:09 +01:00
SunDwarf 5268b76d50 Merge branch 'master' of ssh://github.com/e-dard/flask-s3 2015-08-28 20:20:43 +01:00
SunDwarf 1f9cf2a2c9 I don't even know 2015-08-28 20:20:31 +01:00
SunDwarf 8259049138 Force HTTPS by default. 2015-08-28 20:19:18 +01:00
S D 8956dc6120 Merge pull request #40 from e-dard/pr-resolving
Merge in recent changes
2015-08-28 20:10:39 +01:00
SunDwarf 6bc0039680 Merge pull request #33 properly. 2015-08-28 20:09:45 +01:00
SunDwarf cbd2140644 Prevent url_for from building when app.testing is True/existing.
Closes #23.
2015-08-28 19:52:41 +01:00
SunDwarf d1f544adf6 Add Python 3 support, and merge #38. 2015-08-28 18:09:26 +01:00
Franklyn Tackitt 5281633ba5 Fix requirement in docs/requirements.txt, fix test 2015-08-21 10:56:08 -07:00
Franklyn Tackitt e39fc3e3ed Fix compatibility with old .file-hashes files
boto3 uploads /some/key to bucket//some/key, leaving part of the path
with "//", or a folder without a name. To remedy this, I had lstrip'd
the / from the key before upload. I didn't think about the fact that
boto2 works fine with this, and the old .file-hashes file would have the
keys with the prefixing forward slash. This solves that
2015-08-20 16:33:19 -07:00
Franklyn Tackitt 34cc79dcae Update to boto3 instead of boto
Reduce the total number of S3 calls by combining put_object with the
metadata and ACLs.
2015-08-20 16:21:45 -07:00
Jeremy Epstein ae2f3fbb49 fix keyerror if S3_HEADERS isn't set in config 2015-04-08 14:12:23 +10:00
Jeremy Epstein 72c05e72aa update docs to advise that S3_FILEPATH_HEADERS can't be used for CORS headers. 2015-03-31 14:32:57 +11:00
Jeremy Epstein 93879c1bff new S3_FILEPATH_HEADERS setting, to set custom headers only if the filepath matches certain configured regular expressions. 2015-03-31 14:02:52 +11:00
Jeremy Epstein f6b7672656 instead of just checking 'relative_folder', check relative_folder + indiv. file name (and remove leading slash). 2015-03-31 10:21:59 +11:00
Jeremy Epstein df96e2e182 new parameter 'filepath_filter_regex' in create_all() and _gather_files(), to optionally only sync files in certain static dirs to S3. 2015-03-30 16:19:43 +11:00
Erik Taubeneck 142aa929a7 Merge pull request #28 from DisruptiveLabs/master
Fix uploading assets on windows machines
2014-12-19 11:54:58 -05:00
Erik Taubeneck 033f8ae958 Merge branch 'pr/21'
Conflicts:
	flask_s3.py
2014-12-19 10:15:46 -05:00
Frank Tackitt 683f0fb522 Fix uploading assets on windows machines 2014-07-22 10:40:18 -07:00
Erik Taubeneck 4874b9bedd update boto version for tests 2014-07-16 12:10:43 -04:00
Erik Taubeneck 79de571eb0 formatting fixes 2014-07-16 11:57:35 -04:00
Erik Taubeneck e2701738bb add region config option, use boto.s3.connect_to_region 2014-07-16 11:57:17 -04:00
Erik Taubeneck cb1e46b6e9 bump version number to 0.1.7 2014-06-23 14:42:16 -04:00
Erik Taubeneck 9a8c25c56b Merge pull request #26 from andrewsnowden/checksums
Only upload files that have been modified
2014-06-23 14:35:23 -04:00
Andrew Snowden 8e3af19c60 Tests for only uploading modified files 2014-06-23 18:17:36 +02:00
Andrew Snowden ca440a285f Fix elif to else 2014-05-30 14:47:41 +02:00
Andrew Snowden 9ee8545918 Only upload modified files to S3 to improve speed 2014-05-30 14:45:02 +02:00
Erik Taubeneck 948b174ff3 Merge pull request #25 from andrewsnowden/reuse-existing
Fix BucketAlreadyOwnedByYou on non default S3 regions
2014-05-30 00:12:07 -04:00
Andrew Snowden ca86134782 Work around BucketAlreadyOwnedByYou
Buckets outside of the standard region will raise an error if you try
create them and they already exist. See:
https://forums.aws.amazon.com/thread.jspa?threadID=119095
2014-05-29 18:23:29 +02:00
Joe Friedl 4a73903306 Make docs for S3_URL_STYLE less redundant 2014-02-10 13:48:55 -05:00
Joe Friedl 2883db1e3d Make S3 URL style configurable 2014-02-10 13:45:49 -05:00
Joe Friedl c2c002ff2d Add a default for S3_URL_STYLE 2014-02-10 13:29:57 -05:00
Joe Friedl 1cbaa942d0 Add docs for the S3_URL_STYLE setting 2014-02-10 13:22:54 -05:00
Edd Robinson eba97b4ea6 added some tracking information 2014-01-07 15:58:47 +00:00
Erik Taubeneck a58434245c config-defaults: bump version number again (missed last one) 2013-12-06 14:22:36 -05:00
Erik Taubeneck b756b46612 config-defaults: updated docs and version bump 2013-12-06 14:15:29 -05:00
Erik Taubeneck f20d245346 config-defualts: update test to rebuild app to test USE_S3_DEBUG settings 2013-12-06 14:15:28 -05:00
Erik Taubeneck 42104fe288 config-default: check for app.debug in init_app rather than each call to url_for 2013-12-06 14:15:28 -05:00
Erik Taubeneck e7706e2129 Merge pull request #11 from naudo/master
Fixed a broken link to the latest docs
2013-09-30 15:09:40 -07:00
Nicholas Audo e140341027 Fixed a broken link to the latest docs 2013-09-30 11:39:28 -07:00
Edd Robinson 3720621a5a Added maintainers 2013-09-27 09:55:05 +01:00
Edd Robinson 478b636395 version bump 2013-09-24 10:18:32 +01:00
Edward Robinson 74123c04c2 Merge pull request #8 from eriktaubeneck/master
Added support for AWS CloudFront (or any other CDN)
2013-06-12 15:12:04 -07:00
Erik Taubeneck 630deb7c6d added name to CONTRIBUTORS 2013-06-12 11:28:46 -04:00
Erik Taubeneck 34445db516 added tests for S3_CDN_DOMAIN support 2013-06-12 11:28:03 -04:00
Erik Taubeneck a24098adc0 added S3_CDN_DOMAIN support 2013-06-12 11:28:03 -04:00
Edward Robinson a7b815292a Merge pull request #7 from hannseman/master
Adds support for setting custom HTTP headers, on files uploaded to S3
2013-06-11 05:09:58 -07:00
Hannes Ljungberg c07be84a57 Check for S3_USE_CACHE_CONTROL boolean 2013-06-11 01:41:35 +02:00