orbit-basic/lib
Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-04-12 18:50:48 +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 Fix bugs in upload design and missing menu 2012-04-06 17:37:45 +08:00
tasks Merge branch 'master' into ldap 2012-04-12 18:50:48 +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 Fact check program completed,Lin checked 2012-03-27 18:54:03 +08:00