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
|
1ae9557515
|
back to the original editable_short_text (#349)
|
2012-04-14 13:38:47 +02:00 |
|
Didier Lafforgue
|
14596a5443
|
fix a couple of annoying engine bugs + implement the first version of the find tag
|
2012-04-10 17:44:13 +02:00 |
|
Didier Lafforgue
|
e26febdaf6
|
refactoring (wip)
|
2012-04-06 12:23:11 +02:00 |
|
Didier Lafforgue
|
a9aeffba9b
|
it is now possible to change the response type of a page + correct translations in French
|
2012-03-22 19:20:31 +01:00 |
|
Didier Lafforgue
|
62eaeb10f5
|
templatized page can now use models from the main app + add new liquid filters
|
2012-02-10 00:57:57 +01:00 |
|
did
|
25e08596ef
|
refactor the code (move some pieces of code into the custom_fields gem) + solve a ton of bugs: circular dependencies inside the content_entry presenter, fix Locomotive.mounted_on (broken in rails 3.2), js errors when creating a page, locale switcher broken if a page was not translated in the target locale
|
2012-02-04 02:10:55 +01:00 |
|
did
|
e210953d01
|
inline editor work in progress
|
2012-01-17 12:05:39 +01:00 |
|
did
|
4060b1859f
|
use the right path to the back-office in the js components as well as in the middlewares
|
2012-01-14 14:54:01 +01:00 |
|
did
|
cb735a0539
|
cleaning
|
2011-11-25 13:38:31 +01:00 |
|
did
|
47625dfa17
|
refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip)
|
2011-11-25 02:04:42 +01:00 |
|
did
|
1a1a92e12f
|
refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack
|
2011-11-21 02:27:05 +01:00 |
|