Christophe Vilayphiou 9a5e7cc8fa Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ...

Conflicts:
	app/views/admin/sites/site_info.html.erb

2012-05-07 16:08:05 +08:00

..

admin

Fix site_locale_default_head and active for current locale

2012-05-07 00:53:52 +08:00

admin_helper.rb

First version for App and Object auth.Taking Announcement as experiment

2012-02-29 18:55:55 +08:00

application_helper.rb

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

2012-05-07 16:08:05 +08:00

design_helper.rb

Add some JS for design uploading

2011-07-19 18:31:53 +08:00

orbit_backend_helper.rb

Put sorting in web_link, page_context and design

2012-05-05 21:20:20 +08:00

sites_helper.rb

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

2011-04-13 18:19:51 +08:00