did
|
a8d616ba6b
|
remove references to foldable_inputs and custom_input
|
2011-11-28 06:40:25 -08:00 |
|
Mario Visic
|
532cda88c8
|
Merge branch 'master' into rails_3_1
|
2011-11-28 09:53:11 +11:00 |
|
Mario Visic
|
63192a76f3
|
Updated readme with update instructions, helps with bug #251.
|
2011-11-28 09:51:37 +11: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
|
39ac60fffe
|
Merge branch 'master' into rails_3_1
Conflicts:
Gemfile
|
2011-11-27 21:42:58 +11:00 |
|
Mario Visic
|
867878a4f4
|
Test on ruby 1.9.3, removed the require for ruby-debug19 as it breaks on 1.9.3
|
2011-11-27 21:21:27 +11:00 |
|
Mario Visic
|
cecdfa4762
|
Merge branch 'master' into rails_3_1
|
2011-11-27 21:17:58 +11:00 |
|
Mario Visic
|
791c5f9d43
|
Merge pull request #223 from frisoft/master
Method missing "disable_parent_editable_elements" for nil
|
2011-11-27 01:53:25 -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
|
1a350e7d0c
|
Updated readme to include community information.
|
2011-11-27 20:17:08 +11:00 |
|
Mario Visic
|
05d9990e69
|
Use syck for yaml, fixes an issuew with new delayed job.
|
2011-11-27 20:05:39 +11:00 |
|
Mario Visic
|
9b049aa055
|
Bumped delayed job versions, fixes #249.
|
2011-11-27 19:44:06 +11:00 |
|
Mario Visic
|
83da41a2b1
|
Add the travis-ci button to the readme.
|
2011-11-27 19:35:08 +11:00 |
|
Mario Visic
|
0f09c577d0
|
New capybara and selenium version, works in FF8 now.
|
2011-11-27 19:29:09 +11:00 |
|
Mario Visic
|
5c6794d69c
|
Fixed some failing dragonfly specs.
|
2011-11-27 19:02:20 +11:00 |
|
Mario Visic
|
7f7ed896cf
|
use starts_with? instead of start_with, fixes #253 and #251
|
2011-11-27 18:22:00 +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 |
|
Mario Visic
|
1d1137fa36
|
Bumped the rails 3.1.3
|
2011-11-26 15:57:22 +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
|
915a28dc0a
|
Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1
|
2011-11-25 23:46:12 +11:00 |
|
Mario Visic
|
1c5d19ad71
|
Fixed for locomotive setup test method.
|
2011-11-25 23:45:16 +11:00 |
|
did
|
cb735a0539
|
cleaning
|
2011-11-25 13:38:31 +01:00 |
|
did
|
fcd2146c11
|
foldable fieldsets fixed on firefox
|
2011-11-25 12:31:18 +01:00 |
|
did
|
5bb29d9702
|
fix styling issues with form and firefox
|
2011-11-25 12:05:30 +01:00 |
|
did
|
cda038e320
|
style submenu on firefox
|
2011-11-25 11:12:55 +01:00 |
|
did
|
80c9d5091f
|
style submenu popup on firefox
|
2011-11-25 10:56:56 +01:00 |
|
did
|
76ef0cb28d
|
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
|
2011-11-25 02:05:14 +01:00 |
|
did
|
47625dfa17
|
refactor code (wip) + fix bugs (wip) + tweak ui + save an existing page in ajax (HTML5 + FormData) + create a new page in ajax (wip)
|
2011-11-25 02:04:42 +01:00 |
|
Mario Visic
|
06f4fc98e3
|
Fixed a bunch of model tests.
|
2011-11-25 00:37:17 +11:00 |
|
did
|
a50df5ad8e
|
menu and submenu in full css3 (without any images) + delete useless images + clean the code (wip)
|
2011-11-23 05:01:15 -08:00 |
|
Mario Visic
|
40ef3e4fff
|
Fixed a couple of failing tests.
|
2011-11-22 00:08:18 +11:00 |
|
did
|
b2a5e1de85
|
new file input behaviour (for now just on editable_file)
|
2011-11-21 03:12:06 -08:00 |
|
did
|
0b7cc6ebd2
|
merging
|
2011-11-21 02:28:12 +01:00 |
|
did
|
1a1a92e12f
|
refactor the presenters + convert the editable_elements partial into a full backbone, coffeescript, handlebar, json stack
|
2011-11-21 02:27:05 +01: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
|
a99ba18200
|
Temporarily removed a module include causing issues.
|
2011-11-20 22:47:03 +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
|
a97978468f
|
Use a later custom fields version.
|
2011-11-20 21:52:22 +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
|
769cf7548c
|
Updated gemfile with kaminari again.
|
2011-11-20 21:36:10 +11:00 |
|
Mario Visic
|
e6c1d6e94e
|
changes to the gemfile to remove local gem dependencies.
|
2011-11-20 21:18:42 +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 |
|