Commit Graph

301 Commits

Author SHA1 Message Date
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
did ebf183c6f6 back to heroku 1.18.2 2011-03-10 09:32:34 +01:00
did 8f43ef401a updates on heroku servers should fix the issue with the heroku gem (http://goo.gl/PIxZe) 2011-03-10 09:19:25 +01:00
did 6befc700c5 upgrade heroku gem (part 2) 2011-03-10 02:46:18 +01:00
did 8456033269 upgrade heroku gem 2011-03-10 02:40:25 +01:00
did 2ba0718647 application error when submitting an asset without a name 2011-03-10 00:17:16 +01:00
did 50f06a7b85 invalidate dynamic klass after an import + change the id of a link in the nav tag 2011-03-09 00:27:46 +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
did c3cc358934 Merge branch 'multi-level-sub_menu' of https://github.com/dirkkelly/locomotive into dirkkelly-multi-level-sub_menu 2011-03-07 21:49:01 +01:00
did 11ccb31088 clean code 2011-03-07 20:31:08 +01:00
Dirk Kelly 44f84c266b merge 2011-03-07 19:59:02 +08:00
did d2f5757d5b little trick to increase performance in dev mode when used as an engine + do some cleaning in the TODO file 2011-03-06 23:36:30 +01:00
did 865c811d0b upgrade the gemspec file (new carrierwave and custom_fields gems 2011-03-06 22:09:24 +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
Dirk Kelly 2c1a6c381c the template parsers was broken on ree, made it a bit simpler, just look for slashes 2011-03-04 17:53:20 +08:00
Dirk Kelly 9aa68c4611 oversight on the fact you shouldn't have to put template in quotes. return of the gsub 2011-03-03 13:23:37 +08:00
Dirk Kelly 9145540ef0 the import build_parent_template regex was missing nested layouts. Test theme has two new pages to test this. 2011-03-03 07:50:22 +08:00
Dirk Kelly ea81025d33 storing default_attribute on the editable_element if a default attribute has been parsed. 2011-03-02 14:38:32 +08:00
Dirk Kelly 95cd56cba2 sending a default tag will call the method on the page. Ignoring the default text in the tags.
{% editable_short_text coolertitle, default: title %}{% endeditable_short_text %}
2011-03-02 11:28:54 +08:00
Dirk Kelly 74277b48ed the rescue wasn't trying the name, causing private method call exceptions 2011-03-02 10:05:50 +08:00
Dirk Kelly adbae00457 changed the editable inheritance tag to be assignable, avoiding confusion between that and the content tag inheritance 2011-03-02 09:13:45 +08:00
Dirk Kelly cc51e75f5c change the tag name for retrieving a value to be 'content'
{% content somecooltitlebro, inherit: true %}
2011-03-02 08:22:41 +08:00
Dirk Kelly 77d7587150 allow inheritable to be sent through as a tag 2011-03-02 08:15:54 +08:00
Dirk Kelly 04b0849dc5 Added the liquid tag for content, retrieves an editable element from self or parent if inherited: true 2011-03-02 08:14:58 +08:00
Dirk Kelly 70104e8f9d Merge branch 'master' of github.com:locomotivecms/engine 2011-02-28 12:49:54 +08:00
Dirk Kelly 0b11a3813b simplified the theme_image_tag a little 2011-02-28 12:09:42 +08: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 ebc40d1682 the site drop has access to pages 2011-02-27 17:14:14 +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
Dirk Kelly 6070da8a5c added some helper methods to content_types liquid drops (via @KarlBright) 2011-02-25 11:47:12 +08:00
Bernd Hauser 32701d7894 german language added 2011-02-23 12:40:56 +01:00
Mario Visic 22979ff9a7 Refactored the validate_site_membership method in the site dispatcher. Added tests for the site dispatcher. 2011-02-22 17:34:27 +08:00
Dirk Kelly 333b6fab5c dont require delayed job 2011-02-22 08:32:40 +08:00
Dirk Kelly f18456c629 not required delayed_job_mongoid 2011-02-22 08:23:46 +08: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 2f72d26d4c Merge branch 'master' of https://github.com/karlbright/engine into karlbright-master 2011-02-19 00:58:13 +01:00
did bd992cc882 fix issue #37 plus other ones related to theme assets and assets 2011-02-19 00:51:57 +01:00
karlbright 9d11d9e019 Added theme_image_tag liquid tag to make it easy to insert theme image files 2011-02-15 15:33:52 +08:00
did 083debc516 add seo_metadata liquid tag (Mario) 2011-02-13 14:40:55 +01:00
did 59618d4f66 when importing theme, force the position of a page as an integer 2011-02-13 00:01:42 +01:00
did af5ec86c57 merging 2011-02-12 18:13:06 +01:00
did 44a7c33f9f preserve positions of the index and 404 page 2011-02-12 15:32:35 +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 7998e3a841 Brazillian Portuguese Translation 2011-02-09 23:29:20 -02:00
dinedine 0be4c93924 import theme from the rails console is now possible 2011-02-04 15:43:43 +01: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
dinedine 2402ef2cd4 positions for the index and not found pages were messed up when importing site 2011-02-03 11:22:19 +01:00