Christophe Vilayphiou 51ee9a4bfa Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner ... Conflicts: app/views/admin/ad_banners/_ad_banner_tab.html.erb		2012-04-24 14:43:30 +08:00
..
design	Fix bugs in upload design and missing menu	2012-04-06 17:37:45 +08:00
meta	Clean the parsers and introduce the metas	2012-03-21 18:30:12 +08:00
purchase	…
user	Finish sorting for announcements	2012-02-24 15:30:49 +08:00
.user.rb.swp	…
ad_banner.rb	Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner	2012-04-24 14:43:30 +08:00
ad_image.rb	Disable ad_banner_preview. Just show window	2012-04-24 14:37:06 +08:00
app_auth.rb	First version for App and Object auth.Taking Announcement as experiment	2012-02-29 18:55:55 +08:00
app_manager.rb	…
asset.rb	…
component.rb	…
i18n_variable.rb	…
item.rb	…
link.rb	…
meta.rb	Trying nokogiri	2012-03-27 18:42:22 +08:00
module_app.rb	fix bugs with token	2012-02-29 18:56:42 +08:00
object_auth.rb	Fact check program completed,Lin checked	2012-03-27 18:54:03 +08:00
page.rb	Fix several bus when there is no design	2012-04-02 02:41:42 +08:00
page_part.rb	Add sub_menu in r_tags	2012-04-24 02:30:40 +08:00
prototype_auth.rb	fix bugs with token	2012-02-29 18:56:42 +08:00
session.rb	Replace PrototypeR4 by Orbit.	2012-03-16 14:58:32 +08:00
site.rb	Clean the parsers and introduce the metas	2012-03-21 18:30:12 +08:00
tag.rb	…