Commit Graph

229 Commits

Author SHA1 Message Date
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
Dirk Kelly
2b438966f5 including the listed module 2011-02-01 16:17:12 +08:00
Dirk Kelly
b627b9bcb9 going for the positive, instead of the double negative (listed not unlisted) 2011-02-01 16:07:18 +08:00
Dirk Kelly
6ba65b1b96 Added an unlisted flag 2011-02-01 14:39:20 +08:00
dinedine
a525e4ccd5 fixing bugs 2011-01-29 13:05:42 +01:00
dinedine
a7dfe1152d fix encoding issue in Ruby 1.9 2011-01-27 14:07:10 +01:00
dinedine
2e774b2a97 conflict between the index scope in the page model and the mongoid index method 2011-01-27 10:49:42 +01:00
dinedine
69c9dbbbcf new Gemfile + fixing broken tests + improve the way we fetch the sicurrent te when serving fonts 2011-01-26 14:07:33 +01:00
dinedine
6f2033a356 make the email notification more robust 2011-01-18 16:06:36 +01:00
dinedine
2fc99bf90a rename translation files (convention) + email notification when adding contents (api) 2011-01-18 15:24:42 +01:00
dinedine
d5464aa782 add tests 2011-01-18 01:19:18 +01:00
dinedine
bc32848f6a Merge branch 'highlighted_field_value' of https://github.com/dirkkelly/locomotive into dirkkelly-highlighted_field_value 2011-01-18 00:40:45 +01:00
Dirk Kelly
5eab8e35bf calling page.title on a content_instance page would call highlighted_field_value.
This method was protected and would hence raise an inline exception.

I'm not sure why we would protect highlighted_field_value?
2011-01-14 15:47:53 +08:00
Mario Visic
64eff89c97 Added a redirect page extension, integrated into the application and added new tests 2011-01-06 22:48:41 +08:00
dinedine
572ee360a1 preserve page orders when importing theme + handle favicon as theme asset + add tests for the nav tag + polish code (remove useless logs) 2011-01-03 11:50:09 +01:00
dinedine
210ce3d2d8 enhance the nav tag + some optimization in the back-office when rendering the pages tree 2011-01-02 23:58:06 +01:00
dinedine
62564021b6 the theme import module can work without delayedjob + fix bugs 2010-12-17 00:42:38 +01:00
dinedine
e6226abece use jammit to compress stylesheet/javascript files 2010-12-14 18:00:12 +01:00
dinedine
bbb09b58cf ruby 1.9.2 compliant 2010-11-08 18:42:14 +01:00
dinedine
a1d9a5d548 reflect changes from the last imported theme (enhancements + bugs fixed) 2010-10-31 00:30:30 +02:00
dinedine
9c77180a63 fix minor issues 2010-10-29 16:19:41 +02:00
dinedine
cc0b50e22e add rspec tests for the import module + debug the cms to handle correctly the default theme 2010-10-29 01:36:45 +02:00
dinedine
7cb26a74d4 fix bug with pagination + add _permalink property for content instances 2010-10-26 15:06:57 +02:00
dinedine
c1b21fac8b use BSON::ObjectId to find elements (asset collection, content type) + make the import module work with S3 2010-10-19 12:20:09 +02:00
dinedine
bab4577de0 fixing failed tests 2010-10-12 17:26:05 +02:00
dinedine
54063d6b46 create a middleware for serving fonts (solve cross domain issue) + add cache for consume liquid tag + fix image picker 2010-10-11 16:26:46 +02:00
dinedine
86ac74e290 bugs when accessign assets from asset collections in templates + uploader for custom fields was buggy 2010-10-11 01:16:43 +02:00
dinedine
32f8351889 button to see all theme assets (including hidden ones) 2010-10-10 23:59:56 +02:00
dinedine
c444b1d58a changing a stylesheet or javascript asset works either from a source or with plain text 2010-10-10 23:31:27 +02:00
dinedine
2f4128bf8f refactoring theme assets in progress 2010-10-10 16:37:34 +02:00
dinedine
ecfa466074 add missing asset collections import module + add google analytics import + work on simplifying the theme asset logic 2010-10-07 02:45:41 +02:00
dinedine
dd0a09ec4d fix issue with snippet dependencies 2010-10-04 11:16:35 +02:00
dinedine
eabe4903f3 refactor locomotive liquid drops + implement the theme or site import page (95% done) 2010-09-29 00:08:11 +02:00
Didier Lafforgue
e31012f861 fix a lot of tiny bugs (not yet) + testing import tool 2010-09-27 00:31:50 +02:00