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
|
67c36191d2
|
was breaking the API (tests are coming)
|
2012-04-17 13:53:15 +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 |
did
|
4d1b986f1b
|
fix broken tests + make the editing of locales more robust
|
2012-04-10 04:55:59 -07: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 |
|
Didier Lafforgue
|
39d9c354da
|
API access for the current site + easy way to specify the localization of any controllers + fix a minor bug about adding/removing domains
|
2012-02-09 11:36:10 +01:00 |
|
Didier Lafforgue
|
51a0862d89
|
use a string instead of a symbol for X-Message-Type causing an error in Passenger
|
2012-02-07 12:19:54 +01:00 |
|
did
|
fa36b95a9d
|
get rid of warnings about InstanceMethods (deprecated) + make the engine work smoother with an existing app + clean code
|
2012-02-06 00:54:09 +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 |
|
did
|
0534c5504f
|
prevent pow to crash when no flash message (bug) + add api resources for pages
|
2012-01-24 01:00:41 +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
|
50a2453995
|
polish again the content_locale picker
|
2012-01-14 13:12:44 +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 |