Mario Visic
|
75b0137230
|
Merge remote-tracking branch 'origin/master' into rails_3_1
Conflicts:
Gemfile
Gemfile.lock
features/support/env.rb
locomotive_cms.gemspec
spec/cells/locomotive/global_actions_spec.rb
spec/cells/locomotive/main_menu_cell_spec.rb
spec/cells/locomotive/settings_menu_cell_spec.rb
|
2012-01-14 16:37:24 +10:30 |
|
did
|
a1e692a34d
|
fix tests suite with ruby 1.9.2
|
2012-01-07 02:49:23 +01: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 |
|
did
|
87d2440f14
|
working on fixing issues with devise (wip)
|
2011-11-04 16:55:51 +01:00 |
|
did
|
99e442673c
|
namespace controllers, models, ...etc (wip)
|
2011-10-31 00:02:41 +01:00 |
|
did
|
bb48552b51
|
Ruby MRI 1.9.3 Compatability Fixes
|
2011-08-25 23:28:56 +02:00 |
|
did
|
b23f2697e9
|
clean tests and make them pass in the order observed on nix systems
|
2011-08-13 16:24:02 -07: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 |
|