e9bf29f297
the last commit broke the test suite: fixed now
2012-03-23 00:41:04 +01:00
58c5e9e238
Merge pull request #327 from belighted/2.0.0.rc
...
Add nav compatibility with twitter menu dropdown
2012-03-22 16:21:38 -07:00
b7424b1fd4
implement the auto_discovery_link_tag liquid filter (feature #206 )
2012-03-23 00:18:32 +01:00
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
6b8e3db8c3
add missing files for the last commit about the control editable element + implement feature #326
2012-03-22 02:13:24 +01:00
b3b0a5ac16
new editable element for a page: the control
2012-03-22 00:50:34 +01:00
ab5a4755b8
make the editable elements more robust when working with localization + write tests to prove it
2012-03-21 03:21:29 +01:00
cfbe68564d
fixed editable elements (wip)
2012-03-19 02:29:59 +01:00
caa0e69760
Add nav compatibility with twitter menu dropdown
2012-03-15 11:39:20 +01:00
834042fda3
bump version
2012-03-14 01:20:55 +01:00
ada199cf3c
Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc
2012-03-14 01:16:10 +01:00
79f958c505
create mongoDB indexes for locomotive models without any errors
2012-03-13 16:37:19 +01:00
52247242fc
Requiring locomotive is now much less noisy.
2012-03-12 14:04:52 +08:00
9a9f270d99
fix issue #317 + with_scope works now with has_many relationships + clean code
2012-03-12 03:09:20 +01:00
1f49eca09f
with_scope did not resolve (ie the Liquid way) correctly the values
2012-03-08 09:24:33 -08:00
effce313bf
Merge pull request #319 from paulsponagl/nav_with_liquid_2.0
...
added a snippet option to the liquid nav tag
2012-03-07 17:44:00 -08:00
0c65516807
fix issue #320
2012-03-08 02:32:59 +01:00
b13c5d1d40
added a snippet option to the liquid nav tag
...
this is useful if you want to render more than
just a page.title string within the nav list item.
(page.menue_image, page.menue_teaser...)
use nav snippet: "<liquid snippet>" to provide a string
or nav snippet: "<snippetname>" to load the snippet from db.
added page.<editable_field> for usage within liquid templates
2012-03-07 16:32:25 +01:00
f77bdd9826
fix #289 . This fix is different from the one in the master branch. It only the filename (without the whole path and the extension)
2012-03-05 14:17:33 -08:00
1da5617b80
it did not display the no_site page
2012-03-05 00:09:54 -08:00
989f608755
change the default way to config AWS for carrierwave + fix issue #299
2012-03-02 01:46:02 +01:00
05baecad0b
change the path to files added in the content entries + ui settings are a hash not an object
2012-03-02 00:31:45 +01:00
74038467aa
Merge branch '2.0.0.rc' of github.com:locomotivecms/engine into 2.0.0.rc
2012-03-01 11:07:42 +01:00
50a3addf45
fix ALL the cucumber tests + also solve a couple of UI bugs with the has_many and many_to_many relationships
2012-03-01 11:07:22 +01:00
a1bc3db8a6
path to codemirror/overlay.js has been modified in the last version of the codemirror gem
2012-02-28 06:54:02 -08:00
61281db943
the API for content_types now allows to change the label_field property of a content type
2012-02-20 16:16:59 +01:00
dd9b382637
alpha version of the upgrade script (good results with my existing locomotive sites) + fix bugs according to my tests with my existing live websites + remove useless code (polishing)
2012-02-20 01:15:43 +01:00
dae0b665ac
script to upgrade from 1.0. to 2.0 (wip)
2012-02-19 10:38:56 +01:00
8f1ac5968f
better way of declaring a hosting env
2012-02-18 15:55:20 +01:00
ffee024a96
a little bit of cleaning + prepare the engine to make it work with the hosting extensions
2012-02-18 01:57:06 +01:00
085a54d7c1
introduce the proxy collection liquid drop so that we can paginate for real + fix the cucumber features for the public part of the engine
2012-02-17 00:51:33 +01:00
02e48f5c36
fix the specs for the page model
2012-02-16 22:07:00 +01:00
6619d4e5dc
all the non-models specs have been fixed
2012-02-16 02:45:14 +01:00
64a050dff9
fixing specs (wip) + cell specs are fine
2012-02-16 01:32:37 +01:00
87c8f3bfd7
enhance the nav tag (allow custom css classes for the list and the selected menu item) + clean the locomotive.rb template file
2012-02-15 18:26:58 +01:00
3b5d04238f
remove deprecated warning about ActiveSupport::Concern + add the handle property to Page in order to retrieve them more easily (very useful to display a page from an external controller for instance
2012-02-11 00:39:06 +01:00
ca380de115
the admin path is not used anymore (use Locomotive.mounted_on instead)
2012-02-10 10:05:56 +01:00
62eaeb10f5
templatized page can now use models from the main app + add new liquid filters
2012-02-10 00:57:57 +01:00
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
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
f1662770e7
use the default carrierwave settings for envs other than development and production + does not include the templates of snippets in the theme assets index page (it was breaking the layout in locomotive for some snippets)
2012-02-07 11:17:56 +01:00
5fd244e66c
do not mention DelayedJob anymore
2012-02-06 02:44:02 -08:00
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
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
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
4e6fc04889
Use contents_custom_fields instead of content_custom_fields
2011-12-05 22:29:32 +08:00
3fffe7bd91
new way of handling ajax post requests (redirecting if everything is fine)
2011-12-02 18:20:59 +01:00
87a04aafe9
rename namespace for the sites backbone views + create backbone view for the creation of a new site
2011-12-02 06:59:41 -08:00
35012ca2b2
polishing the current site editing screen (wip)
2011-11-29 02:24:02 +01:00
cecdfa4762
Merge branch 'master' into rails_3_1
2011-11-27 21:17:58 +11:00
791c5f9d43
Merge pull request #223 from frisoft/master
...
Method missing "disable_parent_editable_elements" for nil
2011-11-27 01:53:25 -08:00
Didier Lafforgue
Didier Lafforgue
Gil Vandendriessche
Mario Visic
Paul Sponagl
Corey Woodcox