This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

Matthew K. Fu JuYuan a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 ... Conflicts: app/controllers/admin/object_auths_new_interface_controller.rb app/helpers/application_helper.rb app/models/ad_banner.rb		2012-05-16 12:13:07 +08:00
..
ad_banner	Add rake task for ad_banner. Will have ad_banner at dev:build	2012-02-04 09:37:23 +08:00
fraisier	fix announcement & add lang tab	2012-04-05 15:23:20 +08:00
noko	Add rake task for layout with nokogiri	2012-03-27 19:00:03 +08:00
parsers	Change the way links are displayed in menus in front-end	2012-05-14 21:43:10 +08:00
tasks	Fix designs.rake	2012-05-14 09:30:49 +08:00
template	Changes into page_part edition.	2012-02-16 13:09:09 +08:00
NewBlog.zip	update app package for previous commit	2012-01-24 12:28:32 +08:00
central_server_exchange_app.rb	Integration of module_app workflow	2011-11-19 14:33:26 +08:00
github_app.rb	Update source: pull from git	2011-08-23 15:01:22 +08:00
main_public_key.pem	Merge server and rails_3_1	2011-08-18 13:43:33 +08:00
orbit_core_lib.rb	First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued	2012-05-15 18:55:16 +08:00