did
|
a25009824c
|
fix some bugs + refactor look and feel of the import screens (wip)
|
2011-12-08 07:47:17 -08:00 |
|
Mario Visic
|
a76020108f
|
Fixed some broken tests, mainly due to routing issues. Down to 68 failing tests.
|
2011-12-06 21:42:41 +08:00 |
|
Mario Visic
|
4e6fc04889
|
Use contents_custom_fields instead of content_custom_fields
|
2011-12-05 22:29:32 +08:00 |
|
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 |
|