Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry ...

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

2012-06-29 16:10:29 +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

desktopapp

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

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

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

NewBlog.zip

update app package for previous commit

2012-01-24 12:28:32 +08:00

orbit_core_lib.rb

Fix bug when object_auth was only built but not created

2012-05-22 16:52:12 +08:00