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
|
778a55245c
|
added the inheritable attribute to editable elements
|
2011-03-02 08:13:03 +08:00 |
|
Dirk Kelly
|
ed88eb82b0
|
added inheritable? to the parent check on editable_contents
|
2011-03-02 08:12:42 +08:00 |
|
Dirk Kelly
|
e059ce2023
|
Making the error message a bit more useful
|
2011-02-28 13:42:50 +08: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 |
|
did
|
68e1a543bf
|
Merge branch 'master' of https://github.com/designhunger/engine into designhunger-master
|
2011-02-27 12:03:30 +01:00 |
Mario Visic
|
1c04b39c7e
|
Fixed a bug that was preventing deleting sites
|
2011-02-26 21:12:26 +08:00 |
Bernd Hauser
|
09f3162861
|
fix in default.de.yml
|
2011-02-23 14:57:33 +01:00 |
|
did
|
2244aa782a
|
Merge branch 'nested-snippets-fix' of https://github.com/mariovisic/engine into mariovisic-nested-snippets-fix
|
2011-02-19 01:34:32 +01:00 |
|
did
|
bd992cc882
|
fix issue #37 plus other ones related to theme assets and assets
|
2011-02-19 00:51:57 +01:00 |
|
Mario Visic
|
26a2b7d2a7
|
Fixed a bug with snippets within blocks
|
2011-02-16 17:37:26 +08:00 |
|
did
|
94be90986d
|
merge Dirk's branch + upgrade a lot of gems (rails, ...etc)
|
2011-02-12 15:00:57 +01:00 |
dinedine
|
6ac4ff0393
|
revert a piece of the theme assets refactoring + upgrade Gemfile as well as the gemspec
|
2011-02-04 11:18:34 +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 |
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 |
|
Dirk Kelly
|
c11c18c445
|
Fixes issue where custom content wouldn't get created.
|
2011-02-03 07:40:06 +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
|
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
|
db4d2af1bc
|
Added unlisted selector to page form
|
2011-02-01 14:50:32 +08:00 |
|
Dirk Kelly
|
6ba65b1b96
|
Added an unlisted flag
|
2011-02-01 14:39:20 +08: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
|
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 |
|
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 |
|
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 |
|
dinedine
|
3686496bb2
|
still got errors with dates display + admin default root points to signin
|
2011-01-11 12:42:12 +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
|
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
|
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 |