did
|
af955ef927
|
delete snippets in ajax + new way of render theme assets in the back-office (backbone view) + change the way to fire growl messages
|
2011-12-06 12:39:32 +01:00 |
|
did
|
dd15e3a758
|
delete snippets in ajax (wip)
|
2011-12-05 15:19:57 -08:00 |
|
did
|
5d750bee44
|
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
|
2011-12-05 06:40:48 -08:00 |
|
did
|
ad8fad3ce5
|
trying to implement the destroy action for theme assets (wip)
|
2011-12-05 06:39:52 -08:00 |
|
Mario Visic
|
aa68d59979
|
Merge remote-tracking branch 'origin/rails_3_1' into rails_3_1
|
2011-12-05 22:31:14 +08:00 |
|
Mario Visic
|
4e6fc04889
|
Use contents_custom_fields instead of content_custom_fields
|
2011-12-05 22:29:32 +08:00 |
|
did
|
1b8c1c7157
|
use the slugify js plugin for the page form
|
2011-12-05 06:14:50 -08:00 |
|
did
|
8af3445045
|
snippets done
|
2011-12-05 04:29:58 -08:00 |
|
did
|
04d9e90492
|
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
|
2011-12-05 02:31:43 -08:00 |
|
did
|
07b302beaa
|
refactoring the snippet forms (wip)
|
2011-12-05 02:31:34 -08:00 |
|
Mario Visic
|
0eac23c3e3
|
Added target custom fields to the content instance model.
|
2011-12-05 16:38:07 +08:00 |
|
did
|
37684654ac
|
first attempt to polish the theme assets page + refactor the css (wip)
|
2011-12-03 01:11:31 +01:00 |
|
did
|
24575d5cff
|
polish the new membership page
|
2011-12-02 23:31:15 +01:00 |
|
did
|
3fffe7bd91
|
new way of handling ajax post requests (redirecting if everything is fine)
|
2011-12-02 18:20:59 +01:00 |
|
did
|
c171e49093
|
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
|
2011-12-02 16:00:42 +01:00 |
|
did
|
8c82ccb716
|
update TODO
|
2011-12-02 16:00:37 +01:00 |
|
did
|
87a04aafe9
|
rename namespace for the sites backbone views + create backbone view for the creation of a new site
|
2011-12-02 06:59:41 -08:00 |
|
did
|
fb0e87c64d
|
done (for now) with the my account screen
|
2011-12-02 01:43:49 +01:00 |
|
did
|
99d756f550
|
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
|
2011-12-01 15:08:19 -08:00 |
|
did
|
837b974fec
|
working on the screen for editing my account
|
2011-12-01 15:04:45 -08:00 |
|
did
|
5d271239b7
|
the screen for editing site has been refactored
|
2011-11-29 14:58:19 +01:00 |
|
did
|
35012ca2b2
|
polishing the current site editing screen (wip)
|
2011-11-29 02:24:02 +01:00 |
|
did
|
aebb4f74ec
|
remove directive in gitignore preventing some folders (ending by sites) to be correctly versioned
|
2011-11-28 13:53:34 -08:00 |
|
did
|
6505b7ab25
|
add missing js files
|
2011-11-28 13:50:24 -08:00 |
|
did
|
4a2ae180a9
|
Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1
|
2011-11-28 06:40:36 -08:00 |
|
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 |
|