github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,084 Commits 13 Branches 7 Tags 15 MiB
eb5f0557ff
Commit Graph

1084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4efa43e342 Content instances will now generate a unique slug (if existing is taken). Fixes #210. 2011-12-18 01:11:39 +08:00
Mario Visic
9a1a0f016f Merge branch 'master' into rails_3_1 
Conflicts:
	app/models/content_type.rb
	config/boot.rb
 2011-12-15 22:29:07 +08:00
Mario Visic
4ae6fe7977 False values for custom fields are now correctly exported. Fixes #250. 2011-12-15 22:11:54 +08:00
Mario Visic
79bf38c419 Merge pull request #254 from Robsteranium/patch-1 
Previous comparison method failed when the sort column is a date with Nil
 2011-12-15 05:47:17 -08:00
Robsteranium
82a61b1d2d spec added to confirm content_type Date problem & patch. Also 1.8.7 compatibility with syck init. 2011-12-15 03:16:11 +00:00
Robsteranium
282e2486b6 Previous comparison method failed when the sort column is a date with a Nil. This revision doesn't really sort Nils, rather ignore them. 2011-12-14 11:26:24 +00:00
did
e500a1985b refactoring of the sites picker is done 2011-12-12 10:35:42 +01:00
did
8271782284 refactoring of the import UI is done 2011-12-11 23:33:38 +01:00
did
bbf0b0e083 Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-08 07:48:11 -08:00
did
a25009824c fix some bugs + refactor look and feel of the import screens (wip) 2011-12-08 07:47:17 -08:00
Mario Visic
1c139af4e0 Small namespace fixes to specs. 2011-12-08 23:36:53 +08:00
did
b60b1378f8 no more flash uploader only HTML5 goodness 2011-12-07 07:10:21 -08:00
did
d21f32d849 upload many theme assets at once 2011-12-07 03:25:30 -08:00
did
4da434deb1 replace Asset by ContentAsset in the export module 2011-12-07 00:52:13 -08:00
did
eacdb2873e Merge branch 'rails_3_1' of github.com:locomotivecms/engine into rails_3_1 2011-12-07 02:09:35 +01:00
did
368f643cf0 theme assets page in progress 2011-12-07 02:09:13 +01:00
Mario Visic
264ba8ebf2 Cucumber tests are now running, only a few passing, most fail. 2011-12-06 22:46:21 +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
e6d72cfc71 Bumped the custom fields version, should now work with the namespaced models. 2011-12-06 21:17:47 +08:00
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