Dirk Kelly
|
97e3ddb6e3
|
reading that default attribute on inheriting editable_elements and calling the method on that page (instead of getting it from the parent)
|
2011-03-02 14:38:57 +08:00 |
|
Dirk Kelly
|
ea81025d33
|
storing default_attribute on the editable_element if a default attribute has been parsed.
|
2011-03-02 14:38:32 +08:00 |
|
Dirk Kelly
|
95cd56cba2
|
sending a default tag will call the method on the page. Ignoring the default text in the tags.
{% editable_short_text coolertitle, default: title %}{% endeditable_short_text %}
|
2011-03-02 11:28:54 +08:00 |
|
Dirk Kelly
|
74277b48ed
|
the rescue wasn't trying the name, causing private method call exceptions
|
2011-03-02 10:05:50 +08:00 |
|
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
|
f4c242ce1a
|
speccing out the content tag
|
2011-03-02 09:11:40 +08:00 |
|
Dirk Kelly
|
cc51e75f5c
|
change the tag name for retrieving a value to be 'content'
{% content somecooltitlebro, inherit: true %}
|
2011-03-02 08:22:41 +08:00 |
|
Dirk Kelly
|
77d7587150
|
allow inheritable to be sent through as a tag
|
2011-03-02 08:15:54 +08:00 |
|
Dirk Kelly
|
04b0849dc5
|
Added the liquid tag for content, retrieves an editable element from self or parent if inherited: true
|
2011-03-02 08:14:58 +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 |
|
Dirk Kelly
|
70104e8f9d
|
Merge branch 'master' of github.com:locomotivecms/engine
|
2011-02-28 12:49:54 +08:00 |
|
Dirk Kelly
|
0b11a3813b
|
simplified the theme_image_tag a little
|
2011-02-28 12:09:42 +08:00 |
did
|
70493180f6
|
improve the French translation
|
2011-02-27 17:29:32 +01:00 |
|
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 |
|
did
|
34ee6e1a64
|
new contributor (Bernd for the German translation)
|
2011-02-27 12:41:29 +01:00 |
|
did
|
2cb498bc50
|
added the German translation for the footer (thanks Estelle ;-))
|
2011-02-27 12:32:57 +01: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 |
|
did
|
44de2a28a9
|
Merge branch 'delete_site_fix' of https://github.com/mariovisic/engine into mariovisic-delete_site_fix
|
2011-02-27 11:34:18 +01:00 |
|
did
|
e6f5353245
|
add more tests
|
2011-02-27 11:33:49 +01:00 |
Mario Visic
|
1c04b39c7e
|
Fixed a bug that was preventing deleting sites
|
2011-02-26 21:12:26 +08:00 |
|
Dirk Kelly
|
6070da8a5c
|
added some helper methods to content_types liquid drops (via @KarlBright)
|
2011-02-25 11:47:12 +08:00 |
Bernd Hauser
|
fcb056828a
|
fixed default.de.yml
|
2011-02-23 15:21:39 +01:00 |
|
Bernd Hauser
|
09f3162861
|
fix in default.de.yml
|
2011-02-23 14:57:33 +01:00 |
|
Bernd Hauser
|
718e8f7b0d
|
fixed german translation in tinymce
|
2011-02-23 12:49:25 +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 |
|
Dirk Kelly
|
333b6fab5c
|
dont require delayed job
|
2011-02-22 08:32:40 +08:00 |
|
Dirk Kelly
|
f18456c629
|
not required delayed_job_mongoid
|
2011-02-22 08:23:46 +08:00 |
|
Dirk Kelly
|
ba6ce5c861
|
updates to gem versions
|
2011-02-22 00:46:10 +08:00 |
|
Dirk Kelly
|
e735aa36e3
|
accented character caused an exception on my biggeted machine. Removed to avoid in the future
|
2011-02-22 00:45:53 +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
|
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
|
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 |
|
Mario Visic
|
26a2b7d2a7
|
Fixed a bug with snippets within blocks
|
2011-02-16 17:37:26 +08: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
|
3e5e5d5ba9
|
add seo_metadata liquid tag (Mario)
|
2011-02-13 14:40:49 +01:00 |
|
did
|
1aee2f4ce5
|
it prevented the use of rspec when locomotive was using as an engine
|
2011-02-13 01:12:27 +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
|
886d67b2a3
|
wrong Gemfile + define default task rake (rspec + cucumber)
|
2011-02-12 20:22:11 +01:00 |
|
did
|
e9a6dda6e6
|
new contributor: Raphael Costa
|
2011-02-12 18:37:31 +01:00 |
|
did
|
16090a0f75
|
fix the mess with git and Aloha
|
2011-02-12 18:21:10 +01:00 |
|
did
|
af5ec86c57
|
merging
|
2011-02-12 18:13:06 +01:00 |
|
did
|
ff14f6f64f
|
new version of Aloha-Editor
|
2011-02-12 16:25:52 +01:00 |
|
did
|
138be23492
|
weird git behaviour
|
2011-02-12 16:22:47 +01:00 |