Commit Graph

348 Commits

Author SHA1 Message Date
did
72c1ac9454 solve minor bugs 2011-07-08 15:03:48 +02:00
did
711110a6e0 snippets were missing in the export 2011-07-07 16:59:50 +02:00
did
007f34ed8c export didn't work when sub pages 2011-07-07 01:34:11 +02:00
Didier Lafforgue
bf4b2be2b9 Merge pull request #108 from corgibytes/variables-as-values
Enabled the use of variable values as the default values for editable con
2011-07-06 15:06:47 -07:00
M. Scott Ford
314c1293d9 Enabled the use of variable values as the default values for editable content. 2011-07-06 15:19:55 -04:00
did
6acec074e2 spanish translation (ticket #103) 2011-07-06 00:33:34 +02:00
did
0737919c2c Dutch translation (ticket #92) 2011-07-05 23:55:26 +02:00
Didier Lafforgue
43670714b9 Merge pull request #86 from mariovisic/hotfix/nested_snippets
Fix for issue #84 (Nested snippets)
2011-07-05 12:16:30 -07:00
did
bf99a36b58 tweak forms + fix minor js bug if no multi sites 2011-07-05 20:33:21 +02:00
did
00fd00240f the error message was not displayed correctly during a wrong import + remove the last tracks of the deprecated asset collections 2011-07-04 23:11:35 +02:00
did
1e465e231e remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring 2011-07-04 19:40:14 +02:00
did
91f2f145b3 the BIG MERGE is now done 2011-07-04 15:43:05 +02:00
did
02186d7368 add the export link + fix the bugs for the export module + a little bit of refactoring 2011-07-04 15:25:02 +02:00
did
aad4b09ad7 first draft of the export module (not tested) 2011-07-04 03:22:04 -07:00
did
812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did
c8f0ad0bbe upgrade rake (0.9.2), cucumber-rails (1.0.2), capybara 2011-06-29 03:05:07 +02:00
did
c1f89f1cca fixing the heroku version: engine requires RMagick 2011-06-28 18:05:23 +02:00
did
322e617068 fixing the heroku version: engine requires cancan 2011-06-28 17:43:11 +02:00
did
8c1372afc6 fixing the heroku version 2011-06-28 17:35:25 +02:00
did
e304d5aa98 the account_spec failed randomly + remove useless puts 2011-06-28 15:50:37 +02:00
did
5e8eac53d4 refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave 2011-06-28 15:38:13 +02:00
did
2ad01833d8 icons for the theme_asset form + add tests (both rspec + features) for the roles 2011-06-27 08:27:07 -07:00
did
09171555a7 fix CSRF issues with tinymce and some ajax actions + begin to work on the roles feature powered by cancan (in progress, not stable) 2011-06-25 09:25:31 -07:00
did
33a29210ba forget to add a field to update the global seo title for a site + fix a tiny bug when destroying session + enhance hints on some form fields 2011-06-24 00:49:12 -07:00
did
fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did
d4b7734003 fix issue #90 2011-06-23 01:14:36 -07:00
did
d31f1f959a fix issue #91 2011-06-22 15:57:24 -07:00
did
40530de8bb remove trailing slash and redirect (SEO) 2011-06-22 08:53:29 -07:00
did
a5cd2290ea reflect changes from the bushi.do platform 2011-06-21 15:03:23 -07:00
did
3c0f7afec0 fix tests + rename and refactor the slugify method (now called permalink) 2011-06-21 13:03:24 -07:00
did
be02539695 do not include the bushido chat js, just declare a variable instead 2011-06-21 20:38:03 +02:00
did
3c31c8dbcf remove all the references to asset_collections 2011-06-21 06:12:20 -07:00
did
f4d9acd282 fix the tests + finish the integration of Dragonfly + clean code 2011-06-20 17:39:59 -07:00
did
57ba3ba273 get rid of the yellow banner in production 2011-06-21 01:27:13 +02:00
did
87e7ced3c1 integrate dragonfly + clean code + fix a js bug when editing a custom field 2011-06-20 12:05:12 -07:00
did
ecdb79bb2d removing asset_collections: script + remove references in liquid 2011-06-20 04:25:17 -07:00
did
58ab954ec1 new task to migrate asset collections to content types 2011-06-18 01:31:43 -07:00
did
21ccbb635b removing asset collections 2011-06-17 14:32:54 -07:00
did
adfcbb6658 fix conflict issue with the new linecache gem + clean carrierwave local patch 2011-06-12 16:29:59 +02:00
did
de217b74b7 use default rails logger during the first template import + remove some carrierwave method patches now useless with the new version of the gem 2011-06-11 01:18:34 +02:00
did
f1d8e7c141 clean everything before merging it to the master branch 2011-06-10 01:04:13 +02:00
did
2d060dd2d9 forgot to add an file 2011-06-08 16:34:37 +02:00
did
49080b737d testing out the lastest gems for rails / carrierwave / ...etc 2011-06-08 16:33:33 +02:00
did
abcf4f684a help to create public form with has_one field 2011-06-03 02:25:19 +02:00
Mario Visic
8c62ec4dba Small refactoring on the snippet tag constructor. 2011-06-02 22:34:06 +08:00
Mario Visic
684b1ddf5c Nested snippets now update correctly, fixes #84 2011-06-02 21:56:05 +08:00
did
a5bf4664f2 [bushido] pass the metrics token to bushido.js 2011-06-01 23:47:06 +02:00
did
91119bf54e allow administrators to change the text displayed for each content in the back-office (documentation is coming) 2011-06-01 23:43:12 +02:00
did
4618b35318 cache-busting asset id for bushido.js + new bushido config var (app_name) 2011-06-01 21:09:09 +02:00
Sean Grove
d557af74ea Typo 2011-05-30 14:32:34 -07:00
Sean Grove
6834e6db85 Tweaks to match the Bushido Events api 2011-05-30 14:17:42 -07:00
did
293557a245 fix a problem with bushido_app_claimed? if the variable value is an empty string 2011-05-29 15:36:14 -07:00
did
dfb4ed48bc refactor bushido message to event 2011-05-29 15:25:36 -07:00
did
61886ec1b1 installation procedure allows to install the default site template if provided 2011-05-28 19:45:29 -07:00
did
c6b272f9f9 disable authentication if the app has not been claimed yet 2011-05-28 10:52:36 -07:00
did
b467ecbeef display the bushido bar on every page 2011-05-27 16:24:11 -07:00
did
d5f5707e42 change the URL to the bushido js file 2011-05-27 15:39:48 -07:00
did
ef7ac0e721 make the bushido installation process the smoothest 2011-05-27 15:14:45 -07:00
did
2ce1fadf52 simplify the installation procedure for bushido users 2011-05-27 08:19:20 -07:00
Didier Lafforgue
408de3dc85 Merge pull request #80 from mariovisic/hotfix/import_content_type_date
Fix: Content type fields import does not support dates in yaml
2011-05-24 15:39:31 -07:00
did
8ad6ee580e fix issue #78 2011-05-24 12:23:05 -07:00
Mario Visic
c7109af0b8 Importer now supports date content type fields as strings or date objects. 2011-05-17 21:42:47 +08:00
Didier Lafforgue
028312bc9e Merge pull request #71 from onelaw/seo_metadata
Adds support for page- and content instance-specific metadata.
2011-05-16 14:28:20 -07:00
Andrea Frigido
bee4f01e56 Italian localization. 2011-05-04 13:05:16 +02:00
did
6dd810b44e new custom_fields gem version as well as an heroku patch to fix the weird issue about json/heroku 2011-05-01 00:28:25 +02:00
did
e429fbf7ca indentation + detect asset urls in a css file even if one long line (case: css generated by sass) 2011-04-30 01:58:15 +02:00
AJ Schuster
f65cd0b2fc Allows for page- and content instance-specific metadata.
Falls back to site metadata when not specified.
2011-04-29 16:10:13 -04:00
did
ea050afd5e use absolute urls for the pagination links + allow developers to access the http params within a liquid template + the with_scope handles category fields 2011-04-29 01:16:40 +02:00
Didier Lafforgue
5654924e0b Merged pull request #69 from JaimeAndres/liquid_markup.
fixed problem with pagination url, it was creating a relative path instead
2011-04-28 15:17:58 -07:00
did
820d55a83c use delayed_job by default on bushi.do 2011-04-28 17:17:15 +02:00
did
a01e204d29 refactor the way locomotive was updating a template and its descendants + add custom action_mailer settings for the bushi.do env + fix bug about index and 404 pages positions during the import + fix a little display issue when a subdomain is wrong in the site edit page 2011-04-28 17:04:18 +02:00
did
537e222f79 code indentation (I am a little bit picky) 2011-04-27 17:04:33 +02:00
Didier Lafforgue
c27062452e Merged pull request #60 from karlbright/master.
Theme asset filenames made lowercase
2011-04-27 07:19:53 -07:00
did
8b5d5d0a32 change subdomain on heroku + do not save pages, assets, ...etc of a site when it gets saved 2011-04-27 10:09:19 +02:00
did
1e70560b7b bump version + fix typo for the heroku credentials 2011-04-27 01:12:32 +02:00
did
b58e49fce2 make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests 2011-04-25 01:21:38 +02:00
Jaime Andres
860b206b0a fixed problem with pagination url, it was creating a relative path instead of an absolute path 2011-04-19 00:33:54 -05:00
karlbright
57dff76d8e Added ability to set media attribute within stylesheet_tag 2011-04-11 15:22:41 +08:00
did
09bd73c7ac enhance carrierwave settings to support bushi.do 2011-04-07 11:53:07 +02:00
did
f16201f6cd do not run bushido subdomain validation if the value does not get changed + prevent to change the subdomain in Heroku (non multi-sites mode) 2011-04-07 02:18:07 +02:00
did
e03d7b5dcc smoother integration with bushi.do 2011-04-07 01:34:36 +02:00
did
917208812b wrong bushido ENV name + do not ask for subdomain during the installation 2011-04-06 11:44:52 +02:00
did
2cba14afec do not run the locomotive core initializer if engine 2011-04-06 01:29:11 +02:00
did
9ec642136f debugging the heroku deployment 2011-04-06 00:56:44 +02:00
did
e59088a2a0 debugging heroku version 2011-04-06 00:50:58 +02:00
did
551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
dinedine
60df5c19f9 the locomotive config template is now up-to-date 2011-04-04 02:03:23 +02:00
dinedine
c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did
551d8a5761 big refactoring of the locomotive config file in order to handle bushido / single / multi sites, ...etc 2011-04-01 02:34:19 +02:00
dinedine
19b6341ace add validation (in progress) 2011-03-31 09:10:42 +02:00
did
031113799e a little bit of refactoring 2011-03-28 01:49:12 +02:00
did
6ba884e459 Merge branch 'master' of https://github.com/sgrove/engine into sgrove-master 2011-03-28 01:01:30 +02:00
did
67fba7542c does not need to fill all the fields of a content type during the theme import 2011-03-23 11:01:49 +01:00
Sean Grove
fc53a5acf4 Update to the new version of bushido gem 2011-03-23 01:27:22 -07:00
Sean Grove
89758570f8 Require bushido files and enable support if needed. 2011-03-21 03:33:17 -07:00
Sean Grove
b70685a2bd Add bushido rake tasks 2011-03-21 02:40:37 -07:00
Sean Grove
0e6b2f884f Add in programmatic support for bushido's custom domains/subdomains 2011-03-21 02:32:34 -07:00
did
d270bf8f69 new custom_fields gem 2011-03-20 21:12:40 +01:00
did
a66e745746 fix bug #52 2011-03-17 17:41:25 +01:00
did
a7959a8de8 fix bug preventing the installation of locomotive as an engine 2011-03-16 18:24:15 +01:00