Commit Graph

493 Commits

Author SHA1 Message Date
Dirk Kelly 825521a5d4 need to reject templatized pages, because they're not real pages.
Also using children with minimal attributes, like top level.
2011-01-24 23:20:26 +08:00
Dirk Kelly f512b417f5 added the depth option to nav tag 2011-01-24 17:00:02 +08: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 85bee3a110 Merge branch 'add_or_update_editable_element' of https://github.com/dirkkelly/locomotive into dirkkelly-add_or_update_editable_element 2011-01-18 00:28:41 +01:00
Dirk Kelly 62568bbdbb Fixed exception when updating a layout from back-office which contained an editable area 2011-01-14 15:27:58 +08:00
dinedine 3686496bb2 still got errors with dates display + admin default root points to signin 2011-01-11 12:42:12 +01:00
dinedine ff01539bb5 date in content types compatible with ruby 1.9.2 2011-01-11 00:50:42 +01:00
dinedine 933c26dbb2 bump version 2011-01-10 15:15:53 +01:00
dinedine 5301fa083c Merge branch 'master' of https://github.com/mariovisic/engine into mariovisic-master 2011-01-10 14:58:38 +01:00
dinedine 890d5d7e18 the import module takes care of redirection pages (+ tests) 2011-01-10 14:57:44 +01:00
Mario Visic 6b4001165f Altered rendering to set the HTTP 404 status when no page is found 2011-01-09 10:08:32 +08:00
dinedine c94087ccb5 Merge branch 'mariovisic-page_redirect' 2011-01-08 00:14:19 +01:00
dinedine 1291b68aba in special sitation inherited templates were not correctly updated 2011-01-08 00:10:44 +01: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 8a3151cf58 change version + bug fix with the webservice module 2011-01-04 12:49:14 +01:00
dinedine d8a8ad4de0 make the webservice helper more robust (because of the numerous api errors in tumblr) 2011-01-03 22:09:19 +01:00
dinedine c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +01:00
dinedine 56a7a09903 minor stuff 2011-01-03 14:44:38 +01: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 c0ac0046c1 polishing + bump version (beta yeaaah) 2010-12-31 19:31:22 +01:00
dinedine 83bce13020 fonts were not served in the locomotive engine 2010-12-30 18:15:06 +01:00
dinedine 99b54d4d1b fix bug with jammit-s3 and safari css hack + new version of aloha + bug with Heroku / Theme uploader without DJ + other minor things 2010-12-30 15:24:47 +01:00
dinedine 8d610dee49 Importing theme works with ruby 1.9.2 + clean code 2010-12-27 12:59:54 +01:00
dinedine 62564021b6 the theme import module can work without delayedjob + fix bugs 2010-12-17 00:42:38 +01:00
dinedine 727a824745 prepare locomotive as a gem 2010-12-16 13:39:05 +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 89f106405d fix broken tests + get rid of warnings in cucumber 2010-10-29 17:40:58 +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 680a42b8f5 first attempt of an installation wizzard 2010-10-27 02:11:44 +02:00
dinedine c2766f0273 Merge branch 'origin/nodefault' 2010-10-26 15:09:58 +02:00
dinedine 7cb26a74d4 fix bug with pagination + add _permalink property for content instances 2010-10-26 15:06:57 +02:00
dinedine b4d3aae46f order assets when used in liquid templates 2010-10-19 16:56:50 +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 5db5d70b0b should fix the issue with Heroku 2010-10-18 15:19:33 +02:00
dinedine dffec0731e remove namespace for delayed_job tasks (needed by heroku) 2010-10-17 03:26:32 +02:00
dinedine 344a737b9a clean code + fix gem requirements for the engine version of this app 2010-10-17 03:18:41 +02:00
dinedine a03dd77a65 update gem dependencies + gemspec + liquid tags (stylesheet_tag, ...etc) work with amazon S3 2010-10-16 11:27:26 +02:00
dinedine acaf997b6e build locomotive engine as a gem 2010-10-15 02:05:21 +02:00
dinedine 163077be43 index in first, 404 page in last when importing theme 2010-10-14 23:56:51 +02:00
dinedine 282fbb7244 merging 2010-10-14 14:37:14 +02:00
dinedine 1c86db05f8 polish the import module + some code refactoring / cleaning 2010-10-12 02:12:18 +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 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 eabe4903f3 refactor locomotive liquid drops + implement the theme or site import page (95% done) 2010-09-29 00:08:11 +02:00
Jacques Crocker 350aee82a8 Vendoring mongo_session_store so we have one less dependency 2010-09-28 02:19:55 -07:00
dinedine a5ea70229c allows to disable import sub tasks + new images tag logic (in progress) + handle errors when importing 2010-09-28 10:09:49 +02:00
Jacques Crocker faccdef5a5 adding mimetype_fu require 2010-09-28 00:46:12 -07:00
Jacques Crocker d512e33d03 bundler needs help. removing gemspec helepr for now 2010-09-28 00:18:10 -07:00
Jacques Crocker ea4c09c7ce Updating dependencies, removing jeweler, and cleaning up gemspec 2010-09-27 23:04:40 -07:00
Didier Lafforgue e31012f861 fix a lot of tiny bugs (not yet) + testing import tool 2010-09-27 00:31:50 +02:00
dinedine 9a722c4268 working on importing pages 2010-09-24 01:00:13 +02:00
dinedine 39886427e0 first and unfinished draft of the import tool 2010-09-23 00:59:30 +02:00
dinedine 28ade83ab9 add comments 2010-09-22 10:47:21 +02:00
Jacques Crocker 9097200339 Adding specific admin templates for the "no site" and "no page" errors.
Goal should be to use these to allow someone to create a new site right here
2010-09-21 04:45:34 -07:00
Jacques Crocker 48c917982c Reorganizing Admin layouts, and deleting home controller and views 2010-09-21 04:16:39 -07:00
dinedine d5223e5c91 skinning tinymce to match locomotive style 2010-09-06 23:47:03 +02:00
dinedine eb81a5041f clean the inline editor js code (namespace toolbar functions, ...etc) 2010-09-06 14:22:13 +02:00
dinedine dad944d625 tiny patch for aloah-editor (span behaves like b tags) + enhance inline editor js (locale, spinner when saving, better ui, ...etc) 2010-09-06 00:50:05 +02:00
dinedine fc7fef8ba3 saving editable text elements works 2010-09-05 01:50:11 +02:00
dinedine 1e8376d18f page toolbar for live editing 2010-09-04 01:47:28 +02:00
dinedine 9967e9d3d3 first attempt to build the inline editor module 2010-09-03 01:03:20 +02:00
dinedine f7cfcf450e now working with Rails 3.0 and the last Mongoid gem 2010-09-01 16:26:00 +02:00
dinedine 35b4e5358c editable_file tag is implemented + remove not used editable elements all in once for better performance + default content inherits from the content of the parent element 2010-08-31 23:53:30 +02:00
dinedine 335d7a1aac fix a major bug when updating template children which have the same parent + remove debug output + rspec tests pass 2010-08-31 01:56:54 +02:00
dinedine d7aba616f6 editable long text implemented + refactoring + ui 2010-08-30 01:41:44 +02:00
dinedine af5fe62d89 clean and improve the ui concerning the editable elements of a page + fix bugs and refactor a bit 2010-08-28 02:00:05 +02:00
dinedine 0d72a9f932 first working attempt for editable_short_text liquid tag + update of the admin ui to reflect the new way of managing editable elements 2010-08-27 17:40:03 +02:00
dinedine eea6d4f8ce add some tests for the editable_elements feature + fix bugs 2010-08-26 13:06:44 +02:00
dinedine be36c85e90 implementation of editable_short_text in progress (tests failed) 2010-08-25 00:59:22 +02:00
dinedine e580021eda also update page templates if a snippet was modified 2010-08-24 15:04:53 +02:00
dinedine 75783ec881 when a template is modified, all pages inheriting from it are updated too (functional tests are coming) 2010-08-23 01:48:11 +02:00
dinedine 4805d8813e template errors in pages are handled correctly now (bug) + {% extends parent %} is implemented 2010-08-22 01:56:44 +02:00
dinedine 8196c0a6de handle more liquid errors during page editing 2010-08-22 00:58:26 +02:00
dinedine 9d78a32340 completely get rid of old layouts + enhance snippets integration + refactor parsing page module 2010-08-22 00:48:24 +02:00
dinedine e25ded881b custom fields has its own repo + upgrade code for Mongoid beta 16 + clean code + fix rspec tests 2010-08-20 17:56:15 +02:00
dinedine 53500bda9e first draft of the new template inheritance mechanism based on our fork of Liquid 2010-08-20 02:31:01 +02:00
dinedine 08f0fdfb5b clean code + tiny optimization 2010-08-09 16:39:38 +02:00
dinedine d879b80b7a working on optimization 2010-08-09 15:51:27 +02:00
dinedine 4f06dab51e implement liquid inheritance (in progress) 2010-08-08 13:30:27 +02:00
dinedine cf3a177580 move to liquid 2.1.2 2010-08-04 15:12:14 +02:00
Jacques Crocker 2b14c9c992 Woohoo! Got a content page to render in the Cucumber tests 2010-08-01 05:00:34 -07:00
Jacques Crocker 071196e97b Upgrading to Rails3 rc 2010-07-29 16:21:48 -07:00
dinedine e74fa1de56 custom error pages (404 for the backend section + 500 for the whole application) + clean up 2010-07-29 12:46:13 +02:00
dinedine 54116d9ebb multi site selector with cross domain authentication 2010-07-28 02:42:33 +02:00
Jacques Crocker a09329c030 Cleaning whitespace on all .rb files so commit diffs from now on will be a bit more readable 2010-07-23 13:09:54 -07:00
dinedine 2608430cae allow users to use shortcut for theme images when editing snippets / layouts / stylesheets + fix minor ui bugs 2010-07-23 00:10:40 +02:00
dinedine a03b631a71 create a liquid drop for site (include a method to get the home page) 2010-07-22 02:18:14 +02:00
dinedine 35e0120cab fix js bug when changing layout in page editing + improve nav tag 2010-07-22 01:35:30 +02:00
dinedine c4f4979203 remove dirty logger 2010-07-20 12:21:18 +02:00
dinedine b2c39b4137 updating Rails to beta 4 + mongoid to beta 9 + fix all broken parts caused by the upgrade 2010-07-20 12:15:53 +02:00
dinedine 7dac567cbc show / hide templatized page with visible / hidden content + disable font theme assets for web security reasons 2010-07-19 02:09:10 +02:00
dinedine 0304565f30 accept font assets in theme 2010-07-17 22:51:52 +02:00
dinedine 50c578b138 if 404 page is not published, go to root site 2010-07-16 23:28:44 +02:00
dinedine fb148a31a4 templatized page + fix bug with nav widget 2010-07-16 22:36:07 +02:00
dinedine 0be89c253d action_mailer_request plugin was not called when Locomotive was used as an engine [fixed] 2010-07-15 13:10:00 +02:00
dinedine 6096d18689 annoying bug with InheritedResources, engine and custom actions 2010-07-14 02:27:38 +02:00
dinedine f4e2d09bdf fix a bug with IR only when Locomotive is used an engine + fix minor stuff 2010-07-14 01:37:02 +02:00
dinedine 533a4ee4aa flash messages in French + new icon for assets + ajax update for almost all forms 2010-07-13 22:01:40 +02:00
dinedine 0671a55ef8 sitemap + use inherited_sources gem to refactor controllers + fix bugs + clean stuff + save some forms with CMD + S (in progress) 2010-07-13 02:46:17 +02:00
dinedine cc03e0b774 new cache strategy + remember_me set to true by default + fix bugs (one with mongo_tree) 2010-07-09 12:38:50 +02:00
dinedine 4e2e6411f3 fix liquid gem version + require httparty + bump to 0.0.2.8 2010-07-06 23:44:24 +02:00
dinedine 96e4753ed6 specify MIT license + textile filter + fix bug with new tree plugin + fix tests 2010-07-06 17:00:02 +02:00
dinedine c38a8ff9dd adding 2 new liquid tags: consume (to retrieve posts from a blog for instance) + nav (display children of a page) + fix a few bugs 2010-07-06 02:05:47 +02:00
dinedine a6bde2b8e5 new custom field type: File + fix minor issue with Date 2010-06-30 15:18:17 +02:00
dinedine c5b5c6ded4 move patches for mongoid / carrierwave + add patch for mongoid + clean stuff 2010-06-30 00:09:47 +02:00
dinedine b8dd3e772e bug fixes 2010-06-24 11:14:08 +02:00
dinedine 074326095d access children of a page in liquid templates (useful for building nav widgets) 2010-06-21 17:46:17 +02:00
dinedine b7e1cd0926 categories in content types have been improved a lot + cross-site session + meta keys / description for site + clean code + fix bugs 2010-06-16 16:43:29 +02:00
dinedine 29c22c05c1 heroku support + fix minor bugs 2010-06-14 15:04:01 +02:00
dinedine 28211edad6 fix assets upload with S3 in production + enhance a couple of things 2010-06-12 23:47:14 +02:00
dinedine 339d791e7d make Locomotive compliant with Heroku + better names for generator + comment console.log in some js preventing js actions 2010-06-12 03:13:58 +02:00
dinedine 1d5786638b add logging option in Locomotive settings 2010-06-11 11:29:51 +02:00
dinedine f567b7754f change devise config in routes.rb + clean code + fix broken tests 2010-06-11 00:07:59 +02:00
dinedine 7ccc3d4548 very simple api for contents (just create for now) + fix a lot of bugs in the custom fields plugin and some enhancements as well + add an ui for manage categories + fix bugs 2010-06-10 15:30:22 +02:00
dinedine fc690d8a0b rename CustomFields::CustomField into CustomFields::Field + create a dynamic class when we have an object with custom fields (optimization) + create a new type of custom field: categories + fix minor bugs + add ui to rename the alias of a custom field 2010-06-08 02:45:49 +02:00
dinedine 3d22ef4d1c modify the way locomotive setups a mongo connection 2010-06-04 00:55:04 +02:00
dinedine 9f20f56b1d fix some bugs about engine startup + add a generator to install assets into the parent app 2010-06-03 22:20:53 +02:00
dinedine 9e7d1d3a08 make an engine of the cms 2010-06-03 17:32:40 +02:00
dinedine 29a83d7008 theme asset picker done (+ flash upload feature) + some refactoring about uploader 2010-06-02 16:31:01 +02:00
dinedine eaaa2b0d35 theme asset picker in progress 2010-06-02 02:39:05 +02:00
dinedine 176d378ce5 clean code and refactoring a lot + handle non published page 2010-06-01 02:06:46 +02:00
dinedine 9447386f0e rendering engine + liquid tags/drops/filters + rspec tests + fix small bugs 2010-05-31 01:57:33 +02:00
dinedine 13cd09e3af asset collections almost done 2010-05-12 02:16:39 +02:00
dinedine e5c10cfa3e theme assets 2010-05-11 23:38:52 +02:00
dinedine 9901f53e12 now can add new sites / accounts + basic membership mechanism iimplemented + fix a lot of minor bugs + add more rspec tests 2010-05-11 00:39:52 +02:00
dinedine a0216dc75f first cucumber features + crud for pages (95% done) 2010-05-09 14:44:53 +02:00
dinedine 3b847b2732 new page tree ui + snippets crud + layout crud (in progress) + page parts (in progress) 2010-05-03 01:33:17 +02:00
dinedine ae20b51636 page acts as tree / list + improve validations 2010-04-30 16:05:53 +02:00
dinedine e81b4a353a creating page in progress 2010-04-25 02:33:38 +02:00
dinedine 0d606852ef beautiful login page is up 2010-04-23 01:52:11 +02:00
dinedine 0db6b9625f add cucumber to the projet (waiting for the first scenari) 2010-04-13 01:33:25 +02:00
dinedine 8d1f6a24e1 Site dispatcher in its core version works + tests are coming 2010-04-12 01:59:18 +02:00
dinedine 3b8a6c67df add validations to site 2010-04-10 17:25:07 +02:00
dinedine ff6fcf43f1 clean code + rspec works smoothly now 2010-04-09 14:03:54 +02:00
dinedine 4e16509531 current testing context 2010-04-09 12:22:38 +02:00
dinedine cd67a29b88 working stack ? 2010-04-09 11:23:41 +02:00
dinedine a9fb66f9c1 first init 2010-03-30 00:01:47 +02:00