Commit Graph

139 Commits

Author SHA1 Message Date
did 70493180f6 improve the French translation 2011-02-27 17:29:32 +01:00
did 42b5fc4f24 Merge branch 'no_membership_error' of https://github.com/mariovisic/engine into mariovisic-no_membership_error 2011-02-27 17:16:20 +01:00
did 2cb498bc50 added the German translation for the footer (thanks Estelle ;-)) 2011-02-27 12:32:57 +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 fcb056828a fixed default.de.yml 2011-02-23 15:21:39 +01:00
Bernd Hauser 32701d7894 german language added 2011-02-23 12:40:56 +01:00
Mario Visic f5b4e30d0a Logging into a site without membership now correctly displays an error message and redirects to login. 2011-02-20 21:39:02 +08:00
did bd992cc882 fix issue #37 plus other ones related to theme assets and assets 2011-02-19 00:51:57 +01:00
did 1aee2f4ce5 it prevented the use of rspec when locomotive was using as an engine 2011-02-13 01:12:27 +01:00
did af5ec86c57 merging 2011-02-12 18:13:06 +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 eaab196d06 Brazilian Portuguese Translations 2011-02-11 23:44:35 -02:00
Raphael Costa c5e9f05ee9 Brazillian Portuguese Translation (5) 2011-02-10 01:12:50 -02:00
Raphael Costa 858ada2f28 Brazillian Portuguese Translation (5) 2011-02-10 01:10:10 -02:00
Raphael Costa caeac4791b Brazillian Portuguese Translation (4) 2011-02-10 01:07:58 -02:00
Raphael Costa 5f58a6e1cb Brazillian Portuguese Translation (3) 2011-02-10 01:00:50 -02:00
Raphael Costa 742305cdfb Brazillian Portuguese Translation (2) 2011-02-09 23:36:55 -02:00
Raphael Costa ab97b9e6bc Brazillian Portuguese Translation 2011-02-09 18:56:31 -02:00
dinedine c178346969 fix the creation of theme assets (and add tests of course) + upgrade Gemfile + remove the mongoid patches 2011-02-04 10:39:23 +01:00
Dirk Kelly 974923b929 listed translation 2011-02-01 16:07:41 +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 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
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 3686496bb2 still got errors with dates display + admin default root points to signin 2011-01-11 12:42:12 +01:00
dinedine 3ee566eae6 add missing stylesheet for the asset collections section in the back-office 2011-01-07 14:50:53 +01:00
dinedine 2f478a86fd cleaning 2011-01-03 23:53:25 +01:00
dinedine 56a7a09903 minor stuff 2011-01-03 14:44:38 +01:00
dinedine c0ac0046c1 polishing + bump version (beta yeaaah) 2010-12-31 19:31:22 +01: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 8d610dee49 Importing theme works with ruby 1.9.2 + clean code 2010-12-27 12:59:54 +01:00
dinedine d0a089fb77 DelayedJob is disabled by default 2010-12-19 21:34:01 +01:00
dinedine 62564021b6 the theme import module can work without delayedjob + fix bugs 2010-12-17 00:42:38 +01:00
dinedine 727a824745 prepare locomotive as a gem 2010-12-16 13:39:05 +01:00
dinedine 88b1686053 forgot to add the jammit config file 2010-12-14 18:00:39 +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 aa764ee185 add French translations for the installation + installation allowed if both no sites and no accounts 2010-10-29 17:28:38 +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 c1b21fac8b use BSON::ObjectId to find elements (asset collection, content type) + make the import module work with S3 2010-10-19 12:20:09 +02:00
dinedine 344a737b9a clean code + fix gem requirements for the engine version of this app 2010-10-17 03:18:41 +02:00
dinedine 163077be43 index in first, 404 page in last when importing theme 2010-10-14 23:56:51 +02:00
dinedine 3863272ced finish to merge + tweak minor stuff 2010-10-14 16:01:18 +02:00