Merge branch 'customdomains'

This commit is contained in:
Kyle Drake 2013-08-01 22:04:27 -04:00
commit 6389b267f2
2 changed files with 4 additions and 2 deletions

View file

@ -1,7 +1,7 @@
class Site < Sequel::Model class Site < Sequel::Model
# We might need to include fonts in here.. # We might need to include fonts in here..
VALID_MIME_TYPES = ['text/plain', 'text/html', 'text/css', 'application/javascript', 'image/png', 'image/jpeg', 'image/gif', 'image/svg+xml', 'application/vnd.ms-fontobject', 'application/x-font-ttf', 'application/octet-stream', 'text/csv', 'text/tsv', 'text/cache-manifest', 'image/x-icon'] VALID_MIME_TYPES = ['text/plain', 'text/html', 'text/css', 'application/javascript', 'image/png', 'image/jpeg', 'image/gif', 'image/svg+xml', 'application/vnd.ms-fontobject', 'application/x-font-ttf', 'application/octet-stream', 'text/csv', 'text/tsv', 'text/cache-manifest', 'image/x-icon', 'application/pdf', 'application/pgp-keys', 'text/xml', 'application/xml']
VALID_EXTENSIONS = %w{ html htm txt text css js jpg jpeg png gif svg md markdown eot ttf woff json geojson csv tsv mf ico} VALID_EXTENSIONS = %w{ html htm txt text css js jpg jpeg png gif svg md markdown eot ttf woff json geojson csv tsv mf ico pdf asc key pgp xml }
#USERNAME_SHITLIST = %w{ payment secure login signin www ww web } # I thought they were funny personally, but everybody is freaking out so.. #USERNAME_SHITLIST = %w{ payment secure login signin www ww web } # I thought they were funny personally, but everybody is freaking out so..
MAX_SPACE = (5242880*2) # 10MB MAX_SPACE = (5242880*2) # 10MB
MINIMUM_PASSWORD_LENGTH = 5 MINIMUM_PASSWORD_LENGTH = 5

View file

@ -68,6 +68,8 @@ javascript:
li CSS (.css) li CSS (.css)
li Text (.txt, .text, .csv, .tsv) li Text (.txt, .text, .csv, .tsv)
li Web Fonts (.eot, .ttf, .woff, .svg) li Web Fonts (.eot, .ttf, .woff, .svg)
li XML (.xml)
li PGP Keys (.asc, .key)
p If the file already exists, <u><b>it will be overwritten without warning</b></u>. p If the file already exists, <u><b>it will be overwritten without warning</b></u>.
p It has to be <u>legal to share this content in the United States</u>. p It has to be <u>legal to share this content in the United States</u>.