Commit Graph

121 Commits

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