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
..
environments	Change assets	2012-05-16 11:07:11 +08:00
initializers	Add impressionist	2012-05-15 21:26:09 +08:00
locales	Multi language and side bar update	2012-08-20 23:14:11 +08:00
application.rb	Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry	2012-06-29 16:10:29 +08:00
boot.rb	rails 3.1 and designs (with bug)	2011-07-12 16:00:57 +08:00
config.yml	Ray's back_end modification before sub_roles	2011-12-23 18:02:45 +08:00
database.yml.example	Add admin/pages scaffold and basic page render	2009-05-08 01:18:16 +08:00
environment.rb	Replace PrototypeR4 by Orbit.	2012-03-16 14:58:32 +08:00
list.yml	demo_site widget edit	2012-08-10 15:33:28 +08:00
mongoid.yml	Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-08-20 23:24:41 +08:00
resque.god	God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.	2012-05-08 20:21:28 +08:00
resque_schedule.yml	Restart job	2012-05-14 00:50:36 +08:00
routes.rb	Page added for desktop	2012-08-20 23:17:31 +08:00