1c902a5448
fix a bug about the editable_file not correctly displayed in a snippet given as an argument of the new nav tag
2012-03-09 13:05:44 +01:00
7ab8110e41
with_scope also takes care of order_by (pull request #278 )
2012-03-09 01:01:09 +01: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
37042eaa03
the content_entries API returns always a flat list of entries + fix a bug about cycling dependencies when the content_type has a field named source
2012-03-07 02:56:56 +01:00
ac823aac66
entries can be grouped by a belongs_to field in the back-office + add the show action for the content_entries API
2012-03-07 01:39:24 +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
a1cbdf9ed8
page templates were not updated if a related snippet got modified (BUG)
2012-03-02 08:37:54 -08: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
3e3691ad4a
upgrade to mongoid 2.4.5 + allow authors to edit editable elements from the back-office (bug)
2012-03-01 16:39:38 +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
c5577240de
add the engine version in the footer (useful)
2012-02-29 01:15:49 +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
a2308787f1
fix theme assets tests
2012-02-28 11:25:51 +01:00
520b68104b
fixing tests (wip) + sync javascript objects when updating an entry in a has_many relationship
2012-02-27 03:48:06 -08:00
c6e1276974
fix the broken tests
2012-02-21 01:45:45 +01:00
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
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
02e48f5c36
fix the specs for the page model
2012-02-16 22:07:00 +01:00
73b559260e
fix specs for the content_type and editable_element models
2012-02-16 16:17:30 +01:00
2fd0410b66
tests pass for the account, content_entry and content_asset models
2012-02-16 12:42:41 +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
1332185d85
the locale was missing when saving an editable element by the inline editor
2012-02-10 01:42:06 +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
a5e9e52996
allow the main app to add custom code in the locomotive layout
2012-02-07 15:20:38 +01:00
b4afec5fd3
flags are clickable
2012-02-07 11:59:55 +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
f2467bbf42
ask for default site locale when creating the first site
2012-02-07 01:29:33 +01:00
112d61ac3b
no more references to zip templates
2012-02-06 08:58:50 -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
2a911d912c
implement the UI for the many_to_many relationship (WIP)
2012-02-03 01:50:45 +01:00
9e9fe49ccf
the has_many ui component is done
2012-02-02 16:53:26 +01:00
1703c05693
can edit memberships now (js bug)
2012-02-01 15:15:20 +01:00
42a2bba538
sort and remove entries from a has_many relationship
2012-02-01 04:09:35 -08: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
e2bd55fe35
add the UI for the belongs_to custom field
2012-01-31 01:50:09 +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
a85db53520
add .css to dialog.scss
2012-01-28 12:59:04 +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
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
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
81db1da423
fix spelling error in locales
2012-01-25 18:52:54 +11:00
7ace1d9a48
fix the broken link to the back-office in the toolbar when the inline_editor tag is missing
2012-01-24 22:04:49 +01:00
e523cb952c
access entries of a content type from the API
2012-01-24 21:33:34 +01:00
ab507dc165
change the default API base path + implement the API for content_assets, content_types and pages resources
2012-01-24 21:16:53 +01: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
34f9755d9a
Altered admin menu cells inheritence, fixes #257 without limiting cells version.
2012-01-21 15:10:58 +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
0f3c672777
make the toolbar smaller
2012-01-18 02:04:48 +01:00
fc20fe70c9
fix annoying bug about popups within the submenu
2012-01-18 01:54:26 +01:00
b8b8cef089
make the edition of content types more robust (ex: better errors handler)
2012-01-18 01:43:01 +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
7169abb8c2
stylish buttons in the toolbar
2012-01-17 03:21:30 +01:00
89020e7cf5
got a working version of the inline editor
2012-01-17 02:53:49 +01:00
ebe149110b
first draft of the new inline editing toolbar
2012-01-16 23:59:59 +01:00
4622c4359f
Fixed up a failing test due to the i18n module, left a fixme note.
2012-01-15 15:05:31 +11: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
50a2453995
polish again the content_locale picker
2012-01-14 13:12:44 +01:00
d191d2d783
polish the content_locale picker + does not display the picker if less than 2 locales
2012-01-14 02:08:03 +01:00
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
99d889f6e2
Fix a before_filter preventing to save a content instance with a
...
custom field `active' or `visible' set to false.
Fixes #272 .
2012-01-12 16:18:55 +01:00
42db5ba656
namespace assets in vendor
2012-01-10 09:09:56 +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
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
81fc524fdc
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
2012-01-02 05:54:18 -08:00
912251d49b
big refactoring (wip) + add/edit entries for content types
2012-01-02 05:54:01 -08:00
a65a871e19
Fixed a tiny bug preventing the robots controller rending.
2011-12-27 21:31:36 +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
9130544516
refactoring the creation of custom contents
2011-12-22 14:28:12 -08:00
2068fe060d
it becomes possible to add options for the select type
2011-12-22 07:45:42 -08:00
81a6569fe7
UI compoment to add options for the select type field (wip)
2011-12-22 02:59:30 +01:00
d1bb45d7c8
polishing the UI for the content types, refactoring still in progress
2011-12-22 01:31:33 +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
eb5f0557ff
Merge branch 'master' into rails_3_1
...
Conflicts:
app/models/content_instance.rb
spec/models/locomotive/content_instance_spec.rb
2011-12-18 01:18:56 +08:00
4efa43e342
Content instances will now generate a unique slug (if existing is taken). Fixes #210 .
2011-12-18 01:11:39 +08:00
592a110fe5
first attempt to refactor the content types
2011-12-16 13:02:10 +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
282e2486b6
Previous comparison method failed when the sort column is a date with a Nil. This revision doesn't really sort Nils, rather ignore them.
2011-12-14 11:26:24 +00:00
e500a1985b
refactoring of the sites picker is done
2011-12-12 10:35:42 +01: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
b60b1378f8
no more flash uploader only HTML5 goodness
2011-12-07 07:10:21 -08:00
Didier Lafforgue
Didier Lafforgue
Paul Sponagl
Mario Visic
Corey Woodcox
Pietro Giorgianni
Robsteranium