Skip to content

Commit

Permalink
translations, views, css, new user profile
Browse files Browse the repository at this point in the history
  • Loading branch information
mateuszdw committed Jun 18, 2014
1 parent 8b73a67 commit 9e71be5
Show file tree
Hide file tree
Showing 62 changed files with 665 additions and 563 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

ruby '1.9.3'
gem 'rails', '3.2.8'
ruby '2.0.0'
gem 'rails', '3.2.17'

gem 'thin'
gem 'pg'
Expand Down
93 changes: 46 additions & 47 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.8)
actionpack (= 3.2.8)
mail (~> 2.4.4)
actionpack (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
actionmailer (3.2.17)
actionpack (= 3.2.17)
mail (~> 2.5.4)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.0)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.3)
activemodel (3.2.8)
activesupport (= 3.2.8)
sprockets (~> 2.2.1)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.8)
activemodel (= 3.2.8)
activesupport (= 3.2.8)
activesupport (3.2.8)
i18n (~> 0.6)
activeresource (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
activesupport (3.2.17)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
arel (3.0.3)
builder (3.0.4)
Expand All @@ -39,18 +39,18 @@ GEM
execjs
coffee-script-source (1.7.0)
daemons (1.1.9)
dalli (2.7.0)
dalli (2.7.2)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
execjs (2.2.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
friendly_id (4.0.10.1)
activerecord (>= 3.0, < 4.0)
galetahub-simple_captcha (0.1.3)
hashie (2.1.0)
hashie (2.1.2)
hike (1.2.3)
httpclient (2.3.4.1)
httpclient (2.4.0)
i18n (0.6.9)
journey (1.0.4)
jquery-rails (3.1.0)
Expand All @@ -60,22 +60,20 @@ GEM
json_builder (3.1.7)
activesupport (>= 2.0.0)
json
jwt (0.1.11)
multi_json (>= 1.5)
jwt (1.0.0)
libv8 (3.16.14.3)
mail (2.4.4)
i18n (>= 0.4.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memcachier (0.0.2)
mime-types (1.25.1)
multi_json (1.9.2)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
newrelic_rpm (3.7.3.204)
oauth2 (0.9.3)
newrelic_rpm (3.8.1.221)
oauth2 (0.9.4)
faraday (>= 0.8, < 0.10)
jwt (~> 0.1.8)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (~> 1.2)
Expand All @@ -92,13 +90,13 @@ GEM
omniauth-openid (1.0.1)
omniauth (~> 1.0)
rack-openid (~> 1.3.1)
paper_trail (3.0.1)
paper_trail (3.0.2)
activerecord (>= 3.0, < 5.0)
activesupport (>= 3.0, < 5.0)
pg (0.17.1)
polyamorous (0.6.4)
activerecord (>= 3.0)
polyglot (0.3.4)
polyglot (0.3.5)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
Expand All @@ -109,41 +107,42 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.8)
actionmailer (= 3.2.8)
actionpack (= 3.2.8)
activerecord (= 3.2.8)
activeresource (= 3.2.8)
activesupport (= 3.2.8)
rails (3.2.17)
actionmailer (= 3.2.17)
actionpack (= 3.2.17)
activerecord (= 3.2.17)
activeresource (= 3.2.17)
activesupport (= 3.2.17)
bundler (~> 1.0)
railties (= 3.2.8)
railties (= 3.2.17)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.2)
rails_stdout_logging (0.0.3)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
railties (3.2.17)
actionpack (= 3.2.17)
activesupport (= 3.2.17)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.2.2)
rake (10.3.2)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
rmagick (2.13.2)
ruby-openid (2.5.0)
sass (3.3.4)
sass (3.3.8)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
simple-navigation (3.13.0)
activesupport (>= 2.3.2)
sprockets (2.1.3)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
squeel (1.1.1)
Expand All @@ -163,7 +162,7 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.39)
uglifier (2.5.0)
uglifier (2.5.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
will_paginate (3.0.5)
Expand All @@ -187,7 +186,7 @@ DEPENDENCIES
omniauth-openid
paper_trail (~> 3.0.1)
pg
rails (= 3.2.8)
rails (= 3.2.17)
rails_12factor
rmagick
sass-rails (~> 3.2.3)
Expand Down
Binary file modified app/assets/images/content/accept.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/content/resolved.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 0 additions & 15 deletions app/assets/stylesheets/admin.css
Original file line number Diff line number Diff line change
@@ -1,15 +0,0 @@
#content table th{
border: 1px solid #AAAAAA;
background-color: #666666;
padding:3px;
color:#FFFFFF;
}

#content table td{
border-bottom: 1px solid #DDDDDD;
padding:4px 5px;
}

#content table {
border-collapse:collapse;
}
Loading

0 comments on commit 9e71be5

Please sign in to comment.