Christophe Vilayphiou 2b9190a49e Merge branch 'design_team' into ldap ... Conflicts: config/locales/zh_tw.yml vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb		2012-05-08 11:40:38 +08:00
..
design	Put sorting in web_link, page_context and design	2012-05-05 21:20:20 +08:00
meta	Add site_info	2012-05-07 00:54:18 +08:00
purchase	Merge with sub_roles	2011-12-23 18:34:21 +08:00
user	Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine	2012-02-29 13:07:21 +08:00
.user.rb.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00
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	Manger and SubManager	2012-01-24 12:28:32 +08:00
asset.rb	include Mongoid::Timestamps	2011-04-13 18:22:52 +08:00
component.rb	- No more Home object	2011-05-09 18:49:57 +08:00
i18n_variable.rb	Fix relations error in tags	2012-02-15 11:42:19 +08:00
item.rb	Add menu_enabled_for: the page can be shown even if there's no link in the menu	2012-05-07 15:47:14 +08:00
link.rb	Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)	2011-04-13 18:19:51 +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	Add i18n for site_info.	2012-05-07 15:11:43 +08:00
tag.rb	Fix relations error in tags	2012-02-15 11:42:19 +08:00