9e9fe49ccf
the has_many ui component is done
2012-02-02 16:53:26 +01:00
dfd437a762
fix an issue with compass + move to rails 3.2 + switch from mongoid_acts_as_tree to mongoid_tree + implement the UI to deal with has_many field types (wip)
2012-02-01 02:01:42 +01:00
c9f07c823f
remove the old way of doing cross domain authentication (use the :domain => all option) + fix a couple of tiny bugs
2012-01-30 10:56:38 +01:00
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
b33d081c28
use the view_context method to reach helper methods from a controller
2012-01-28 01:05:26 -08:00
c5692aeb2a
fix errors when deploying a new brand new engine instance
2012-01-27 02:27:26 +01:00
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
192518d258
disable the rethrow exceptions option for the liquid templates
2012-01-26 02:43:55 +01:00
50917a919e
Use the 2.0.0.rc branch for the custom_fields gem
2012-01-26 02:41:31 +01:00
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
4600f94922
extend i18n to pages (wip)
2012-01-25 22:07:10 +01:00
5c191e59cd
Merge remote-tracking branch 'origin/2.0.0.rc' into 2.0.0.rc
...
Conflicts:
Gemfile.lock
2012-01-25 22:20:05 +11:00
840609cbce
Merge remote-tracking branch 'origin/master' into rails_3_1
...
Conflicts:
Gemfile
Gemfile.lock
app/cells/locomotive/menu_cell.rb
app/helpers/admin/content_types_helper.rb
app/models/content_instance.rb
app/models/page.rb
app/views/admin/shared/menu/_contents.html.haml
config/initializers/locomotive.rb
config/locales/admin_ui.de.yml
config/locales/admin_ui.en.yml
config/locales/admin_ui.es.yml
config/locales/admin_ui.fr.yml
config/locales/admin_ui.it.yml
config/locales/admin_ui.nl.yml
config/locales/admin_ui.no.yml
config/locales/admin_ui.pt-BR.yml
config/locales/admin_ui.ru.yml
lib/generators/locomotive/install/templates/locomotive.rb
lib/locomotive/configuration.rb
locomotive_cms.gemspec
spec/models/locomotive/account_spec.rb
2012-01-25 22:16:43 +11:00
7aadd9d129
add a message for deprecated config option
2012-01-25 18:52:55 +11:00
81db1da423
fix spelling error in locales
2012-01-25 18:52:54 +11:00
0534c5504f
prevent pow to crash when no flash message (bug) + add api resources for pages
2012-01-24 01:00:41 +01:00
739d2db0a9
first api draft
2012-01-23 09:05:50 +01:00
d665a85591
Add sample option on import rake task
2012-01-21 16:05:36 +11:00
4d0f8610c5
bad display of content types if none + add new gems for tinymce and aloha
2012-01-21 01:48:00 +01:00
7af9ea34a6
trying to make it work with the precompilation of assets (issue with Aloha and TinyMCE)
2012-01-20 14:46:09 +01:00
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
801f7bfca5
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
2012-01-17 12:05:52 +01:00
e210953d01
inline editor work in progress
2012-01-17 12:05:39 +01:00
ebe149110b
first draft of the new inline editing toolbar
2012-01-16 23:59:59 +01:00
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
a50715091d
Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1
2012-01-15 00:03:06 +10:30
8ac8289394
Merge remote-tracking branch 'origin/master' into rails_3_1
...
Conflicts:
app/models/content_instance.rb
config/locales/admin_ui.de.yml
public/javascripts/admin/inline_editor_toolbar.js
spec/models/content_instance_spec.rb
2012-01-15 00:02:46 +10:30
531017ab62
merging
2012-01-14 13:14:59 +01:00
50a2453995
polish again the content_locale picker
2012-01-14 13:12:44 +01:00
75b0137230
Merge remote-tracking branch 'origin/master' into rails_3_1
...
Conflicts:
Gemfile
Gemfile.lock
features/support/env.rb
locomotive_cms.gemspec
spec/cells/locomotive/global_actions_spec.rb
spec/cells/locomotive/main_menu_cell_spec.rb
spec/cells/locomotive/settings_menu_cell_spec.rb
2012-01-14 16:37:24 +10:30
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
01c5de36a5
add the ui element to select the languages for a site
2012-01-09 17:24:34 -08:00
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
27dd3b2001
Fit issue 240 by using slug to find content-type
...
export.rb exports targets with
field_attributes['target'] = target_klass._parent.slug
but import imports it with:
target_content_type = site.content_types.where(:name => association.target).first
this fails if one uses capitalized names for Models.
i changed the default.zip to contain a site yaml with capitalized
Model-Names too.
2012-01-09 15:01:51 +01:00
435d4067c0
namespace vendor assets
2012-01-08 16:27:13 -08:00
5dfbb2bdb7
upgrade to the last version of delayed_job_mongoid gem + remove reference to the previous handlebars-rails gem (just add the js file instead) + refactor the way to display the list of content types in the back-office menu
2012-01-08 16:17:31 -08:00
0f1b4f59d3
listing all entries (done) + fix bugs + tweak ui
2012-01-04 02:07:53 +01:00
912251d49b
big refactoring (wip) + add/edit entries for content types
2012-01-02 05:54:01 -08:00
e9ef4d48c3
content_instance becomes now content_entry with its shortcut content_type.entries + change references to the old custom_fields API
2011-12-23 00:45:32 +01:00
81a6569fe7
UI compoment to add options for the select type field (wip)
2011-12-22 02:59:30 +01:00
00283993c0
minimal version of the new UI for content types
2011-12-21 15:24:39 +01:00
217000042a
refactoring the content types section (wip)
2011-12-19 14:15:11 +01:00
9a1a0f016f
Merge branch 'master' into rails_3_1
...
Conflicts:
app/models/content_type.rb
config/boot.rb
2011-12-15 22:29:07 +08:00
4ae6fe7977
False values for custom fields are now correctly exported. Fixes #250 .
2011-12-15 22:11:54 +08:00
8271782284
refactoring of the import UI is done
2011-12-11 23:33:38 +01:00
a25009824c
fix some bugs + refactor look and feel of the import screens (wip)
2011-12-08 07:47:17 -08:00
d21f32d849
upload many theme assets at once
2011-12-07 03:25:30 -08:00
4da434deb1
replace Asset by ContentAsset in the export module
2011-12-07 00:52:13 -08:00
368f643cf0
theme assets page in progress
2011-12-07 02:09:13 +01:00
af955ef927
delete snippets in ajax + new way of render theme assets in the back-office (backbone view) + change the way to fire growl messages
2011-12-06 12:39:32 +01:00
did
did
Mario Visic
Corey Woodcox
Gil Vandendriessche
Paul Sponagl