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.
orbit-4-1/lib
Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-03-19 14:27:15 +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 Changes into page_part edition. 2012-02-16 13:09:09 +08:00
parsers Add bootstrap-orbit.css in front-end 2012-03-07 18:16:59 +08:00
tasks Merge branch 'master' into ldap 2012-03-19 14:27:15 +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 fix bugs with token 2012-02-29 18:56:42 +08:00