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

267 Commits

Author SHA1 Message Date
did bf99a36b58 tweak forms + fix minor js bug if no multi sites 2011-07-05 20:33:21 +02:00
did bd28f4c1ec new sites picker 2011-07-05 18:30:12 +02:00
did 00fd00240f the error message was not displayed correctly during a wrong import + remove the last tracks of the deprecated asset collections 2011-07-04 23:11:35 +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 91f2f145b3 the BIG MERGE is now done 2011-07-04 15:43:05 +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 690b2f2b2e fix a bug when filling in the content type name 2011-07-02 04:48:21 -07:00
did 812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did c7ea5ab532 add more features for the model section 2011-06-29 14:00:26 +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 33a29210ba forget to add a field to update the global seo title for a site + fix a tiny bug when destroying session + enhance hints on some form fields 2011-06-24 00:49:12 -07:00
did c9f3989c2b group contents by category for the has_ony / has_many widgets 2011-06-23 16:17:08 -07:00
did 587d383ac5 tweak ui: form, quick link to edit a model in the popup menu 2011-06-23 07:10:17 -07:00
did fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did 4d29500483 new version of custom_fields + allow users to change the permalink of the custom model instances 2011-06-21 14:53:21 -07:00
did 3c31c8dbcf remove all the references to asset_collections 2011-06-21 06:12:20 -07:00
did 57ba3ba273 get rid of the yellow banner in production 2011-06-21 01:27:13 +02: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 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 34c5d12ebf refactoring the rendering of content fields in a model 2011-05-19 18:00:45 +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 6dd810b44e new custom_fields gem version as well as an heroku patch to fix the weird issue about json/heroku 2011-05-01 00:28:25 +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 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 49c451ea54 small typo in the index page of the content types + merge Gemfile as well as the gemspec 2011-04-28 01:03:01 +02:00
TFG 324ed57f63 Adjustments to other views to use the new yield :submenu and yield :actions 2011-04-27 13:57:12 +08:00
TFG 89dd1e1c39 added new shared partials for actions near submenu 2011-04-27 13:57:12 +08: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
did 09bd73c7ac enhance carrierwave settings to support bushi.do 2011-04-07 11:53:07 +02:00
Keith Pitt 42a6807597 Allow the name of the custom fields form to be changed 2011-04-07 12:47:01 +08:00
did f16201f6cd do not run bushido subdomain validation if the value does not get changed + prevent to change the subdomain in Heroku (non multi-sites mode) 2011-04-07 02:18:07 +02:00
did 917208812b wrong bushido ENV name + do not ask for subdomain during the installation 2011-04-06 11:44:52 +02: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 a66e745746 fix bug #52 2011-03-17 17:41:25 +01:00
did 63530a3a30 still a problem with the last heroku gem (json) + fix an issue with invalid assets 2011-03-10 02:59:35 +01:00
did f38e6a8514 order direction for content types 2011-03-10 00:54:38 +01:00
did 2ba0718647 application error when submitting an asset without a name 2011-03-10 00:17:16 +01:00
did bbac778dda dates can also be used as highlighted field 2011-03-08 17:25:38 +01:00
did 80f792cfd3 generated sitemaps were invalid according to google web tools 2011-03-08 17:20:53 +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
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
did 2022b08b83 split the General Information section in the page form in two sub sections 2011-03-04 00:03:55 +01:00
did f0ee8a7b37 new menu layout in CSS3 and SASS (will make our life easier when integrating new modules) 2011-03-03 23:51:07 +01:00
did abcc61a8e6 add the missing index view for theme assets + update the 2 locomotive.rb files (generator + default) 2011-02-27 12:18:48 +01:00
Bernd Hauser 09f3162861 fix in default.de.yml 2011-02-23 14:57:33 +01:00
did bd992cc882 fix issue #37 plus other ones related to theme assets and assets 2011-02-19 00:51:57 +01:00
did 94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
Dirk Kelly 1c91bfb673 returning the height 2011-02-01 16:30:20 +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 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
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 2e774b2a97 conflict between the index scope in the page model and the mongoid index method 2011-01-27 10:49:42 +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 2fc99bf90a rename translation files (convention) + email notification when adding contents (api) 2011-01-18 15:24:42 +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
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 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 e6226abece use jammit to compress stylesheet/javascript files 2010-12-14 18:00:12 +01:00
dinedine 89f106405d fix broken tests + get rid of warnings in cucumber 2010-10-29 17:40:58 +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 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 3863272ced finish to merge + tweak minor stuff 2010-10-14 16:01:18 +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 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 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
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 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 d5223e5c91 skinning tinymce to match locomotive style 2010-09-06 23:47:03 +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 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 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 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 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 5d8a0819e9 Tweak features to use labels 2010-07-31 00:44:34 -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
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 d632a5363c translations are html safe (xss) 2010-07-22 01:56:42 +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 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 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