github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,412 Commits 13 Branches 7 Tags 15 MiB
Commit Graph

314 Commits

Author SHA1 Message Date
did cad1f5e68f Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-11-27 08:23:12 -08:00
did 71d48fe726 refactor the current site editing screen (screen) 2011-11-27 08:22:54 -08:00
Mario Visic 9f56eecd56 Merge branch 'master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/boot.rb
 2011-11-27 20:33:45 +11:00
Mario Visic 5c6794d69c Fixed some failing dragonfly specs. 2011-11-27 19:02:20 +11:00
Mario Visic ad6273e2fd Lots of spec fixes (mostly namespacing), down to 107 failing specs. 2011-11-26 17:24:34 +11:00
Mario Visic 9f1ce08136 Specs are now all running, 190 failures. 2011-11-26 16:33:57 +11:00
Mario Visic fa138b28d0 Fixed some failing export specs. 2011-11-26 16:22:48 +11:00
Mario Visic 9a603eb57f Removed bushido and heroku lib specs (implemenation already gone). 2011-11-26 16:17:24 +11:00
Mario Visic cfd0be5755 Controller specs now run. 2011-11-26 16:10:47 +11:00
did cffe64f6be rebuilding the editing page for the site (wip) 2011-11-25 15:10:56 +01:00
Mario Visic 2a5861e8a7 Specs now correctly use a multisite test app. 2011-11-25 23:59:44 +11:00
Mario Visic 1c5d19ad71 Fixed for locomotive setup test method. 2011-11-25 23:45:16 +11:00
Mario Visic 06f4fc98e3 Fixed a bunch of model tests. 2011-11-25 00:37:17 +11:00
Mario Visic 40ef3e4fff Fixed a couple of failing tests. 2011-11-22 00:08:18 +11:00
Mario Visic e21a40c157 Some fixes for the content asset spec. 2011-11-20 22:52:20 +11:00
Mario Visic 75041ba21c Specs now run for all models. The account model now passes GREEEEn. 2011-11-20 22:47:41 +11:00
Mario Visic 47db53e0e5 Namespace factory girl factories. 2011-11-20 22:25:01 +11:00
Mario Visic a7b66f0e25 Lots of fixes to get tets closer to working. 2011-11-20 21:59:12 +11:00
Mario Visic 51c0397531 Removed spork to get spec helper working. Will readd later if required. 2011-11-20 21:39:46 +11:00
Mario Visic 5f893d51c0 Merge remote-tracking branch 'origin/master' into rails_3_1 
Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/will_paginate.rb
	lib/locomotive/engine.rb
	lib/locomotive/hosting/bushido/account_ext.rb
	lib/locomotive/hosting/bushido/enabler.rb
	lib/locomotive/hosting/bushido/hooks.rb
 2011-11-20 21:08:23 +11:00
did 248d3803c2 use the last version of formtastic + tweak the css for formtastic with scss + compass (wip) + clean code (wip) 2011-11-09 02:35:59 +01:00
did dd75f69b74 fix module collisions and missing namespaces all over the templates (wip) 2011-11-08 01:11:15 +01:00
did 9169cb386e waiting for the new devise gem (coming probably this week) 2011-11-08 00:16:23 +01:00
did b383086242 wip 2011-11-06 12:18:34 +01:00
Mario Visic 06ab49ecec Replaced will_paginate with kaminari 2011-11-05 16:45:43 +11:00
did 87d2440f14 working on fixing issues with devise (wip) 2011-11-04 16:55:51 +01:00
did 8979957d43 convert stylesheets in sass (wip) + fix the installation module + customize devise (wip) 2011-11-03 14:01:08 +01:00
did 851a255301 fixing assets (wip) 2011-11-01 01:58:44 +01:00
did cdab48f0a9 isolate the engine (urls, helpers, ...etc) + change urls + remove the warning about bson_ext 2011-11-01 00:44:23 +01:00
did 99e442673c namespace controllers, models, ...etc (wip) 2011-10-31 00:02:41 +01:00
Mario Visic 9f8906d840 Merge branch 'master' into 236_paginate_has_many 2011-10-29 14:36:01 +08:00
Mario Visic 4939017f8d No Site now renders a 404 error, this will prevent indexing of pages that do not exist. 2011-10-29 14:35:23 +08:00
Mario Visic d574939e2c Added a failing test for paginating has many associations. 2011-10-24 20:52:43 +08:00
Rytis Lukoševičius 6b9d2317da adding .published? and .listed? methods for the liquid Page drop class 2011-10-04 04:35:40 +03:00
did 016d773b2d fix issue #217 (memberships not correctly removed) 2011-09-28 18:27:29 +02:00
did 718b3c67bb improve the with_scope tag based on the work on the editor 2011-09-27 00:25:47 +02:00
did ce24270948 fix issue #193 2011-09-22 01:38:23 +02:00
Mario Visic 03b6649742 Designers cannot set others to admins, fixes #197 2011-09-17 22:23:43 +08:00
Karl Brightman 75f4835d3e Integrated next and previous methods for content in content types 2011-09-16 11:35:40 +08:00
did 8dfefe5094 fix issue #201 2011-09-14 11:32:14 +02:00
did bb48552b51 Ruby MRI 1.9.3 Compatability Fixes 2011-08-25 23:28:56 +02:00
did aa5c5f0092 tweak the spec_helper.rb file (see issue #157) 2011-08-25 22:15:23 +02:00
Alex Sanford 88fd17a5aa Fixed issue with tablerow tag 2011-08-19 10:10:26 -03:00
did 0e3d601ea9 fix xss vulnerability issue (#170) 2011-08-18 16:06:34 +02:00
did e0b9367f10 Got Mongoid and FactoryGirl to stop preloading models (#157) 2011-08-16 20:58:23 +02:00
Didier Lafforgue c3ba38216d Merge pull request #167 from pacifists/master 
added parent and breadcrumbs methods to page drop
 2011-08-15 15:38:20 -07:00
did 2d4f3df106 has_many target is not exported correctly (issue #165) + fix the import function as well 2011-08-15 14:39:53 -07:00
did 408ff098ba Set up specs to use spork for faster test runs (#157) 2011-08-14 12:16:59 -07:00
Rytis Lukoševičius 69e24e8fe0 added .breadcrumbs method to Page drop. It gives all the ancestors of the page and the page itself 2011-08-14 11:34:57 +03:00
Rytis Lukoševičius 025d5a7dda added .parent method to Page drop 2011-08-14 11:34:08 +03:00
did b23f2697e9 clean tests and make them pass in the order observed on nix systems 2011-08-13 16:24:02 -07:00
Andrea Frigido 37c50d27ff Bugfix: import site with empty editable file. 2011-08-03 08:58:47 +02:00
Didier Lafforgue 92ec012472 Merge pull request #149 from corgibytes/content_type_names 
Fixed issue with the way import was handling content_type name attributes
 2011-07-28 06:09:23 -07:00
did dbee233d0a add test for the issue #146 2011-07-28 13:51:59 +02:00
did 4c8272dfa0 seo information were not imported for contents 2011-07-28 11:53:36 +02:00
M. Scott Ford 8564055fd1 Modified the existing site context so that it does not reset the site. 2011-07-28 01:20:52 -04:00
M. Scott Ford 707973be16 Wrote a failing test to demonstrate issue with the way import handles the content_type.name attribute. 2011-07-28 01:19:51 -04:00
did 8da0db2454 improve the solution for the issue #127 and write tests (pull request #139) 2011-07-28 00:39:59 +02:00
did abbc151ed2 new factory_girl gem + fix the require pb with the devise_bushido_authenticatable gem 2011-07-26 23:11:43 +02:00
did e05586d387 write tests for the last cells menu + write tests for the bushi.do events + refactor the locomotive logger + add the cas_extra_attributes hook 2011-07-26 21:20:03 +02:00
did 7b8053241d add more tests for cells + disable the cas_create_user option for the bushi.do env 2011-07-26 03:02:13 +02:00
did 5ef92e6951 writing cells specs + restore the bushido.json file 2011-07-26 02:01:40 +02:00
did 0a8321ad3d writing cells specs + restore the bushido.json file 2011-07-26 02:00:35 +02:00
Petr Blaho dfa0196e89 Added tests to https variant of js and css url in liquid tags 2011-07-19 23:02:36 +02:00
Petr Blaho 18d3c5c591 Extended tests of js and css liquid tags to distinguish between url that starts with "/" or "http:" 2011-07-19 22:58:08 +02:00
Petr Blaho e39519f3ba Added tests for stylesheet_url and javascript_url liquid tags 2011-07-19 16:40:58 +02:00
did 9a36e85ce1 update the export test 2011-07-14 15:18:19 +02:00
did 770ae3a543 fix a couple of tiny bugs about: export, import and aloha 2011-07-13 11:14:44 +02:00
did 2236b43222 fix bug #111 2011-07-09 00:47:05 +02:00
did 0ea5275504 make the export more solid 2011-07-08 23:06:07 +02:00
did 711110a6e0 snippets were missing in the export 2011-07-07 16:59:50 +02:00
did 900d526a2f clean by removing useless files 2011-07-07 01:35:51 +02:00
did 007f34ed8c export didn't work when sub pages 2011-07-07 01:34:11 +02:00
did 6acec074e2 spanish translation (ticket #103) 2011-07-06 00:33:34 +02:00
did bd28f4c1ec new sites picker 2011-07-05 18:30:12 +02:00
did 1e465e231e remove whilelist for theme assets (no useful since we have got roles now) + a little bit of refactoring 2011-07-04 19:40:14 +02:00
did 91f2f145b3 the BIG MERGE is now done 2011-07-04 15:43:05 +02:00
did 812965ad50 tweak the form UI (errors, input separator) + add more tests 2011-07-01 02:15:45 +02:00
did e304d5aa98 the account_spec failed randomly + remove useless puts 2011-06-28 15:50:37 +02:00
did 5e8eac53d4 refactor the way the middlewares are loaded (both app and engine) + tweaks some back-office texts + improve the UI by adding icons on addind a picture links + fix an annoying bug with carrierwave 2011-06-28 15:38:13 +02:00
did 2ad01833d8 icons for the theme_asset form + add tests (both rspec + features) for the roles 2011-06-27 08:27:07 -07:00
did fa7e4c24d8 implement feature #57 2011-06-23 05:57:52 -07:00
did d4b7734003 fix issue #90 2011-06-23 01:14:36 -07:00
did d31f1f959a fix issue #91 2011-06-22 15:57:24 -07:00
did 40530de8bb remove trailing slash and redirect (SEO) 2011-06-22 08:53:29 -07:00
did 3c0f7afec0 fix tests + rename and refactor the slugify method (now called permalink) 2011-06-21 13:03:24 -07:00
did a0293b161b add a new plugin in tinymce to upload any kind of files (Bernd) 2011-06-21 05:47:11 -07:00
did 6ed9788d50 clean Gemfile 2011-06-21 03:41:32 +02:00
did f4d9acd282 fix the tests + finish the integration of Dragonfly + clean code 2011-06-20 17:39:59 -07:00
did 21ccbb635b removing asset collections 2011-06-17 14:32:54 -07:00
Didier Lafforgue 408de3dc85 Merge pull request #80 from mariovisic/hotfix/import_content_type_date 
Fix: Content type fields import does not support dates in yaml
 2011-05-24 15:39:31 -07:00
did 8ad6ee580e fix issue #78 2011-05-24 12:23:05 -07:00
Mario Visic c7109af0b8 Importer now supports date content type fields as strings or date objects. 2011-05-17 21:42:47 +08:00
Mario Visic ee04728d1c Added content type fields with dates (both string and date types in database.yml). 2011-05-17 21:40:54 +08:00
Didier Lafforgue 028312bc9e Merge pull request #71 from onelaw/seo_metadata 
Adds support for page- and content instance-specific metadata.
 2011-05-16 14:28:20 -07:00
Andrea Frigido 0e2f040574 Update spec/factories. 2011-05-04 13:13:55 +02:00
AJ Schuster f65cd0b2fc Allows for page- and content instance-specific metadata. 
Falls back to site metadata when not specified.
 2011-04-29 16:10:13 -04:00
did ea050afd5e use absolute urls for the pagination links + allow developers to access the http params within a liquid template + the with_scope handles category fields 2011-04-29 01:16:40 +02:00
did 77ea45c98b solve a bug when creating new content instance + fix rspec tests for ruby 1.9.2 2011-04-28 23:47:01 +02:00
Didier Lafforgue c27062452e Merged pull request #60 from karlbright/master. 
Theme asset filenames made lowercase
 2011-04-27 07:19:53 -07:00
did b58e49fce2 make locomotive work with bushido + refactor some portions of code (routing constraints, ...etc) + fix broken tests 2011-04-25 01:21:38 +02:00
karlbright 57dff76d8e Added ability to set media attribute within stylesheet_tag 2011-04-11 15:22:41 +08:00
did e03d7b5dcc smoother integration with bushi.do 2011-04-07 01:34:36 +02:00
did 551ef03ff6 simply the installation screens + fix all the broken tests + add tests for bushido 2011-04-05 02:18:17 +02:00
dinedine c0a5a4b443 single site / multi sites option in progress + integrating bushi.do + revert back to mongoid rc.7 2011-04-04 01:59:41 +02:00
did ae51a2d804 write specs for the ordered contents 2011-03-10 01:15:48 +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
Dirk Kelly 44f84c266b merge 2011-03-07 19:59:02 +08:00
did 7d5018eedc fix broken tests 2011-03-05 01:51:44 +01: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 f4c242ce1a speccing out the content tag 2011-03-02 09:11:40 +08:00
Dirk Kelly 70104e8f9d Merge branch 'master' of github.com:locomotivecms/engine 2011-02-28 12:49:54 +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 e6f5353245 add more tests 2011-02-27 11:33:49 +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 e735aa36e3 accented character caused an exception on my biggeted machine. Removed to avoid in the future 2011-02-22 00:45:53 +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
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 af5ec86c57 merging 2011-02-12 18:13:06 +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 7998e3a841 Brazillian Portuguese Translation 2011-02-09 23:29:20 -02: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
Dirk Kelly 7bce392e56 moved to the listed methods in the nav 2011-02-01 16:07:56 +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 2d3c0e974f not showing unlisted pages in the nav 2011-02-01 14:43:07 +08:00
Dirk Kelly 6ba65b1b96 Added an unlisted flag 2011-02-01 14:39:20 +08: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 d5464aa782 add tests 2011-01-18 01:19:18 +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
Mario Visic 6b4001165f Altered rendering to set the HTTP 404 status when no page is found 2011-01-09 10:08:32 +08: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 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 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 87caa55b80 rspec 2.3 2010-12-19 21:27:32 +01:00
dinedine e6226abece use jammit to compress stylesheet/javascript files 2010-12-14 18:00:12 +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