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
Didier Lafforgue
23600edb1f
performance improvements as described in #383
2012-04-26 03:39:23 +02:00
Didier Lafforgue
260f9ae4ef
one way to avoid autosave
2012-04-05 18:02:16 +02:00
Didier Lafforgue
64ea41cbcd
one way to avoid autosave
2012-04-05 18:01:16 +02:00
Didier Lafforgue
79f958c505
create mongoDB indexes for locomotive models without any errors
2012-03-13 16:37:19 +01:00
Paul Sponagl
b13c5d1d40
added a snippet option to the liquid nav tag
...
this is useful if you want to render more than
just a page.title string within the nav list item.
(page.menue_image, page.menue_teaser...)
use nav snippet: "<liquid snippet>" to provide a string
or nav snippet: "<snippetname>" to load the snippet from db.
added page.<editable_field> for usage within liquid templates
2012-03-07 16:32:25 +01:00
Didier Lafforgue
c6e1276974
fix the broken tests
2012-02-21 01:45:45 +01:00
Didier Lafforgue
fa2cd996ce
icons for redirect and templatized pages were not displayed in the back-office + fix the random issue when getting an API token in development (very weird behaviour) + remove the default mongoid scope for pages + force the depth
2012-02-20 17:21:32 +01:00
Didier Lafforgue
02e48f5c36
fix the specs for the page model
2012-02-16 22:07:00 +01:00
did
dfd437a762
fix an issue with compass + move to rails 3.2 + switch from mongoid_acts_as_tree to mongoid_tree + implement the UI to deal with has_many field types (wip)
2012-02-01 02:01:42 +01:00
did
8979957d43
convert stylesheets in sass (wip) + fix the installation module + customize devise (wip)
2011-11-03 14:01:08 +01:00
did
99e442673c
namespace controllers, models, ...etc (wip)
2011-10-31 00:02:41 +01:00
