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
|
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
|
2a5861e8a7
|
Specs now correctly use a multisite test app.
|
2011-11-25 23:59:44 +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 |
|
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
|
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
|
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 |
|
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
|
bb48552b51
|
Ruby MRI 1.9.3 Compatability Fixes
|
2011-08-25 23:28:56 +02:00 |
|
Alex Sanford
|
88fd17a5aa
|
Fixed issue with tablerow tag
|
2011-08-19 10:10:26 -03: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 |
|
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
|
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 |
|
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
|
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
|
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
|
812965ad50
|
tweak the form UI (errors, input separator) + add more tests
|
2011-07-01 02:15:45 +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
|
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
|
a0293b161b
|
add a new plugin in tinymce to upload any kind of files (Bernd)
|
2011-06-21 05:47:11 -07: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 |
|
Mario Visic
|
c7109af0b8
|
Importer now supports date content type fields as strings or date objects.
|
2011-05-17 21:42:47 +08:00 |
|