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
|
655fe18d72
|
add UI notifications when a form is submitted + disable the form when it is being submitted + pass the current ability to the presenter + remove debug statements
|
2012-04-16 11:38:32 +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
|
fbd945cf6d
|
implement feature #324
|
2012-03-14 01:16:01 +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 |
|
did
|
b93c7f8f51
|
remove the import/export functionalities (replaced by the API and the new locomotive editor) + upgrade gems (codemirror, ...etc)
|
2012-01-28 12:41:00 +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
|
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 |
|