github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 1602f9b9c0 the inline editor was broken (caused by the last version of mongoid), now it does work did 2011-03-05 23:56:40 +0100
  • 35eeac8306 provide English translations for the asset collections section did 2011-03-05 23:30:42 +0100
  • d3abdd3f37 refactor the asset collections part + disable the image processing for non image assets (use a newer version of locomotive carrierwave for that purpose) did 2011-03-05 23:27:26 +0100
  • 7d5018eedc fix broken tests did 2011-03-05 01:51:44 +0100
  • 537c1a6f67 clean translations (password, new_password) + provide a right tab background longer for the menu did 2011-03-05 01:10:52 +0100
  • 110c7a0fc9 request from Bernd (Designhunger) #45 did 2011-03-05 00:41:44 +0100
  • 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 did 2011-03-05 00:29:40 +0100
  • 2c1a6c381c the template parsers was broken on ree, made it a bit simpler, just look for slashes Dirk Kelly 2011-03-04 17:53:20 +0800
  • af59f2ea7e rails 3 upgrade Dirk Kelly 2011-03-04 17:53:02 +0800
  • 2022b08b83 split the General Information section in the page form in two sub sections did 2011-03-04 00:03:55 +0100
  • f0ee8a7b37 new menu layout in CSS3 and SASS (will make our life easier when integrating new modules) did 2011-03-03 23:51:07 +0100
  • 2482567db3 avoid updating child pages which have a default_attribute on change of a template they inherit from Dirk Kelly 2011-03-03 15:35:37 +0800
  • 9aa68c4611 oversight on the fact you shouldn't have to put template in quotes. return of the gsub Dirk Kelly 2011-03-03 13:23:37 +0800
  • c998d4150c Added fullpath and the error message to liquid syntax error. Translations are pretty dodgy (sorry) Dirk Kelly 2011-03-03 08:06:54 +0800
  • be4169c991 Beginning to improve the error messages with variables to make the import function more verbose on problems Dirk Kelly 2011-03-03 08:05:04 +0800
  • 9145540ef0 the import build_parent_template regex was missing nested layouts. Test theme has two new pages to test this. Dirk Kelly 2011-03-03 07:50:22 +0800
  • 97e3ddb6e3 reading that default attribute on inheriting editable_elements and calling the method on that page (instead of getting it from the parent) Dirk Kelly 2011-03-02 14:38:57 +0800
  • ea81025d33 storing default_attribute on the editable_element if a default attribute has been parsed. Dirk Kelly 2011-03-02 14:38:32 +0800
  • 95cd56cba2 sending a default tag will call the method on the page. Ignoring the default text in the tags. Dirk Kelly 2011-03-02 11:28:54 +0800
  • 74277b48ed the rescue wasn't trying the name, causing private method call exceptions Dirk Kelly 2011-03-02 10:05:50 +0800
  • adbae00457 changed the editable inheritance tag to be assignable, avoiding confusion between that and the content tag inheritance Dirk Kelly 2011-03-02 09:13:45 +0800
  • f4c242ce1a speccing out the content tag Dirk Kelly 2011-03-02 09:11:40 +0800
  • cc51e75f5c change the tag name for retrieving a value to be 'content' Dirk Kelly 2011-03-02 08:22:41 +0800
  • 77d7587150 allow inheritable to be sent through as a tag Dirk Kelly 2011-03-02 08:15:54 +0800
  • 04b0849dc5 Added the liquid tag for content, retrieves an editable element from self or parent if inherited: true Dirk Kelly 2011-03-02 08:14:58 +0800
  • 778a55245c added the inheritable attribute to editable elements Dirk Kelly 2011-03-02 08:13:03 +0800
  • ed88eb82b0 added inheritable? to the parent check on editable_contents Dirk Kelly 2011-03-02 08:12:42 +0800
  • e059ce2023 Making the error message a bit more useful Dirk Kelly 2011-02-28 13:42:50 +0800
  • 70104e8f9d Merge branch 'master' of github.com:locomotivecms/engine Dirk Kelly 2011-02-28 12:49:54 +0800
  • 0b11a3813b simplified the theme_image_tag a little Dirk Kelly 2011-02-28 12:09:33 +0800
  • 70493180f6 improve the French translation did 2011-02-27 17:29:32 +0100
  • 42b5fc4f24 Merge branch 'no_membership_error' of https://github.com/mariovisic/engine into mariovisic-no_membership_error did 2011-02-27 17:16:20 +0100
  • ebc40d1682 the site drop has access to pages did 2011-02-27 17:14:14 +0100
  • 34ee6e1a64 new contributor (Bernd for the German translation) did 2011-02-27 12:41:29 +0100
  • 2cb498bc50 added the German translation for the footer (thanks Estelle ;-)) did 2011-02-27 12:32:57 +0100
  • abcc61a8e6 add the missing index view for theme assets + update the 2 locomotive.rb files (generator + default) did 2011-02-27 12:18:48 +0100
  • 68e1a543bf Merge branch 'master' of https://github.com/designhunger/engine into designhunger-master did 2011-02-27 12:03:30 +0100
  • 44de2a28a9 Merge branch 'delete_site_fix' of https://github.com/mariovisic/engine into mariovisic-delete_site_fix did 2011-02-27 11:34:18 +0100
  • e6f5353245 add more tests did 2011-02-27 11:33:49 +0100
  • 1c04b39c7e Fixed a bug that was preventing deleting sites Mario Visic 2011-02-26 21:12:26 +0800
  • 6070da8a5c added some helper methods to content_types liquid drops (via @KarlBright) Dirk Kelly 2011-02-25 11:47:12 +0800
  • fcb056828a fixed default.de.yml Bernd Hauser 2011-02-23 15:21:39 +0100
  • 09f3162861 fix in default.de.yml Bernd Hauser 2011-02-23 14:57:33 +0100
  • 718e8f7b0d fixed german translation in tinymce Bernd Hauser 2011-02-23 12:49:25 +0100
  • 32701d7894 german language added Bernd Hauser 2011-02-23 12:40:56 +0100
  • 22979ff9a7 Refactored the validate_site_membership method in the site dispatcher. Added tests for the site dispatcher. Mario Visic 2011-02-22 17:34:27 +0800
  • 333b6fab5c dont require delayed job Dirk Kelly 2011-02-22 08:32:40 +0800
  • f18456c629 not required delayed_job_mongoid Dirk Kelly 2011-02-22 08:23:46 +0800
  • ba6ce5c861 updates to gem versions Dirk Kelly 2011-02-22 00:46:10 +0800
  • e735aa36e3 accented character caused an exception on my biggeted machine. Removed to avoid in the future Dirk Kelly 2011-02-22 00:45:53 +0800
  • f5b4e30d0a Logging into a site without membership now correctly displays an error message and redirects to login. Mario Visic 2011-02-20 21:39:02 +0800
  • 2244aa782a Merge branch 'nested-snippets-fix' of https://github.com/mariovisic/engine into mariovisic-nested-snippets-fix did 2011-02-19 01:34:32 +0100
  • 2f72d26d4c Merge branch 'master' of https://github.com/karlbright/engine into karlbright-master did 2011-02-19 00:58:13 +0100
  • bd992cc882 fix issue #37 plus other ones related to theme assets and assets did 2011-02-19 00:51:57 +0100
  • 26a2b7d2a7 Fixed a bug with snippets within blocks Mario Visic 2011-02-16 17:37:26 +0800
  • 9d11d9e019 Added theme_image_tag liquid tag to make it easy to insert theme image files karlbright 2011-02-15 15:33:52 +0800
  • 083debc516 add seo_metadata liquid tag (Mario) did 2011-02-13 14:40:55 +0100
  • 3e5e5d5ba9 add seo_metadata liquid tag (Mario) did 2011-02-13 14:40:49 +0100
  • 1aee2f4ce5 it prevented the use of rspec when locomotive was using as an engine did 2011-02-13 01:12:27 +0100
  • 59618d4f66 when importing theme, force the position of a page as an integer did 2011-02-13 00:01:42 +0100
  • 886d67b2a3 wrong Gemfile + define default task rake (rspec + cucumber) did 2011-02-12 20:22:11 +0100
  • e9a6dda6e6 new contributor: Raphael Costa did 2011-02-12 18:37:31 +0100
  • 16090a0f75 fix the mess with git and Aloha did 2011-02-12 18:21:10 +0100
  • af5ec86c57 merging did 2011-02-12 18:13:06 +0100
  • ff14f6f64f new version of Aloha-Editor did 2011-02-12 16:25:52 +0100
  • 138be23492 weird git behaviour did 2011-02-12 16:22:47 +0100
  • 2827834e19 new Aloha version did 2011-02-12 16:19:56 +0100
  • 97ff5f07c1 cleaning did 2011-02-12 16:19:22 +0100
  • 44a7c33f9f preserve positions of the index and 404 page did 2011-02-12 15:32:35 +0100
  • 94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) did 2011-02-12 15:00:57 +0100
  • f281934832 fix in portuguese translations Raphael Costa 2011-02-12 01:50:47 -0200
  • eaab196d06 Brazilian Portuguese Translations Raphael Costa 2011-02-11 23:44:35 -0200
  • d97c8b8525 Brazillian Portuguese Translation (5) Raphael Costa 2011-02-10 01:23:28 -0200
  • c5e9f05ee9 Brazillian Portuguese Translation (5) Raphael Costa 2011-02-10 01:12:50 -0200
  • 858ada2f28 Brazillian Portuguese Translation (5) Raphael Costa 2011-02-10 01:10:10 -0200
  • caeac4791b Brazillian Portuguese Translation (4) Raphael Costa 2011-02-10 01:07:58 -0200
  • 5f58a6e1cb Brazillian Portuguese Translation (3) Raphael Costa 2011-02-10 01:00:50 -0200
  • 742305cdfb Brazillian Portuguese Translation (2) Raphael Costa 2011-02-09 23:36:55 -0200
  • 53af21a9f8 Merge branch 'master' of github.com:raphaelcosta/engine Raphael Costa 2011-02-09 23:34:16 -0200
  • 7998e3a841 Brazillian Portuguese Translation Raphael Costa 2011-02-09 18:56:31 -0200
  • ab97b9e6bc Brazillian Portuguese Translation Raphael Costa 2011-02-09 18:56:31 -0200
  • 0dbc726169 add Dirk and Mario to the team :-) dinedine 2011-02-04 15:51:47 +0100
  • 0be4c93924 import theme from the rails console is now possible dinedine 2011-02-04 15:43:43 +0100
  • 6ac4ff0393 revert a piece of the theme assets refactoring + upgrade Gemfile as well as the gemspec dinedine 2011-02-04 11:18:34 +0100
  • c178346969 fix the creation of theme assets (and add tests of course) + upgrade Gemfile + remove the mongoid patches dinedine 2011-02-04 10:39:23 +0100
  • 124bacba6b Let bundler decide the best version to use Keith Pitt 2011-02-04 16:29:12 +0800
  • a6872b60ef Upgrade fog Keith Pitt 2011-02-04 16:26:52 +0800
  • e3f40558a0 Provide the error message aswell Keith Pitt 2011-02-04 16:21:50 +0800
  • da3bd6cef2 Include error backtrace in output Keith Pitt 2011-02-04 15:57:26 +0800
  • 713d30bdb6 Hacked the admin images controller to work Keith Pitt 2011-02-04 15:44:42 +0800
  • cad4471995 Use an old version of fog that carrierwave supports Keith Pitt 2011-02-04 14:41:51 +0800
  • 8f73d214ad Don't require delayed_job_mongoid in gemspec Keith Pitt 2011-02-04 14:39:46 +0800
  • d9396cc9ef Downgraded delayed job to use a version that supports mongoid 2.0.0.beta19 Keith Pitt 2011-02-04 14:35:09 +0800
  • 2402ef2cd4 positions for the index and not found pages were messed up when importing site dinedine 2011-02-03 11:22:19 +0100
  • 8a42e3441b Merge branch 'create_content' into nav-depth Dirk Kelly 2011-02-03 07:44:43 +0800
  • 775b6b973d Fixes an issue where custom couldn't would not be created (returning title is blank when it isn't) Dirk Kelly 2011-02-03 07:43:04 +0800
  • c11c18c445 Fixes issue where custom content wouldn't get created. Dirk Kelly 2011-02-03 07:40:06 +0800
  • 54b6b9bd13 Merge branch 'master' of github.com:locomotivecms/engine Dirk Kelly 2011-02-03 07:14:41 +0800
  • 7d30d00ec4 minimal attributes to include listed Dirk Kelly 2011-02-01 17:05:36 +0800
  • 1c91bfb673 returning the height Dirk Kelly 2011-02-01 16:30:20 +0800