Commit Graph

1351 Commits

Author SHA1 Message Date
did
1e5624ce06 fix js bugs 2011-03-20 11:21:07 +01:00
did
630577658d Merge branch 'image_sizing' of https://github.com/themgt/engine into themgt-image_sizing 2011-03-17 17:54:59 +01:00
did
38f828a83a new gem versions 2011-03-17 17:54:46 +01:00
did
a66e745746 fix bug #52 2011-03-17 17:41:25 +01:00
did
a7959a8de8 fix bug preventing the installation of locomotive as an engine 2011-03-16 18:24:15 +01:00
Paul
e7b33c807a calculating Asset size using rmagick rather than an imagemagick shell command 2011-03-15 18:35:05 +01:00
did
ebf183c6f6 back to heroku 1.18.2 2011-03-10 09:32:34 +01:00
did
8f43ef401a updates on heroku servers should fix the issue with the heroku gem (http://goo.gl/PIxZe) 2011-03-10 09:19:25 +01:00
did
63530a3a30 still a problem with the last heroku gem (json) + fix an issue with invalid assets 2011-03-10 02:59:35 +01:00
did
6befc700c5 upgrade heroku gem (part 2) 2011-03-10 02:46:18 +01:00
did
8456033269 upgrade heroku gem 2011-03-10 02:40:25 +01:00
did
ae51a2d804 write specs for the ordered contents 2011-03-10 01:15:48 +01:00
did
f38e6a8514 order direction for content types 2011-03-10 00:54:38 +01:00
did
2ba0718647 application error when submitting an asset without a name 2011-03-10 00:17:16 +01:00
did
50f06a7b85 invalidate dynamic klass after an import + change the id of a link in the nav tag 2011-03-09 00:27:46 +01:00
did
bbac778dda dates can also be used as highlighted field 2011-03-08 17:25:38 +01:00
did
80f792cfd3 generated sitemaps were invalid according to google web tools 2011-03-08 17:20:53 +01:00
did
78715ddf1e fix issue #48 2011-03-08 16:39:14 +01:00
did
e4b34eac3f patch mongoid to enable the limit option for embedded collections + ui widget to allow more than 5 custom models in the content section 2011-03-08 16:05:07 +01:00
did
c3cc358934 Merge branch 'multi-level-sub_menu' of https://github.com/dirkkelly/locomotive into dirkkelly-multi-level-sub_menu 2011-03-07 21:49:01 +01:00
did
11ccb31088 clean code 2011-03-07 20:31:08 +01:00
Dirk Kelly
b4f871c5f6 support for content_types breaking over multiple lines 2011-03-07 19:59:36 +08:00
Dirk Kelly
44f84c266b merge 2011-03-07 19:59:02 +08:00
did
d2f5757d5b little trick to increase performance in dev mode when used as an engine + do some cleaning in the TODO file 2011-03-06 23:36:30 +01:00
did
865c811d0b upgrade the gemspec file (new carrierwave and custom_fields gems 2011-03-06 22:09:24 +01:00
did
f9aac40298 upgrade gems (carrierwave and custom_fields) 2011-03-06 00:17:50 +01:00
did
1602f9b9c0 the inline editor was broken (caused by the last version of mongoid), now it does work 2011-03-05 23:56:40 +01:00
did
35eeac8306 provide English translations for the asset collections section 2011-03-05 23:30:42 +01:00
did
d3abdd3f37 refactor the asset collections part + disable the image processing for non image assets (use a newer version of locomotive carrierwave for that purpose) 2011-03-05 23:27:26 +01:00
did
7d5018eedc fix broken tests 2011-03-05 01:51:44 +01:00
did
537c1a6f67 clean translations (password, new_password) + provide a right tab background longer for the menu 2011-03-05 01:10:52 +01:00
did
110c7a0fc9 request from Bernd (Designhunger) #45 2011-03-05 00:41:44 +01:00
did
a2ea522964 clean translations (a part of it moved to the CustomFields gem) + refactor the custom fields form (mustache) as well as enhance the ui/look&feel + fix some bugs related to the creation/edition of content types and contents 2011-03-05 00:29:40 +01:00
Dirk Kelly
2c1a6c381c the template parsers was broken on ree, made it a bit simpler, just look for slashes 2011-03-04 17:53:20 +08:00
Dirk Kelly
af59f2ea7e rails 3 upgrade 2011-03-04 17:53:02 +08:00
did
2022b08b83 split the General Information section in the page form in two sub sections 2011-03-04 00:03:55 +01:00
did
f0ee8a7b37 new menu layout in CSS3 and SASS (will make our life easier when integrating new modules) 2011-03-03 23:51:07 +01:00
Dirk Kelly
2482567db3 avoid updating child pages which have a default_attribute on change of a template they inherit from 2011-03-03 15:35:37 +08:00
Dirk Kelly
9aa68c4611 oversight on the fact you shouldn't have to put template in quotes. return of the gsub 2011-03-03 13:23:37 +08:00
Dirk Kelly
c998d4150c Added fullpath and the error message to liquid syntax error. Translations are pretty dodgy (sorry) 2011-03-03 08:18:19 +08:00
Dirk Kelly
be4169c991 Beginning to improve the error messages with variables to make the import function more verbose on problems 2011-03-03 08:05:04 +08:00
Dirk Kelly
9145540ef0 the import build_parent_template regex was missing nested layouts. Test theme has two new pages to test this. 2011-03-03 07:50:22 +08:00
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