Commit Graph

249 Commits

Author SHA1 Message Date
did
a7959a8de8 fix bug preventing the installation of locomotive as an engine 2011-03-16 18:24:15 +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
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
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
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
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
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
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
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
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
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
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
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
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
Dirk Kelly
6070da8a5c added some helper methods to content_types liquid drops (via @KarlBright) 2011-02-25 11:47:12 +08: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
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
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
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
59618d4f66 when importing theme, force the position of a page as an integer 2011-02-13 00:01:42 +01:00
did
af5ec86c57 merging 2011-02-12 18:13:06 +01:00
did
44a7c33f9f preserve positions of the index and 404 page 2011-02-12 15:32:35 +01:00
did
94be90986d merge Dirk's branch + upgrade a lot of gems (rails, ...etc) 2011-02-12 15:00:57 +01:00
Raphael Costa
eaab196d06 Brazilian Portuguese Translations 2011-02-11 23:44:35 -02:00
Raphael Costa
7998e3a841 Brazillian Portuguese Translation 2011-02-09 23:29:20 -02:00
dinedine
0be4c93924 import theme from the rails console is now possible 2011-02-04 15:43:43 +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
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
7bce392e56 moved to the listed methods in the nav 2011-02-01 16:07:56 +08:00
Dirk Kelly
2d3c0e974f not showing unlisted pages in the nav 2011-02-01 14:43:07 +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
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
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
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
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
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
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
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
Mario Visic
6b4001165f Altered rendering to set the HTTP 404 status when no page is found 2011-01-09 10:08:32 +08:00
dinedine
c94087ccb5 Merge branch 'mariovisic-page_redirect' 2011-01-08 00:14:19 +01:00
dinedine
1291b68aba in special sitation inherited templates were not correctly updated 2011-01-08 00:10:44 +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
8a3151cf58 change version + bug fix with the webservice module 2011-01-04 12:49:14 +01:00
dinedine
d8a8ad4de0 make the webservice helper more robust (because of the numerous api errors in tumblr) 2011-01-03 22:09:19 +01:00
dinedine
c828301f37 fonts did not work when stored in amazon s3 2011-01-03 21:53:33 +01:00
dinedine
56a7a09903 minor stuff 2011-01-03 14:44:38 +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
c0ac0046c1 polishing + bump version (beta yeaaah) 2010-12-31 19:31:22 +01:00
dinedine
83bce13020 fonts were not served in the locomotive engine 2010-12-30 18:15: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
dinedine
62564021b6 the theme import module can work without delayedjob + fix bugs 2010-12-17 00:42:38 +01:00
dinedine
727a824745 prepare locomotive as a gem 2010-12-16 13:39:05 +01:00
dinedine
bbb09b58cf ruby 1.9.2 compliant 2010-11-08 18:42:14 +01:00
dinedine
a1d9a5d548 reflect changes from the last imported theme (enhancements + bugs fixed) 2010-10-31 00:30:30 +02:00
dinedine
89f106405d fix broken tests + get rid of warnings in cucumber 2010-10-29 17:40:58 +02:00
dinedine
9c77180a63 fix minor issues 2010-10-29 16:19:41 +02:00
dinedine
cc0b50e22e add rspec tests for the import module + debug the cms to handle correctly the default theme 2010-10-29 01:36:45 +02:00
dinedine
680a42b8f5 first attempt of an installation wizzard 2010-10-27 02:11:44 +02:00
dinedine
c2766f0273 Merge branch 'origin/nodefault' 2010-10-26 15:09:58 +02:00
dinedine
7cb26a74d4 fix bug with pagination + add _permalink property for content instances 2010-10-26 15:06:57 +02:00
dinedine
b4d3aae46f order assets when used in liquid templates 2010-10-19 16:56:50 +02:00
dinedine
c1b21fac8b use BSON::ObjectId to find elements (asset collection, content type) + make the import module work with S3 2010-10-19 12:20:09 +02:00
dinedine
5db5d70b0b should fix the issue with Heroku 2010-10-18 15:19:33 +02:00
dinedine
dffec0731e remove namespace for delayed_job tasks (needed by heroku) 2010-10-17 03:26:32 +02:00
dinedine
344a737b9a clean code + fix gem requirements for the engine version of this app 2010-10-17 03:18:41 +02:00
dinedine
a03dd77a65 update gem dependencies + gemspec + liquid tags (stylesheet_tag, ...etc) work with amazon S3 2010-10-16 11:27:26 +02:00
dinedine
acaf997b6e build locomotive engine as a gem 2010-10-15 02:05:21 +02:00
dinedine
163077be43 index in first, 404 page in last when importing theme 2010-10-14 23:56:51 +02:00
dinedine
282fbb7244 merging 2010-10-14 14:37:14 +02:00