Commit Graph

193 Commits

Author SHA1 Message Date
did ca0921d2f3 tweak the css for firefox and safari 2011-07-05 18:32:21 +02:00
did bd28f4c1ec new sites picker 2011-07-05 18:30:12 +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 05331dee86 enable fullscreen editing with tinyMCE 2011-07-03 02:02:52 -07: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 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 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 3c0f7afec0 fix tests + rename and refactor the slugify method (now called permalink) 2011-06-21 13:03:24 -07:00
did 0631b96df9 clean code + fix a tiny weird js behaviour when picking up a theme asset 2011-06-21 06:40:01 -07:00
did 3c31c8dbcf remove all the references to asset_collections 2011-06-21 06:12:20 -07:00
did a0293b161b add a new plugin in tinymce to upload any kind of files (Bernd) 2011-06-21 05:47:11 -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 0878a39858 saving with the inline editor toolbar did not work (fixed) 2011-06-16 05:07:28 -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
Didier Lafforgue ddce344e73 Merge pull request #75 from potatosalad/28a4ec4ac2f8d493af130d13a28432d6249f4cfd
Aloha Editor submodule references removal
2011-05-31 15:41:59 -07:00
did 61886ec1b1 installation procedure allows to install the default site template if provided 2011-05-28 19:45:29 -07:00
Andrea Frigido 35d5e7d44e Merge remote-tracking branch 'upstream/master' 2011-05-23 09:07:35 +02:00
did e8cdfc4794 new version of custom fields + display error messages for has_one and has_many field types 2011-05-20 15:27:07 +02:00
did d2f6cc0c53 has_many ui has been implemented 2011-05-19 17:44:04 +02:00
Benjamin Athlan a224aff063 Fixed open/close folder arrows by plugin 2011-05-18 18:27:24 +02:00
Benjamin Athlan b1819af066 Fixed arrows down on init 2011-05-16 22:08:06 +02:00
Andrea Frigido a9dd7b8963 Tiny_mce locoimage italian localization. 2011-05-10 16:18:49 +02:00
did 7dafc66359 typo for the french translation of the italian locale + right italy flag 2011-05-07 13:48:49 +02:00
Andrew Bennett 28a4ec4ac2 Remove git submodule references in cache and add to repo instead.
Fixes locomotivecms/engine#49, locomotivecms/engine#55, and locomotivecms/engine#67
2011-05-04 19:40:05 -06:00
Andrea Frigido 67dd6304e0 Tiny_mce and inline_edit italian localization. 2011-05-04 18:57:01 +02:00
Andrea Frigido bee4f01e56 Italian localization. 2011-05-04 13:05:16 +02:00
did 2942ce58c8 merged manually pull request #62: extended german language 2011-04-27 16:58:58 +02:00
did 1e5624ce06 fix js bugs 2011-03-20 11:21:07 +01:00
did a66e745746 fix bug #52 2011-03-17 17:41:25 +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 b4f871c5f6 support for content_types breaking over multiple lines 2011-03-07 19:59:36 +08:00
did 1602f9b9c0 the inline editor was broken (caused by the last version of mongoid), now it does work 2011-03-05 23:56:40 +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 537c1a6f67 clean translations (password, new_password) + provide a right tab background longer for the menu 2011-03-05 01:10:52 +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 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
Bernd Hauser 718e8f7b0d fixed german translation in tinymce 2011-02-23 12:49:25 +01:00
Bernd Hauser 32701d7894 german language added 2011-02-23 12:40:56 +01:00
did 16090a0f75 fix the mess with git and Aloha 2011-02-12 18:21:10 +01:00
did af5ec86c57 merging 2011-02-12 18:13:06 +01:00
did ff14f6f64f new version of Aloha-Editor 2011-02-12 16:25:52 +01:00
did 138be23492 weird git behaviour 2011-02-12 16:22:47 +01:00
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