Merge branch 'master' into bootstrap
This commit is contained in:
5
.gitignore
vendored
5
.gitignore
vendored
@@ -13,3 +13,8 @@
|
||||
# Ignore all logfiles and tempfiles.
|
||||
/log/*.log
|
||||
/tmp
|
||||
|
||||
.buildpath
|
||||
.project
|
||||
.sass-cache/
|
||||
public/assets/
|
||||
|
||||
4
Gemfile
4
Gemfile
@@ -28,6 +28,10 @@ group :production do
|
||||
gem 'unicorn'
|
||||
end
|
||||
|
||||
group :development do
|
||||
gem 'sqlite3'
|
||||
end
|
||||
|
||||
# To use ActiveModel has_secure_password
|
||||
# gem 'bcrypt-ruby', '~> 3.0.0'
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ GEM
|
||||
i18n (0.6.1)
|
||||
journey (1.0.4)
|
||||
json (1.7.6)
|
||||
kgio (2.7.4)
|
||||
kgio (2.8.0)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
@@ -105,6 +105,7 @@ GEM
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sqlite3 (1.3.7)
|
||||
thor (0.16.0)
|
||||
tilt (1.3.3)
|
||||
treetop (1.4.12)
|
||||
@@ -135,5 +136,6 @@ DEPENDENCIES
|
||||
mysql2
|
||||
rails (= 3.2.11)
|
||||
sass-rails (~> 3.2.3)
|
||||
sqlite3
|
||||
uglifier (>= 1.0.3)
|
||||
unicorn
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
<html>
|
||||
<head>
|
||||
<title><%= content_for?(:title) ? yield(:title) : (t :name) %></title>
|
||||
<%= stylesheet_link_tag "application", "forum-monster" %>
|
||||
<%= stylesheet_link_tag :application %>
|
||||
<%= csrf_meta_tag %>
|
||||
<%= javascript_include_tag(:application) %>
|
||||
<%= javascript_include_tag :application %>
|
||||
<%= yield(:head) %>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -59,6 +59,8 @@ module Community
|
||||
# Version of your assets, change this if you want to expire all your assets
|
||||
config.assets.version = '1.0'
|
||||
|
||||
config.assets.precompile += ['*.css', '*.js']
|
||||
config.assets.initialize_on_precompile = false
|
||||
|
||||
config.assets.precompile += %w('*.css', '*.js')
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,20 +1,19 @@
|
||||
# SQLite version 3.x
|
||||
# gem install sqlite:w3
|
||||
development:
|
||||
adapter: mysql2
|
||||
database: forum/dev
|
||||
host: localhost
|
||||
username: forum
|
||||
password: forum
|
||||
adapter: sqlite3
|
||||
database: db/development.sqlite3
|
||||
pool: 5
|
||||
timeout: 5000
|
||||
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
# Do not set this db to the same as development or production.
|
||||
test:
|
||||
adapter: mysql2
|
||||
database: forum/test
|
||||
host: localhost
|
||||
username: forum
|
||||
password: forum
|
||||
|
||||
adapter: sqlite3
|
||||
database: db/test.sqlite3
|
||||
pool: 5
|
||||
timeout: 5000
|
||||
production:
|
||||
adapter: mysql2
|
||||
database: forum
|
||||
|
||||
@@ -14,17 +14,24 @@ Community::Application.configure do
|
||||
# Compress JavaScripts and CSS
|
||||
config.assets.compress = true
|
||||
|
||||
# Choose the compressors to use
|
||||
config.assets.js_compressor = :uglifier
|
||||
# config.assets.css_compressor = :yui
|
||||
|
||||
# Don't fallback to assets pipeline if a precompiled asset is missed
|
||||
config.assets.compile = false
|
||||
|
||||
# Generate digests for assets URLs
|
||||
config.assets.digest = true
|
||||
|
||||
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
|
||||
# config.assets.precompile += %w( )
|
||||
|
||||
# Defaults to nil and saved in location specified by config.assets.prefix
|
||||
# config.assets.manifest = YOUR_PATH
|
||||
|
||||
# Specifies the header that your server uses for sending files
|
||||
# config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
|
||||
config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
|
||||
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
|
||||
|
||||
# Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
|
||||
|
||||
@@ -1,210 +1,8 @@
|
||||
en:
|
||||
date:
|
||||
abbr_day_names:
|
||||
- Sun
|
||||
- Mon
|
||||
- Tue
|
||||
- Wed
|
||||
- Thu
|
||||
- Fri
|
||||
- Sat
|
||||
abbr_month_names:
|
||||
-
|
||||
- Jan
|
||||
- Feb
|
||||
- Mar
|
||||
- Apr
|
||||
- May
|
||||
- Jun
|
||||
- Jul
|
||||
- Aug
|
||||
- Sep
|
||||
- Oct
|
||||
- Nov
|
||||
- Dec
|
||||
day_names:
|
||||
- Sunday
|
||||
- Monday
|
||||
- Tuesday
|
||||
- Wednesday
|
||||
- Thursday
|
||||
- Friday
|
||||
- Saturday
|
||||
formats:
|
||||
default: ! '%Y-%m-%d'
|
||||
long: ! '%B %d, %Y'
|
||||
short: ! '%b %d'
|
||||
month_names:
|
||||
-
|
||||
- January
|
||||
- February
|
||||
- March
|
||||
- April
|
||||
- May
|
||||
- June
|
||||
- July
|
||||
- August
|
||||
- September
|
||||
- October
|
||||
- November
|
||||
- December
|
||||
order:
|
||||
- :year
|
||||
- :month
|
||||
- :day
|
||||
datetime:
|
||||
distance_in_words:
|
||||
about_x_hours:
|
||||
one: about 1 hour
|
||||
other: about %{count} hours
|
||||
about_x_months:
|
||||
one: about 1 month
|
||||
other: about %{count} months
|
||||
about_x_years:
|
||||
one: about 1 year
|
||||
other: about %{count} years
|
||||
almost_x_years:
|
||||
one: almost 1 year
|
||||
other: almost %{count} years
|
||||
half_a_minute: half a minute
|
||||
less_than_x_minutes:
|
||||
one: less than a minute
|
||||
other: less than %{count} minutes
|
||||
less_than_x_seconds:
|
||||
one: less than 1 second
|
||||
other: less than %{count} seconds
|
||||
over_x_years:
|
||||
one: over 1 year
|
||||
other: over %{count} years
|
||||
x_days:
|
||||
one: 1 day
|
||||
other: ! '%{count} days'
|
||||
x_minutes:
|
||||
one: 1 minute
|
||||
other: ! '%{count} minutes'
|
||||
x_months:
|
||||
one: 1 month
|
||||
other: ! '%{count} months'
|
||||
x_seconds:
|
||||
one: 1 second
|
||||
other: ! '%{count} seconds'
|
||||
prompts:
|
||||
day: Day
|
||||
hour: Hour
|
||||
minute: Minute
|
||||
month: Month
|
||||
second: Seconds
|
||||
year: Year
|
||||
errors: &errors
|
||||
format: ! '%{attribute} %{message}'
|
||||
messages:
|
||||
accepted: must be accepted
|
||||
blank: can't be blank
|
||||
confirmation: doesn't match confirmation
|
||||
empty: can't be empty
|
||||
equal_to: must be equal to %{count}
|
||||
even: must be even
|
||||
exclusion: is reserved
|
||||
greater_than: must be greater than %{count}
|
||||
greater_than_or_equal_to: must be greater than or equal to %{count}
|
||||
inclusion: is not included in the list
|
||||
invalid: is invalid
|
||||
less_than: must be less than %{count}
|
||||
less_than_or_equal_to: must be less than or equal to %{count}
|
||||
not_a_number: is not a number
|
||||
not_an_integer: must be an integer
|
||||
odd: must be odd
|
||||
record_invalid: ! 'Validation failed: %{errors}'
|
||||
taken: has already been taken
|
||||
too_long:
|
||||
one: is too long (maximum is 1 character)
|
||||
other: is too long (maximum is %{count} characters)
|
||||
too_short:
|
||||
one: is too short (minimum is 1 character)
|
||||
other: is too short (minimum is %{count} characters)
|
||||
wrong_length:
|
||||
one: is the wrong length (should be 1 character)
|
||||
other: is the wrong length (should be %{count} characters)
|
||||
template:
|
||||
body: ! 'There were problems with the following fields:'
|
||||
header:
|
||||
one: 1 error prohibited this %{model} from being saved
|
||||
other: ! '%{count} errors prohibited this %{model} from being saved'
|
||||
helpers:
|
||||
select:
|
||||
prompt: Please select
|
||||
submit:
|
||||
create: Create %{model}
|
||||
submit: Save %{model}
|
||||
update: Update %{model}
|
||||
number:
|
||||
currency:
|
||||
format:
|
||||
delimiter: ! ','
|
||||
format: ! '%u%n'
|
||||
precision: 2
|
||||
separator: .
|
||||
significant: false
|
||||
strip_insignificant_zeros: false
|
||||
unit: $
|
||||
format:
|
||||
delimiter: ! ','
|
||||
precision: 3
|
||||
separator: .
|
||||
significant: false
|
||||
strip_insignificant_zeros: false
|
||||
human:
|
||||
decimal_units:
|
||||
format: ! '%n %u'
|
||||
units:
|
||||
billion: Billion
|
||||
million: Million
|
||||
quadrillion: Quadrillion
|
||||
thousand: Thousand
|
||||
trillion: Trillion
|
||||
unit: ''
|
||||
format:
|
||||
delimiter: ''
|
||||
precision: 3
|
||||
significant: true
|
||||
strip_insignificant_zeros: true
|
||||
storage_units:
|
||||
format: ! '%n %u'
|
||||
units:
|
||||
byte:
|
||||
one: Byte
|
||||
other: Bytes
|
||||
gb: GB
|
||||
kb: KB
|
||||
mb: MB
|
||||
tb: TB
|
||||
percentage:
|
||||
format:
|
||||
delimiter: ''
|
||||
precision:
|
||||
format:
|
||||
delimiter: ''
|
||||
support:
|
||||
array:
|
||||
last_word_connector: ! ', and '
|
||||
two_words_connector: ! ' and '
|
||||
words_connector: ! ', '
|
||||
time:
|
||||
am: am
|
||||
formats:
|
||||
default: ! '%a, %d %b %Y %H:%M:%S %z'
|
||||
long: ! '%B %d, %Y %H:%M'
|
||||
short: ! '%d %b %H:%M'
|
||||
pm: pm
|
||||
# remove these aliases after 'activemodel' and 'activerecord' namespaces are removed from Rails repository
|
||||
# activemodel:
|
||||
# errors:
|
||||
# <<: *errors
|
||||
# activerecord:
|
||||
# errors:
|
||||
# <<: *errors
|
||||
|
||||
name: "Forum"
|
||||
description: "A place to discuss things"
|
||||
welcome_header: "Welcome to Forum"
|
||||
welcome_msg: "A place to discuss things"
|
||||
time:
|
||||
formats:
|
||||
default: ! '%b %d %Y'
|
||||
|
||||
Reference in New Issue
Block a user