Commit Graph

171 Commits

Author SHA1 Message Date
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
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