github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
940 Commits 13 Branches 7 Tags 15 MiB
Commit Graph

339 Commits

Author SHA1 Message Date
Mario Visic 1c04b39c7e Fixed a bug that was preventing deleting sites 2011-02-26 21:12:26 +08:00
Bernd Hauser 09f3162861 fix in default.de.yml 2011-02-23 14:57:33 +01: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
Keith Pitt e3f40558a0 Provide the error message aswell 2011-02-04 16:21:50 +08:00
Keith Pitt da3bd6cef2 Include error backtrace in output 2011-02-04 15:57:26 +08:00
Keith Pitt 713d30bdb6 Hacked the admin images controller to work 2011-02-04 15:44:42 +08:00
Dirk Kelly c11c18c445 Fixes issue where custom content wouldn't get created. 2011-02-03 07:40:06 +08:00
Dirk Kelly 7d30d00ec4 minimal attributes to include listed 2011-02-01 17:05:36 +08:00
Dirk Kelly 1c91bfb673 returning the height 2011-02-01 16:30:20 +08:00
Dirk Kelly 2b438966f5 including the listed module 2011-02-01 16:17:12 +08:00
Dirk Kelly 9a1f45de36 including the styles to keep the slug and content types the same height 2011-02-01 16:17:05 +08:00
Dirk Kelly cc387a91f7 style updates 2011-02-01 16:07:31 +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 d672c0b946 moved content type above the templated option to avoid content jumps, added some translations 2011-02-01 15:08:56 +08:00
Dirk Kelly db4d2af1bc Added unlisted selector to page form 2011-02-01 14:50:32 +08:00
Dirk Kelly 6ba65b1b96 Added an unlisted flag 2011-02-01 14:39:20 +08:00
dinedine da51dbc14e more information in the logs when errors during the import + import asset collections without custom fields 2011-01-30 00:20:15 +01:00
dinedine e896618c99 fix minor ui issue in the theme assets section 2011-01-29 17:24:37 +01: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 456521bbed sitemap functionnality works with engine 2011-01-22 14:09:29 +01:00
dinedine 415ce9fb82 bson_ext is now in 1.2.0 + add lastmod for the sitemap xml + fix issue #19 2011-01-21 12:04:59 +01:00
dinedine d56af954f2 fix issue #15 2011-01-18 18:13:06 +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 6eead019d4 Merge branch 'master' of https://github.com/mariovisic/engine 2011-01-18 01:23:02 +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
Mario Visic f70c651e57 Fixed a bug preventing the name of the current site from updating 2011-01-16 11:49:00 +08: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
dinedine 3686496bb2 still got errors with dates display + admin default root points to signin 2011-01-11 12:42:12 +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 c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +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 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 d0a089fb77 DelayedJob is disabled by default 2010-12-19 21:34:01 +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 89f106405d fix broken tests + get rid of warnings in cucumber 2010-10-29 17:40:58 +02:00
dinedine aa764ee185 add French translations for the installation + installation allowed if both no sites and no accounts 2010-10-29 17:28:38 +02:00
dinedine 9b175c3cda add options when importing new site + fix page toolbar style + fix minor stuff 2010-10-29 17:12:57 +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 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 c86ea8b3ca the uploaded theme was not correctly copied (issue with Heroku) 2010-10-18 15:08:47 +02:00
dinedine 3863272ced finish to merge + tweak minor stuff 2010-10-14 16:01:18 +02:00
dinedine bab4577de0 fixing failed tests 2010-10-12 17:26:05 +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 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
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
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 1e1c3bd97b haml always in ugly mode + refactor theme files section in admin 2010-09-22 14:50:01 +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 0f8a1731d3 fix an ui bug when adding/modifying domains 2010-09-15 18:39:51 +02:00
dinedine 962c04a615 add indexes for better performance 2010-09-15 18:09:07 +02:00
dinedine 9533df3e43 clean up stuff in js + do not display the internal asset collection in the assets section + fix ui bug with custom fields in the assets section 2010-09-15 17:48:10 +02:00
dinedine 2e4a15a511 new image plugin for tinymce 2010-09-15 02:19:34 +02:00
dinedine d5223e5c91 skinning tinymce to match locomotive style 2010-09-06 23:47:03 +02:00
dinedine c347038869 re-activate custom application error page 2010-09-01 00:41:55 +02:00
dinedine d2ca6254b3 clean code + use the last version of locomotive liquid 2010-09-01 00:04:21 +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 dbc542c4d7 fix bugs with acts_as_tree + fix cucumber tests 2010-08-20 18:24:59 +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 fbda6a17f9 update benchmark with results on my imac + tweak ui in order to reflect changes about with liquid inheritance 2010-08-08 15:16:32 +02:00
dinedine 4f06dab51e implement liquid inheritance (in progress) 2010-08-08 13:30:27 +02:00
dinedine c76cd6527c merge 2010-08-02 16:16:08 +02:00
dinedine d973868a06 merge + fix tiny bugs 2010-08-02 13:45:50 +02:00
Jacques Crocker d872805101 Fix up the default body thing 2010-08-01 00:50:29 -07:00
Jacques Crocker 925c7fff8d All Page to be passed in a :body attribute 
This :body attribute will then be used when creating the default body PagePart
 2010-08-01 00:00:06 -07:00
Jacques Crocker 36ab2f0066 Missed a named_scope 2010-07-31 23:49:04 -07:00
Jacques Crocker 07a7cddb2d named_scope => scope 2010-07-31 23:01:38 -07:00
Jacques Crocker 5d8a0819e9 Tweak features to use labels 2010-07-31 00:44:34 -07:00
Jacques Crocker cc8ae8e18c Oops, didnt quite understand the "consider requests local" flag. 
Reverting it to its previous settings
 2010-07-30 23:50:44 -07:00
Jacques Crocker ae6ea7c288 Very useful to see errors in dev and test envs 2010-07-30 20:57:32 -07:00
Jacques Crocker d3ef80de62 I think pages auto created for new Sites should by published by default 2010-07-30 19:18:01 -07:00
Jacques Crocker 8a17394223 Updating to the latest Mongoid association syntax 
has_many_related => references_many
belongs_to_related => referenced_in
 2010-07-30 19:15:24 -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 37ec70687b add cucumber scenarii for the cross domain authentication feature 2010-07-28 12:17:56 +02:00
dinedine 54116d9ebb multi site selector with cross domain authentication 2010-07-28 02:42:33 +02:00
Jacques Crocker fcc305b89b Add html safe view for layout's title 2010-07-23 16:58:10 -07:00
Jacques Crocker f566861a10 Fixing up whitespace on all the .haml files 2010-07-23 16:57:38 -07:00
Jacques Crocker 0d7d059736 clean up spacing on a couple haml files 2010-07-23 16:51:54 -07:00
Jacques Crocker 01b73e89fb Fix a html_escaping bug on the content page 2010-07-23 16:51:43 -07:00
Jacques Crocker d80d1c176c My Account form fixes (label around radios, autocomplete off for password) 2010-07-23 16:06:54 -07: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 d632a5363c translations are html safe (xss) 2010-07-22 01:56:42 +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 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 81dc8ea623 build a generic theme image picker 2010-07-18 00:01:00 +02:00
dinedine 0304565f30 accept font assets in theme 2010-07-17 22:51:52 +02:00
dinedine fb148a31a4 templatized page + fix bug with nav widget 2010-07-16 22:36:07 +02:00
dinedine 56d7fddcfb slightly polishing form + update title / account name when saving in ajax 2010-07-15 22:48:02 +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 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 821210795d localize devise mailer + fix js bug in safari when uploading theme assets 2010-06-30 17:42:00 +02:00
dinedine 9797d6d137 localize devise mailer + fix js bug in safari when uploading theme assets 2010-06-30 17:41:54 +02:00
dinedine a6bde2b8e5 new custom field type: File + fix minor issue with Date 2010-06-30 15:18:17 +02:00
dinedine dda2f7ef19 new custom field type: Date 2010-06-30 02:03:34 +02:00
dinedine b8dd3e772e bug fixes 2010-06-24 11:14:08 +02:00
dinedine 6d45155b2f rich text editor for the Text custom field + refactor the custom field types + add new custom field type: Boolean + fix asset collections 2010-06-22 15:04:40 +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 f567b7754f change devise config in routes.rb + clean code + fix broken tests 2010-06-11 00:07:59 +02:00
dinedine 6b0dafc223 refactor + fix bugs + complete translations in English + api security option in content types 2010-06-10 16:50:50 +02:00
dinedine d0ff08c9a1 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:32 +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 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 311903a43d mongoid fields are not shared by 2 instances of a same class but with different custom fields 2010-05-26 12:14:39 +02:00
dinedine 1a2467acf4 sort contents within a conten type + make content type validation more robust + find a bug when dealing with 2 content types 2010-05-26 02:41:10 +02:00
dinedine 4534a11ce4 adding contents works + add spec + enhance content types 2010-05-25 02:32:12 +02:00
dinedine 61958d9452 fix bug about page parts when creating or modifying layout + begin to work on the custom content types feature (50% done) 2010-05-24 02:18:23 +02:00
dinedine 1ed613ede8 custom field validation is more robust + editing new fields for assets works now 2010-05-22 16:46:32 +02:00
dinedine 10ffc2e8bb remove references from CustomField proof of concept 2010-05-21 02:41:33 +02:00
dinedine 7171f603f8 refactoring of CustomField plugin in progress (cleaned a lot) 2010-05-21 02:34:32 +02:00
dinedine 9d134599b2 first bricks of the CustomFields plugin 2010-05-20 01:42:19 +02:00
dinedine 05a93cb5c1 custom fields proof of concept in progress 2010-05-19 18:17:45 +02:00
dinedine 277b531449 first draft of custom fields 2010-05-18 00:51:53 +02:00
dinedine c15c635efe custom fields (in progress) 2010-05-17 22:46:41 +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 4ca9037d1b style the admin layout 2010-04-24 02:32:36 +02:00
dinedine 0d606852ef beautiful login page is up 2010-04-23 01:52:11 +02:00
dinedine 710e2bba29 customizing devise 2010-04-13 16:26:40 +02:00
dinedine 30789cbbc3 adding devise + create account model and bind it to site 2010-04-13 15:24:12 +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 cd67a29b88 working stack ? 2010-04-09 11:23:41 +02:00
dinedine a9fb66f9c1 first init 2010-03-30 00:01:47 +02:00