Commit Graph

951 Commits

Author SHA1 Message Date
did
4f7312a659 CAS feature + Cells 2011-07-25 23:07:32 +02:00
Kev Zettler
b780bbd42a upgraded the help menu and added handler for bushi_bar guide 2011-07-22 17:55:01 -07:00
did
e2b68ba861 restore production settings + fix broken tests + apply the coding convention on the recently modified haml file 2011-07-23 01:26:16 +02:00
Kev Zettler
13e247691f Merge pull request #137 from Bushido/master
Guiders and new gem version
2011-07-22 15:28:03 -07:00
Kev Zettler
2472e486fd Merge branch 'master' of github.com:Bushido/engine 2011-07-21 19:01:04 -07:00
Kev Zettler
1ce9c2a432 bumped gem to 30 2011-07-21 19:00:49 -07:00
Sean Grove
5ea345aed5 Merge branch 'master' of github.com:Bushido/engine 2011-07-21 18:49:00 -07:00
Sean Grove
2a9a49f1b1 No more need for debug output 2011-07-21 18:48:46 -07:00
Sean Grove
694ca19324 Le sigh... 2011-07-21 18:38:58 -07:00
Sean Grove
32f57cc43c Output some debug information 2011-07-21 18:21:47 -07:00
Kev Zettler
cf0b49932e dropped bushido gem back to 29 2011-07-20 22:53:04 -07:00
Kev Zettler
c1a1e720d3 added guider info to starter page 2011-07-20 22:19:21 -07:00
Kev Zettler
e5549cc600 bumped bushido gem 2011-07-20 22:02:12 -07:00
Kev Zettler
55f95499ce commented out the compression disable dev stuff 2011-07-20 12:24:04 -07:00
Kev Zettler
466cd99101 updated flow and body copy for bushi_banner guider 2011-07-20 12:19:20 -07:00
Kev Zettler
b9f5943585 added init hook for tinyMCE dependent guiders 2011-07-20 12:19:06 -07:00
Didier Lafforgue
756ebc06b2 Merge pull request #134 from petrblaho/js_css_https
https in url for javascript and stylesheet liquid filters
2011-07-19 23:39:46 -07:00
Kev Zettler
6fa003db5c omg more tutorials awesome 2011-07-19 17:35:48 -07:00
Petr Blaho
dfa0196e89 Added tests to https variant of js and css url in liquid tags 2011-07-19 23:02:36 +02:00
Petr Blaho
a491b15801 Added possibility to use https in js and css url with liquid tags 2011-07-19 23:00:58 +02:00
Petr Blaho
18d3c5c591 Extended tests of js and css liquid tags to distinguish between url that starts with "/" or "http:" 2011-07-19 22:58:08 +02:00
Didier Lafforgue
294da07565 Merge pull request #132 from petrblaho/js_css_url
javascript_url and stylesheet_url liquid tag
2011-07-19 09:05:44 -07:00
Petr Blaho
e39519f3ba Added tests for stylesheet_url and javascript_url liquid tags 2011-07-19 16:40:58 +02:00
Petr Blaho
41472c88bd Created stylesheet_url and javascript_url liquid filters 2011-07-19 16:27:42 +02:00
did
819d7ac5ff fix issue #131 2011-07-19 16:20:53 +02:00
did
194a01d15f solve temporarily the issue #127 2011-07-19 15:51:29 +02:00
did
91aa975973 fix issue #126 2011-07-19 15:36:38 +02:00
did
47088f9b0e fix issue #115 + clean code + exporting a site works now with ruby 1.8.7 2011-07-19 14:52:02 +02:00
did
45ff488ae8 enhance the rake task which forces to serialize page templates + do not import twice an asset with the same filename 2011-07-19 11:49:15 +02:00
Kev Zettler
6db607cb1e updated tutorial flow 2011-07-18 20:56:42 -07:00
Kev Zettler
4eabcdbaa8 added an onchange callback for tinyMCE 2011-07-18 20:56:26 -07:00
Kev Zettler
e22e7a5e46 changed the 'update' buttons to save save 2011-07-18 20:55:55 -07:00
Kev Zettler
217465cfda guide updates 2011-07-18 16:42:01 -07:00
did
53a83b5f79 fix broken rake task (rebuild_serialized_page_templates) 2011-07-18 23:11:22 +02:00
Kev Zettler
3b5df5e8a8 more awesome tutorials, more helpful on sites that have no data 2011-07-14 21:38:02 -07:00
did
9a36e85ce1 update the export test 2011-07-14 15:18:19 +02:00
did
e27c26ebdd Merge branch 'master' of github.com:locomotivecms/engine 2011-07-14 15:01:53 +02:00
did
5f29ebd55b when exporting a site, a nil value for the listed page property should be considered as false 2011-07-14 15:01:34 +02:00
Didier Lafforgue
cd45ddf551 Merge pull request #124 from vandrijevik/master
Fix usage of HEROKU_LOGIN and HEROKU_PASSWORD for specifying Heroku credentials
2011-07-14 05:58:46 -07:00
did
efe2e63aa3 offical IE maintainer: Alex Sanford 2011-07-14 14:43:59 +02:00
Vladimir Andrijevik
ce96d86cdd Fix usage of environment variables for Heroku credentials. 2011-07-14 14:23:15 +02:00
Didier Lafforgue
4a9da56341 Merge pull request #114 from frisoft/master
Italian localization update + Locomotive.config.default_locale as default locale for new accounts.
2011-07-14 01:02:08 -07:00
Didier Lafforgue
93da1f0cf3 Merge pull request #122 from colibri-software/master
Quick patch for has_many bug in IE
2011-07-14 01:01:38 -07:00
Alex Sanford
d162cf20c8 Mostly fixed issue #121
Made the text show up but now the select won't update when options are
added or deleted
2011-07-13 23:27:48 -03:00
did
2c562038d8 use ActiveSupport::JSON.encode instead of the to_json method (not reliable) 2011-07-14 00:08:43 +02:00
did
8956145da7 use carrierwave instead of locomotive_carrierwave now (engine) 2011-07-13 21:29:39 +02:00
did
770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
Kev Zettler
7ca3e7fec7 adding some conditinal functions to tutorial.js to help with no datat off bushido locomotive installs 2011-07-11 15:55:16 -07:00
Andrea Frigido
f6c91ed791 Locomotive.config.default_locale as default locale for new accounts. 2011-07-11 13:13:58 +02:00
Andrea Frigido
0fde9917d5 Italian localization update. 2011-07-11 09:04:12 +02:00