Joshua Milton 6b9926539d Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua ... Conflicts: app/assets/javascripts/orbitdesktop.js app/controllers/desktop_publications_controller.rb config/routes.rb		2012-07-04 18:31:00 +08:00
..
environments	Replace PrototypeR4 by Orbit.	2012-03-16 14:58:32 +08:00
initializers	Replace PrototypeR4 by Orbit.	2012-03-16 14:58:32 +08:00
locales	fix ad_banner sidebar	2012-04-05 17:41:43 +08:00
application.rb	have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables	2012-06-04 18:00:06 +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	Changes into page_part edition.	2012-02-16 13:09:09 +08:00
mongoid.yml	production mode	2011-08-25 15:59:20 +08:00
routes.rb	Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua	2012-07-04 18:31:00 +08:00