Commit Graph

194 Commits

Author SHA1 Message Date
did 2827834e19 new Aloha version 2011-02-12 16:19:56 +01:00
did 97ff5f07c1 cleaning 2011-02-12 16:19:22 +01:00
did 94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
Raphael Costa f281934832 fix in portuguese translations 2011-02-12 01:50:47 -02:00
Raphael Costa eaab196d06 Brazilian Portuguese Translations 2011-02-11 23:44:35 -02:00
Raphael Costa d97c8b8525 Brazillian Portuguese Translation (5) 2011-02-10 01:23:28 -02:00
Raphael Costa 7998e3a841 Brazillian Portuguese Translation 2011-02-09 23:29:20 -02:00
Dirk Kelly 47e6691e3c hide the listed option on a template 2011-02-01 16:08:06 +08:00
Dirk Kelly 3160f10ec5 javascript for the unlisted options show/hide 2011-02-01 15:08:26 +08:00
dinedine 2fc99bf90a rename translation files (convention) + email notification when adding contents (api) 2011-01-18 15:24:42 +01:00
dinedine 0fcd8d5a3c new version of codemirror + enable liquid colorization + minify codemirror + cmd+S works on Safari, Firox and Chrome 2011-01-12 16:54:09 +01:00
dinedine b397a34c47 Merge branch 'dollar-cmd-s' of https://github.com/dirkkelly/locomotive into dirkkelly-dollar-cmd-s 2011-01-12 09:42:35 +01:00
Dirk Kelly 135f6e54ad added a $.cmd("key", {}) method, is now used by shortcut.js 2011-01-11 21:42:47 +08:00
dinedine 890d5d7e18 the import module takes care of redirection pages (+ tests) 2011-01-10 14:57:44 +01:00
dinedine 2adb950ac3 css stuff 2011-01-10 11:04:53 +01:00
dinedine fd10f7e356 Merge branch 'page_redirect' of https://github.com/mariovisic/engine into mariovisic-page_redirect 2011-01-07 15:04:50 +01:00
dinedine 3ee566eae6 add missing stylesheet for the asset collections section in the back-office 2011-01-07 14:50:53 +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 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 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 a1d9a5d548 reflect changes from the last imported theme (enhancements + bugs fixed) 2010-10-31 00:30:30 +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 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 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 1e1c3bd97b haml always in ugly mode + refactor theme files section in admin 2010-09-22 14:50:01 +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 f458716c8a clean new tinymce image plugin 2010-09-15 02:21:46 +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 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 ba1009340e turn any html textarea into a WYSIWYG when saving a page in ajax 2010-09-01 00:12:37 +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 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 d973868a06 merge + fix tiny bugs 2010-08-02 13:45:50 +02: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 29f2b58731 Might as well clean up spaces on js and css too. 2010-07-23 13:20:09 -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 35e0120cab fix js bug when changing layout in page editing + improve nav tag 2010-07-22 01:35:30 +02:00
dinedine 81dc8ea623 build a generic theme image picker 2010-07-18 00:01:00 +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 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 96e4753ed6 specify MIT license + textile filter + fix bug with new tree plugin + fix tests 2010-07-06 17:00:02 +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 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 9447386f0e rendering engine + liquid tags/drops/filters + rspec tests + fix small bugs 2010-05-31 01:57:33 +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 05a93cb5c1 custom fields proof of concept in progress 2010-05-19 18:17:45 +02:00
dinedine 13cd09e3af asset collections almost done 2010-05-12 02:16:39 +02:00
dinedine 8c6e9bd981 remove useless files from repo 2010-05-11 23:40:09 +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 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 8d1f6a24e1 Site dispatcher in its core version works + tests are coming 2010-04-12 01:59:18 +02:00
dinedine a9fb66f9c1 first init 2010-03-30 00:01:47 +02:00