Skip to content
This repository

Add attribute s3_media_base_url #394

Closed
wants to merge 14 commits into from

2 participants

git001 Neil Williams
git001

As discussed with spladug this solution is less invasive the the pull request before.

I hope it's better now

added some commits
git001 add the s3 handling to be able to handle mybucket.s3... a5b7c9a
git001 Revert "add the s3 handling to be able to handle mybucket.s3..."
This reverts commit a5b7c9aeef764b56858fd3e8d46cfd69f16eeee6.

got better suggetion from spladug
9ebc9be
git001 Add attribute s3_media_base_url to be able to use
other s3 datacenter then the the us one
de96cf2
git001 Merge remote branch 'upstream/master' 825b682
git001 add r2/example.ini to ignore file c90662d
git001 commit populr.de first time a154b2c
git001 add defautl reddit example file 905e272
git001 Revert "add defautl reddit example file"
This reverts commit 905e272f4efc3d5e1e36bd61a45a0a819ffaf0d9.
b20261b
git001 Revert "Revert "add defautl reddit example file""
This reverts commit b20261bf61143188ded6b3238a6686a43d0f9445.
7e65347
git001 Revert "Revert "Revert "add defautl reddit example file"""
This reverts commit 7e65347cb29df36d2c49dba0cf84852ad1f48a86.
92ca5e5
git001 second comit try d541d8c
git001 Merge remote branch 'upstream/master'
Conflicts:
	r2/r2/public/static/css/reddit.css
	r2/r2/templates/promo_email.email
d5ca169
git001 commit 3rd try f7a02d7
git001 Merge branch 'master' of github.com:git001/reddit
Conflicts:
	r2/example.ini
	r2/r2/public/static/css/reddit.css
	r2/r2/templates/promo_email.email
f114227
Neil Williams
Owner

I'm sorry but I'm not sure what's going on in this pull request. If you have a working copy of this, could you open a new pull request that's cleanly rebased please?

Neil Williams spladug closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 14 unique commits by 1 author.

Mar 27, 2012
git001 add the s3 handling to be able to handle mybucket.s3... a5b7c9a
Mar 28, 2012
git001 Revert "add the s3 handling to be able to handle mybucket.s3..."
This reverts commit a5b7c9aeef764b56858fd3e8d46cfd69f16eeee6.

got better suggetion from spladug
9ebc9be
git001 Add attribute s3_media_base_url to be able to use
other s3 datacenter then the the us one
de96cf2
Apr 10, 2012
git001 Merge remote branch 'upstream/master' 825b682
Apr 11, 2012
git001 add r2/example.ini to ignore file c90662d
git001 commit populr.de first time a154b2c
git001 add defautl reddit example file 905e272
git001 Revert "add defautl reddit example file"
This reverts commit 905e272f4efc3d5e1e36bd61a45a0a819ffaf0d9.
b20261b
git001 Revert "Revert "add defautl reddit example file""
This reverts commit b20261bf61143188ded6b3238a6686a43d0f9445.
7e65347
git001 Revert "Revert "Revert "add defautl reddit example file"""
This reverts commit 7e65347cb29df36d2c49dba0cf84852ad1f48a86.
92ca5e5
git001 second comit try d541d8c
git001 Merge remote branch 'upstream/master'
Conflicts:
	r2/r2/public/static/css/reddit.css
	r2/r2/templates/promo_email.email
d5ca169
git001 commit 3rd try f7a02d7
git001 Merge branch 'master' of github.com:git001/reddit
Conflicts:
	r2/example.ini
	r2/r2/public/static/css/reddit.css
	r2/r2/templates/promo_email.email
f114227
Something went wrong with that request. Please try again.