Commit Graph

198 Commits

Author SHA1 Message Date
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