Marko Iskander
|
02ea6913e3
|
Merge branch 'master' into wildcards
Conflicts:
Gemfile.lock
app/assets/javascripts/locomotive/models/page.js.coffee
app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee
app/models/locomotive/extensions/site/locales.rb
app/models/locomotive/page.rb
app/views/locomotive/pages/_form.html.haml
config/initializers/haml.rb
config/locales/default.ru.yml
config/locales/formtastic.ru.yml
doc/TODO
lib/locomotive/haml.rb
script/upgrade_v1.rb
spec/dummy/config/initializers/haml.rb
|
2012-05-22 20:39:30 -04:00 |
|
PitOn
|
23f162f0b3
|
added missing ru translations for upcoming 2.0 version
|
2012-04-18 16:16:46 +04:00 |
|
Didier Lafforgue
|
e26febdaf6
|
refactoring (wip)
|
2012-04-06 12:23:11 +02:00 |
|
PitOn
|
6945bed820
|
liquid syntax translated mistake
|
2011-09-16 11:23:03 +04:00 |
|
PitOn
|
a1d976ace1
|
default.ru.yml finished
|
2011-08-29 23:52:42 +04:00 |
|
PitOn
|
d9dafd2222
|
default.yml translations
|
2011-08-27 06:27:14 +04:00 |
|
GarPit
|
75e6f2cd08
|
more translations
|
2011-08-17 18:28:49 +04:00 |
|
GarPit
|
09689a0cc9
|
initial ru translation
|
2011-08-12 15:32:37 +04:00 |
|