chris 68aed18956 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit ... Conflicts: app/views/layouts/_side_bar.html.erb config/mongoid.yml vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css		2012-08-20 23:24:41 +08:00
..
announcement	demo_site widget edit	2012-08-10 15:33:28 +08:00
gallery	updates for tagging and language fix	2012-08-20 23:20:20 +08:00
news	Clean up code , cache other auths. Fix sidebar	2012-05-29 17:17:26 +08:00
page_content	Changes for structure	2012-05-22 14:45:49 +08:00
web_resource	Changes for dat and time format	2012-05-18 19:42:36 +08:00