Commit Graph

323 Commits

Author SHA1 Message Date
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
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
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
dinedine
d5464aa782 add tests 2011-01-18 01:19:18 +01:00
dinedine
bc32848f6a Merge branch 'highlighted_field_value' of https://github.com/dirkkelly/locomotive into dirkkelly-highlighted_field_value 2011-01-18 00:40:45 +01:00
dinedine
0db0e9ccd6 Merge branch 'dirkkelly-add_or_update_editable_element' 2011-01-18 00:32:21 +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
dinedine
23ce90eab1 clean the TODO list 2011-01-18 00:28:09 +01:00
Mario Visic
f70c651e57 Fixed a bug preventing the name of the current site from updating 2011-01-16 11:49:00 +08:00
Dirk Kelly
5eab8e35bf calling page.title on a content_instance page would call highlighted_field_value.
This method was protected and would hence raise an inline exception.

I'm not sure why we would protect highlighted_field_value?
2011-01-14 15:47:53 +08: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
0fcd8d5a3c new version of codemirror + enable liquid colorization + minify codemirror + cmd+S works on Safari, Firox and Chrome 2011-01-12 16:54:09 +01:00
dinedine
b397a34c47 Merge branch 'dollar-cmd-s' of https://github.com/dirkkelly/locomotive into dirkkelly-dollar-cmd-s 2011-01-12 09:42:35 +01:00
Dirk Kelly
135f6e54ad added a $.cmd("key", {}) method, is now used by shortcut.js 2011-01-11 21:42:47 +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
cfaa5ce66a remove 1..100 2011-01-10 15:05:55 +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