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 |
|
did
|
4d1b986f1b
|
fix broken tests + make the editing of locales more robust
|
2012-04-10 04:55:59 -07:00 |
|
Didier Lafforgue
|
ed15c0d6b5
|
templatized pages can have now sub pages
|
2012-03-26 16:31:28 +02:00 |
|
Didier Lafforgue
|
02e48f5c36
|
fix the specs for the page model
|
2012-02-16 22:07:00 +01:00 |
|
Didier Lafforgue
|
73b559260e
|
fix specs for the content_type and editable_element models
|
2012-02-16 16:17:30 +01:00 |
|
did
|
b5fa2c761a
|
change the location url for the API responses + force the use of the default site locale when creating a new entry, content type or page
|
2012-01-26 07:51:32 -08:00 |
|
did
|
c0b8587eb2
|
rename the i18n site module into locales in order to avoid conflicts with the original i18n + rendering a page according to a locale specified in the url seems to work (tests are following)
|
2012-01-26 02:33:39 +01:00 |
|
Mario Visic
|
4622c4359f
|
Fixed up a failing test due to the i18n module, left a fixme note.
|
2012-01-15 15:05:31 +11:00 |
|
did
|
01c5de36a5
|
add the ui element to select the languages for a site
|
2012-01-09 17:24:34 -08:00 |
|
did
|
0f1b4f59d3
|
listing all entries (done) + fix bugs + tweak ui
|
2012-01-04 02:07:53 +01:00 |
|
did
|
5d271239b7
|
the screen for editing site has been refactored
|
2011-11-29 14:58:19 +01:00 |
|
did
|
35012ca2b2
|
polishing the current site editing screen (wip)
|
2011-11-29 02:24:02 +01:00 |
|
did
|
71d48fe726
|
refactor the current site editing screen (screen)
|
2011-11-27 08:22:54 -08:00 |
|
did
|
cffe64f6be
|
rebuilding the editing page for the site (wip)
|
2011-11-25 15:10:56 +01:00 |
|
did
|
72c2cb2059
|
rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip)
|
2011-11-19 15:47:56 +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 |
|