github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
456 Commits 13 Branches 7 Tags 15 MiB
Commit Graph

202 Commits

Author SHA1 Message Date
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
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