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

158 Commits

Author SHA1 Message Date
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
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
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
Dirk Kelly 7bce392e56 moved to the listed methods in the nav 2011-02-01 16:07:56 +08:00
Dirk Kelly 2d3c0e974f not showing unlisted pages in the nav 2011-02-01 14:43:07 +08:00
dinedine 02039159d7 add getter to the size of an asset collection in liquid 2011-01-30 00:30:24 +01:00
dinedine da51dbc14e more information in the logs when errors during the import + import asset collections without custom fields 2011-01-30 00:20:15 +01:00
dinedine a7dfe1152d fix encoding issue in Ruby 1.9 2011-01-27 14:07:10 +01:00
dinedine 2e774b2a97 conflict between the index scope in the page model and the mongoid index method 2011-01-27 10:49:42 +01:00
dinedine 69c9dbbbcf new Gemfile + fixing broken tests + improve the way we fetch the sicurrent te when serving fonts 2011-01-26 14:07:33 +01:00
Dirk Kelly 7d529f22d7 I can't believe I missed the include_page? method. 
Now supports exactly the same standards as the top level list elements, such as unpublished and excluded urls
 2011-01-25 07:54:07 +08:00
Dirk Kelly 825521a5d4 need to reject templatized pages, because they're not real pages. 
Also using children with minimal attributes, like top level.
 2011-01-24 23:20:26 +08:00
Dirk Kelly f512b417f5 added the depth option to nav tag 2011-01-24 17:00:02 +08:00
dinedine 2fc99bf90a rename translation files (convention) + email notification when adding contents (api) 2011-01-18 15:24:42 +01:00
dinedine 85bee3a110 Merge branch 'add_or_update_editable_element' of https://github.com/dirkkelly/locomotive into dirkkelly-add_or_update_editable_element 2011-01-18 00:28:41 +01:00
Dirk Kelly 62568bbdbb Fixed exception when updating a layout from back-office which contained an editable area 2011-01-14 15:27:58 +08:00
dinedine 3686496bb2 still got errors with dates display + admin default root points to signin 2011-01-11 12:42:12 +01:00
dinedine ff01539bb5 date in content types compatible with ruby 1.9.2 2011-01-11 00:50:42 +01:00
dinedine 933c26dbb2 bump version 2011-01-10 15:15:53 +01:00
dinedine 5301fa083c Merge branch 'master' of https://github.com/mariovisic/engine into mariovisic-master 2011-01-10 14:58:38 +01:00
dinedine 890d5d7e18 the import module takes care of redirection pages (+ tests) 2011-01-10 14:57:44 +01:00
Mario Visic 6b4001165f Altered rendering to set the HTTP 404 status when no page is found 2011-01-09 10:08:32 +08:00
dinedine c94087ccb5 Merge branch 'mariovisic-page_redirect' 2011-01-08 00:14:19 +01:00
dinedine 1291b68aba in special sitation inherited templates were not correctly updated 2011-01-08 00:10:44 +01:00
Mario Visic 64eff89c97 Added a redirect page extension, integrated into the application and added new tests 2011-01-06 22:48:41 +08:00
dinedine 8a3151cf58 change version + bug fix with the webservice module 2011-01-04 12:49:14 +01:00
dinedine d8a8ad4de0 make the webservice helper more robust (because of the numerous api errors in tumblr) 2011-01-03 22:09:19 +01:00
dinedine c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +01:00
dinedine 572ee360a1 preserve page orders when importing theme + handle favicon as theme asset + add tests for the nav tag + polish code (remove useless logs) 2011-01-03 11:50:09 +01:00
dinedine 210ce3d2d8 enhance the nav tag + some optimization in the back-office when rendering the pages tree 2011-01-02 23:58:06 +01:00
dinedine c0ac0046c1 polishing + bump version (beta yeaaah) 2010-12-31 19:31:22 +01:00
dinedine 83bce13020 fonts were not served in the locomotive engine 2010-12-30 18:15:06 +01:00
dinedine 99b54d4d1b fix bug with jammit-s3 and safari css hack + new version of aloha + bug with Heroku / Theme uploader without DJ + other minor things 2010-12-30 15:24:47 +01:00
dinedine 8d610dee49 Importing theme works with ruby 1.9.2 + clean code 2010-12-27 12:59:54 +01:00
dinedine 62564021b6 the theme import module can work without delayedjob + fix bugs 2010-12-17 00:42:38 +01:00