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
|
08cf381bc3
|
simple media plugin for Aloha
|
2012-04-22 01:14:25 +02:00 |
|
Didier Lafforgue
|
e26febdaf6
|
refactoring (wip)
|
2012-04-06 12:23:11 +02:00 |
|
Didier Lafforgue
|
1332185d85
|
the locale was missing when saving an editable element by the inline editor
|
2012-02-10 01:42:06 +01:00 |
|
did
|
09d6060633
|
refactoring (rename modules, clean code, remove useless files, ...etc) + improve the inline editor module (locale picker + better ui workflow)
|
2012-01-17 17:04:45 +01:00 |
|
did
|
e210953d01
|
inline editor work in progress
|
2012-01-17 12:05:39 +01:00 |
|
did
|
7169abb8c2
|
stylish buttons in the toolbar
|
2012-01-17 03:21:30 +01:00 |
|
did
|
89020e7cf5
|
got a working version of the inline editor
|
2012-01-17 02:53:49 +01:00 |
|
did
|
ebe149110b
|
first draft of the new inline editing toolbar
|
2012-01-16 23:59:59 +01:00 |
|
did
|
0489bbe4c2
|
implement the mechanism to pick a different locale for content types + implement multi-language for content types + rename scss files to css.scss
|
2012-01-14 01:38:09 +01:00 |
|
did
|
4c204ef6a6
|
refactor and clean code (wip) + the api controller has been deleted and replace by the entry_submission_controller (+ custom responder)
|
2012-01-09 06:49:59 -08:00 |
|