Merge branch 'master' of github.com:neocities/neocities

This commit is contained in:
Kyle Drake 2017-03-27 11:37:28 -07:00
commit e555f6e6b2
3 changed files with 6 additions and 4 deletions

View file

@ -102,26 +102,26 @@ class Site < Sequel::Model
PLAN_FEATURES[:supporter] = {
name: 'Supporter',
space: Filesize.from('10GB').to_i,
space: Filesize.from('20GB').to_i,
bandwidth: Filesize.from('2TB').to_i,
price: 5,
unlimited_site_creation: true,
custom_ssl_certificates: true,
no_file_restrictions: true,
custom_domains: true,
maximum_site_files: 50000
maximum_site_files: 100_000
}
PLAN_FEATURES[:free] = PLAN_FEATURES[:supporter].merge(
name: 'Free',
space: Filesize.from('100MB').to_i,
space: Filesize.from('1GB').to_i,
bandwidth: Filesize.from('200GB').to_i,
price: 0,
unlimited_site_creation: false,
custom_ssl_certificates: false,
no_file_restrictions: false,
custom_domains: false,
maximum_site_files: 5000
maximum_site_files: 15_000
)
EMAIL_VALIDATION_CUTOFF_DATE = Time.parse('May 16, 2016')

View file

@ -4,6 +4,7 @@
<!--[if (gt IE 9)|!(IE)]><!--><html lang="en"><!--<![endif]-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="manifest" href="/manifest.json">
<title>Neocities: Create your own free website!</title>
<meta itemprop="name" content="Neocities" />

View file

@ -3,6 +3,7 @@
<head>
<title><%= title %></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="manifest" href="/manifest.json">
<meta itemprop="name" content="Neocities.org">
<meta itemprop="description" content="Free web hosting and tools that allow anyone to create a website. Join our community today!">
<meta name="description" content="Free web hosting and tools that allow anyone to create a website. Join our community today!">