Commit Graph

1240 Commits

Author SHA1 Message Date
Keith Pitt 124bacba6b Let bundler decide the best version to use 2011-02-04 16:29:12 +08:00
Keith Pitt a6872b60ef Upgrade fog 2011-02-04 16:26:52 +08:00
Keith Pitt e3f40558a0 Provide the error message aswell 2011-02-04 16:21:50 +08:00
Keith Pitt da3bd6cef2 Include error backtrace in output 2011-02-04 15:57:26 +08:00
Keith Pitt 713d30bdb6 Hacked the admin images controller to work 2011-02-04 15:44:42 +08:00
Keith Pitt cad4471995 Use an old version of fog that carrierwave supports 2011-02-04 14:41:51 +08:00
Keith Pitt 8f73d214ad Don't require delayed_job_mongoid in gemspec 2011-02-04 14:39:46 +08:00
Keith Pitt d9396cc9ef Downgraded delayed job to use a version that supports mongoid 2.0.0.beta19 2011-02-04 14:35:09 +08: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 8a42e3441b Merge branch 'create_content' into nav-depth 2011-02-03 07:44:43 +08:00
Dirk Kelly 775b6b973d Fixes an issue where custom couldn't would not be created (returning title is blank when it isn't) 2011-02-03 07:43:04 +08:00
Dirk Kelly c11c18c445 Fixes issue where custom content wouldn't get created. 2011-02-03 07:40:06 +08:00
Dirk Kelly 54b6b9bd13 Merge branch 'master' of github.com:locomotivecms/engine 2011-02-03 07:14:41 +08:00
Dirk Kelly 7d30d00ec4 minimal attributes to include listed 2011-02-01 17:05:36 +08:00
Dirk Kelly 1c91bfb673 returning the height 2011-02-01 16:30:20 +08:00
Dirk Kelly 2b438966f5 including the listed module 2011-02-01 16:17:12 +08:00
Dirk Kelly 9a1f45de36 including the styles to keep the slug and content types the same height 2011-02-01 16:17:05 +08:00
Dirk Kelly 47e6691e3c hide the listed option on a template 2011-02-01 16:08:06 +08:00
Dirk Kelly 7bce392e56 moved to the listed methods in the nav 2011-02-01 16:07:56 +08:00
Dirk Kelly 974923b929 listed translation 2011-02-01 16:07:41 +08:00
Dirk Kelly cc387a91f7 style updates 2011-02-01 16:07:31 +08:00
Dirk Kelly b627b9bcb9 going for the positive, instead of the double negative (listed not unlisted) 2011-02-01 16:07:18 +08:00
Dirk Kelly d672c0b946 moved content type above the templated option to avoid content jumps, added some translations 2011-02-01 15:08:56 +08:00
Dirk Kelly 3160f10ec5 javascript for the unlisted options show/hide 2011-02-01 15:08:26 +08:00
Dirk Kelly db4d2af1bc Added unlisted selector to page form 2011-02-01 14:50:32 +08:00
Dirk Kelly 2d3c0e974f not showing unlisted pages in the nav 2011-02-01 14:43:07 +08:00
Dirk Kelly 36053733f7 gem updates 2011-02-01 14:39:25 +08:00
Dirk Kelly 6ba65b1b96 Added an unlisted flag 2011-02-01 14:39:20 +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 e896618c99 fix minor ui issue in the theme assets section 2011-01-29 17:24:37 +01:00
dinedine a525e4ccd5 fixing bugs 2011-01-29 13:05:42 +01:00
dinedine c9e1e3278b forgot to update the gemspec file 2011-01-27 19:00:20 +01:00
dinedine dbf5680770 wrong custom_fields version 2011-01-27 17:12:23 +01:00
dinedine 56059b6579 gems dependency with mongoid was messy 2011-01-27 15:34:33 +01:00
dinedine 92ec43b2e0 Gemfile updated 2011-01-27 15:01:03 +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 0eb8471c00 update the TODO list 2011-01-27 09:38:30 +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
dinedine fa8e509732 update the TODO list 2011-01-25 22:48:09 +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 456521bbed sitemap functionnality works with engine 2011-01-22 14:09:29 +01:00
dinedine 415ce9fb82 bson_ext is now in 1.2.0 + add lastmod for the sitemap xml + fix issue #19 2011-01-21 12:04:59 +01:00
dinedine d56af954f2 fix issue #15 2011-01-18 18:13:06 +01:00
dinedine 6f2033a356 make the email notification more robust 2011-01-18 16:06:36 +01:00
dinedine 2fc99bf90a rename translation files (convention) + email notification when adding contents (api) 2011-01-18 15:24:42 +01:00
dinedine 6eead019d4 Merge branch 'master' of https://github.com/mariovisic/engine 2011-01-18 01:23:02 +01:00