Commit Graph

490 Commits

Author SHA1 Message Date
dinedine d5464aa782 add tests 2011-01-18 01:19:18 +01:00
dinedine bc32848f6a Merge branch 'highlighted_field_value' of https://github.com/dirkkelly/locomotive into dirkkelly-highlighted_field_value 2011-01-18 00:40:45 +01:00
dinedine 0db0e9ccd6 Merge branch 'dirkkelly-add_or_update_editable_element' 2011-01-18 00:32:21 +01:00
dinedine 85bee3a110 Merge branch 'add_or_update_editable_element' of https://github.com/dirkkelly/locomotive into dirkkelly-add_or_update_editable_element 2011-01-18 00:28:41 +01:00
dinedine 23ce90eab1 clean the TODO list 2011-01-18 00:28:09 +01:00
Mario Visic f70c651e57 Fixed a bug preventing the name of the current site from updating 2011-01-16 11:49:00 +08:00
Dirk Kelly 5eab8e35bf calling page.title on a content_instance page would call highlighted_field_value.
This method was protected and would hence raise an inline exception.

I'm not sure why we would protect highlighted_field_value?
2011-01-14 15:47:53 +08:00
Dirk Kelly 62568bbdbb Fixed exception when updating a layout from back-office which contained an editable area 2011-01-14 15:27:58 +08: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 ff01539bb5 date in content types compatible with ruby 1.9.2 2011-01-11 00:50:42 +01:00
dinedine 933c26dbb2 bump version 2011-01-10 15:15:53 +01:00
dinedine cfaa5ce66a remove 1..100 2011-01-10 15:05:55 +01:00
dinedine 5301fa083c Merge branch 'master' of https://github.com/mariovisic/engine into mariovisic-master 2011-01-10 14:58:38 +01: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
Mario Visic 6b4001165f Altered rendering to set the HTTP 404 status when no page is found 2011-01-09 10:08:32 +08:00
dinedine c94087ccb5 Merge branch 'mariovisic-page_redirect' 2011-01-08 00:14:19 +01:00
dinedine 1291b68aba in special sitation inherited templates were not correctly updated 2011-01-08 00:10:44 +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 8a3151cf58 change version + bug fix with the webservice module 2011-01-04 12:49:14 +01:00
dinedine 5519ca8396 update README 2011-01-04 00:14:45 +01:00
dinedine 2f478a86fd cleaning 2011-01-03 23:53:25 +01:00
dinedine d8a8ad4de0 make the webservice helper more robust (because of the numerous api errors in tumblr) 2011-01-03 22:09:19 +01:00
dinedine c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +01:00
dinedine 56a7a09903 minor stuff 2011-01-03 14:44:38 +01:00
dinedine 572ee360a1 preserve page orders when importing theme + handle favicon as theme asset + add tests for the nav tag + polish code (remove useless logs) 2011-01-03 11:50:09 +01:00
dinedine 210ce3d2d8 enhance the nav tag + some optimization in the back-office when rendering the pages tree 2011-01-02 23:58:06 +01:00
dinedine c0ac0046c1 polishing + bump version (beta yeaaah) 2010-12-31 19:31:22 +01:00
dinedine 83bce13020 fonts were not served in the locomotive engine 2010-12-30 18:15:06 +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 87caa55b80 rspec 2.3 2010-12-19 21:27:32 +01:00
dinedine 9bcebbd6ab pickle as a gem 2010-12-17 11:58:59 +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 bbb09b58cf ruby 1.9.2 compliant 2010-11-08 18:42:14 +01:00
Jacques Crocker 2d4f77c5ca Fix up Gemfile for Ruby 1.9.2 2010-11-04 17:07:03 -07:00
dinedine a1d9a5d548 reflect changes from the last imported theme (enhancements + bugs fixed) 2010-10-31 00:30:30 +02:00
dinedine 89f106405d fix broken tests + get rid of warnings in cucumber 2010-10-29 17:40:58 +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