Mario Visic
|
eb5f0557ff
|
Merge branch 'master' into rails_3_1
Conflicts:
app/models/content_instance.rb
spec/models/locomotive/content_instance_spec.rb
|
2011-12-18 01:18:56 +08:00 |
|
Mario Visic
|
4e6fc04889
|
Use contents_custom_fields instead of content_custom_fields
|
2011-12-05 22:29:32 +08:00 |
|
Mario Visic
|
0eac23c3e3
|
Added target custom fields to the content instance model.
|
2011-12-05 16:38:07 +08:00 |
|
Mario Visic
|
a99ba18200
|
Temporarily removed a module include causing issues.
|
2011-11-20 22:47:03 +11:00 |
|
Mario Visic
|
a7b66f0e25
|
Lots of fixes to get tets closer to working.
|
2011-11-20 21:59:12 +11:00 |
|
did
|
bef9dd8e67
|
fix various namespace errors issues and api changes for the models
|
2011-11-10 13:41:20 -08:00 |
|
did
|
8979957d43
|
convert stylesheets in sass (wip) + fix the installation module + customize devise (wip)
|
2011-11-03 14:01:08 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
|