Commit Graph

262 Commits

Author SHA1 Message Date
did
3fffe7bd91 new way of handling ajax post requests (redirecting if everything is fine) 2011-12-02 18:20:59 +01:00
did
fb0e87c64d done (for now) with the my account screen 2011-12-02 01:43:49 +01:00
did
5d271239b7 the screen for editing site has been refactored 2011-11-29 14:58:19 +01:00
did
35012ca2b2 polishing the current site editing screen (wip) 2011-11-29 02:24:02 +01:00
did
cad1f5e68f Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-11-27 08:23:12 -08:00
did
71d48fe726 refactor the current site editing screen (screen) 2011-11-27 08:22:54 -08:00
Mario Visic
ad6273e2fd Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
did
cffe64f6be rebuilding the editing page for the site (wip) 2011-11-25 15:10:56 +01:00
did
0b7cc6ebd2 merging 2011-11-21 02:28:12 +01:00
did
1a1a92e12f refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack 2011-11-21 02:27:05 +01:00
Mario Visic
75041ba21c Specs now run for all models. The account model now passes GREEEEn. 2011-11-20 22:47:41 +11:00
Mario Visic
a99ba18200 Temporarily removed a module include causing issues. 2011-11-20 22:47:03 +11:00
Mario Visic
a7b66f0e25 Lots of fixes to get tets closer to working. 2011-11-20 21:59:12 +11:00
did
63e2a63d1a polishing the locomotive_media plugin (wip) 2011-11-19 16:41:16 +01:00
did
72c2cb2059 rename asset to content_asset + clean the locomotive_media plugin for tinyMCE (wip) 2011-11-19 15:47:56 +01:00
did
2c18f401bb adding the last refactored features on the pages section (wip) + clean code 2011-11-16 01:39:16 +01:00
did
bef9dd8e67 fix various namespace errors issues and api changes for the models 2011-11-10 13:41:20 -08:00
did
599b1d6395 first work on migrating the javascripts to coffeescript and backbone (wip) 2011-11-10 02:43:19 +01:00
did
248d3803c2 use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
did
b383086242 wip 2011-11-06 12:18:34 +01:00
did
8979957d43 convert stylesheets in sass (wip) + fix the installation module + customize devise (wip) 2011-11-03 14:01:08 +01:00
did
99e442673c namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
did
016d773b2d fix issue #217 (memberships not correctly removed) 2011-09-28 18:27:29 +02:00
Mario Visic
03b6649742 Designers cannot set others to admins, fixes #197 2011-09-17 22:23:43 +08:00
Karl Brightman
93667018c1 Updated with hashrocket 2011-09-16 11:55:30 +08:00
Karl Brightman
75f4835d3e Integrated next and previous methods for content in content types 2011-09-16 11:35:40 +08:00
Paul
acd731347c should sort by Page#depth so slug parts are in the right order 2011-08-29 16:17:18 +03:00
did
71a592eec1 fix issue #177 2011-08-25 18:27:43 +02:00
Mario Visic
a7bc648333 Implemented the site ability fix for designers. 2011-08-20 17:33:13 +08:00
Didier Lafforgue
12c9bd1eca Merge pull request #159 from bquorning/patch-1
Adding indexes
2011-08-14 12:44:59 -07:00
did
67d7b13f4f Add the reverse has_many field feature (mainly based on pull request #142) 2011-08-11 13:45:46 -07:00
Benjamin Quorning
e2eb8f2e90 Adding indexes on :position and [[:depth, :asc], [:position, :asc]] to avoid Mongo::OperationFailure: too much data for sort() with no index 2011-08-09 15:07:15 +03:00
did
4c8272dfa0 seo information were not imported for contents 2011-07-28 11:53:36 +02:00
did
8da0db2454 improve the solution for the issue #127 and write tests (pull request #139) 2011-07-28 00:39:59 +02:00
did
4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +02:00
did
819d7ac5ff fix issue #131 2011-07-19 16:20:53 +02:00
Didier Lafforgue
4a9da56341 Merge pull request #114 from frisoft/master
Italian localization update + Locomotive.config.default_locale as default locale for new accounts.
2011-07-14 01:02:08 -07:00
did
770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
Andrea Frigido
f6c91ed791 Locomotive.config.default_locale as default locale for new accounts. 2011-07-11 13:13:58 +02:00
did
b2ddaf805c show page kind: templatized or redirect 2011-07-07 18:03:55 +02:00
did
37d10aa25b fix bug #104 2011-07-06 11:48:04 -07:00
did
1a62d8f5ad Adding the ability to set a robots.txt for each site (ticket #87) 2011-07-05 22:34:15 +02:00
did
bd28f4c1ec new sites picker 2011-07-05 18:30:12 +02:00
did
71d7e86acd admin role was not correctly set when creating a new website 2011-07-05 11:56:24 +02:00
did
1e465e231e remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring 2011-07-04 19:40:14 +02:00
did
02186d7368 add the export link + fix the bugs for the export module + a little bit of refactoring 2011-07-04 15:25:02 +02:00
did
5e8eac53d4 refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave 2011-06-28 15:38:13 +02:00
did
2ad01833d8 icons for the theme_asset form + add tests (both rspec + features) for the roles 2011-06-27 08:27:07 -07:00
did
be6629d986 done with the roles (tests are coming) + better help messages for theme_assets and snippets 2011-06-26 16:02:48 -07:00
did
1be92e0db4 roles fully implemented for the page / content sections + uniformize drag n drop in the contents section + add the missing selected value for the has_one field 2011-06-25 17:01:11 -07:00
did
09171555a7 fix CSRF issues with tinymce and some ajax actions + begin to work on the roles feature powered by cancan (in progress, not stable) 2011-06-25 09:25:31 -07:00
did
fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did
3c0f7afec0 fix tests + rename and refactor the slugify method (now called permalink) 2011-06-21 13:03:24 -07:00
did
f4d9acd282 fix the tests + finish the integration of Dragonfly + clean code 2011-06-20 17:39:59 -07:00
did
87e7ced3c1 integrate dragonfly + clean code + fix a js bug when editing a custom field 2011-06-20 12:05:12 -07:00
did
21ccbb635b removing asset collections 2011-06-17 14:32:54 -07:00
did
de217b74b7 use default rails logger during the first template import + remove some carrierwave method patches now useless with the new version of the gem 2011-06-11 01:18:34 +02:00
did
cd428e467c back to the sha1 encryptor to be compliant with old accounts 2011-06-11 00:24:10 +02:00
did
91119bf54e allow administrators to change the text displayed for each content in the back-office (documentation is coming) 2011-06-01 23:43:12 +02:00
did
61886ec1b1 installation procedure allows to install the default site template if provided 2011-05-28 19:45:29 -07:00
did
8ad6ee580e fix issue #78 2011-05-24 12:23:05 -07:00
did
8f36f5a2d8 solve a bug on has_ony / has_many caused by the caching mechanism 2011-05-21 01:02:03 +02:00
did
d2f6cc0c53 has_many ui has been implemented 2011-05-19 17:44:04 +02:00
Didier Lafforgue
028312bc9e Merge pull request #71 from onelaw/seo_metadata
Adds support for page- and content instance-specific metadata.
2011-05-16 14:28:20 -07:00
did
7dfce2c336 migration to mongoid 2.0.1 2011-05-16 23:06:46 +02:00
did
b4c86e39dc patch inspired from the issue described in the pull request #72: the method to retrieve direct template descendants was wrong 2011-05-04 14:53:09 +02:00
did
e429fbf7ca indentation + detect asset urls in a css file even if one long line (case: css generated by sass) 2011-04-30 01:58:15 +02:00
AJ Schuster
f65cd0b2fc Allows for page- and content instance-specific metadata.
Falls back to site metadata when not specified.
2011-04-29 16:10:13 -04:00
did
ea050afd5e use absolute urls for the pagination links + allow developers to access the http params within a liquid template + the with_scope handles category fields 2011-04-29 01:16:40 +02:00
did
77ea45c98b solve a bug when creating new content instance + fix rspec tests for ruby 1.9.2 2011-04-28 23:47:01 +02:00
did
a01e204d29 refactor the way locomotive was updating a template and its descendants + add custom action_mailer settings for the bushi.do env + fix bug about index and 404 pages positions during the import + fix a little display issue when a subdomain is wrong in the site edit page 2011-04-28 17:04:18 +02:00
Didier Lafforgue
c27062452e Merged pull request #60 from karlbright/master.
Theme asset filenames made lowercase
2011-04-27 07:19:53 -07:00
did
8b5d5d0a32 change subdomain on heroku + do not save pages, assets, ...etc of a site when it gets saved 2011-04-27 10:09:19 +02:00
did
b58e49fce2 make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests 2011-04-25 01:21:38 +02:00
karlbright
30eed79f2b Removed downcase method from theme asset creation. Causes issues when dealing with files that may have uppercase filenames, such as fonts 2011-04-11 15:09:25 +08:00
did
551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
dinedine
c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did
551d8a5761 big refactoring of the locomotive config file in order to handle bushido / single / multi sites, ...etc 2011-04-01 02:34:19 +02:00
did
1e5624ce06 fix js bugs 2011-03-20 11:21:07 +01:00
did
f38e6a8514 order direction for content types 2011-03-10 00:54:38 +01:00
did
e4b34eac3f patch mongoid to enable the limit option for embedded collections + ui widget to allow more than 5 custom models in the content section 2011-03-08 16:05:07 +01:00
Dirk Kelly
44f84c266b merge 2011-03-07 19:59:02 +08:00
did
d3abdd3f37 refactor the asset collections part + disable the image processing for non image assets (use a newer version of locomotive carrierwave for that purpose) 2011-03-05 23:27:26 +01:00
did
110c7a0fc9 request from Bernd (Designhunger) #45 2011-03-05 00:41:44 +01:00
did
a2ea522964 clean translations (a part of it moved to the CustomFields gem) + refactor the custom fields form (mustache) as well as enhance the ui/look&feel + fix some bugs related to the creation/edition of content types and contents 2011-03-05 00:29:40 +01:00
Dirk Kelly
2482567db3 avoid updating child pages which have a default_attribute on change of a template they inherit from 2011-03-03 15:35:37 +08:00
Dirk Kelly
c998d4150c Added fullpath and the error message to liquid syntax error. Translations are pretty dodgy (sorry) 2011-03-03 08:18:19 +08:00
Dirk Kelly
be4169c991 Beginning to improve the error messages with variables to make the import function more verbose on problems 2011-03-03 08:05:04 +08:00
Dirk Kelly
97e3ddb6e3 reading that default attribute on inheriting editable_elements and calling the method on that page (instead of getting it from the parent) 2011-03-02 14:38:57 +08:00
Dirk Kelly
ea81025d33 storing default_attribute on the editable_element if a default attribute has been parsed. 2011-03-02 14:38:32 +08:00
Dirk Kelly
adbae00457 changed the editable inheritance tag to be assignable, avoiding confusion between that and the content tag inheritance 2011-03-02 09:13:45 +08:00
Dirk Kelly
778a55245c added the inheritable attribute to editable elements 2011-03-02 08:13:03 +08:00
Dirk Kelly
ed88eb82b0 added inheritable? to the parent check on editable_contents 2011-03-02 08:12:42 +08:00
did
2244aa782a Merge branch 'nested-snippets-fix' of https://github.com/mariovisic/engine into mariovisic-nested-snippets-fix 2011-02-19 01:34:32 +01:00
did
bd992cc882 fix issue #37 plus other ones related to theme assets and assets 2011-02-19 00:51:57 +01:00
Mario Visic
26a2b7d2a7 Fixed a bug with snippets within blocks 2011-02-16 17:37:26 +08:00
did
94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
dinedine
6ac4ff0393 revert a piece of the theme assets refactoring + upgrade Gemfile as well as the gemspec 2011-02-04 11:18:34 +01:00
dinedine
c178346969 fix the creation of theme assets (and add tests of course) + upgrade Gemfile + remove the mongoid patches 2011-02-04 10:39:23 +01:00
Dirk Kelly
7d30d00ec4 minimal attributes to include listed 2011-02-01 17:05:36 +08:00