Matthew K. Fu JuYuan 09d46f2f75 NCCU 上傳版本 0709 ... Merge branch 'nccu0621' Conflicts: Gemfile config/resque.god vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb		2012-07-09 16:02:59 +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	change name format	2012-07-03 16:05:19 +08:00
.user.rb.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00
ad_banner.rb	Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working	2012-06-20 14:50:51 +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	fix	2012-06-25 16:23:16 +08:00
asset.rb	Changes for dat and time format	2012-05-18 19:42:36 +08:00
asset_category.rb	Change assets	2012-05-16 11:07:11 +08:00
asset_tag.rb	Add tags to assets	2012-05-16 18:19:41 +08:00
component.rb	- No more Home object	2011-05-09 18:49:57 +08:00
i18n_variable.rb	Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working	2012-06-20 14:50:51 +08:00
item.rb	Fix destroy in structure	2012-05-22 17:55:45 +08:00
link.rb	Put inc/ajax_setting in new_admin	2012-05-22 16:11:00 +08:00
module_app.rb	fix	2012-06-25 16:23:16 +08:00
object_auth.rb	First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued	2012-05-17 06:43:39 +08:00
page.rb	Add impressionist	2012-05-15 21:26:09 +08:00
page_part.rb	Add custom title to widgets	2012-05-13 22:35:00 +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 mail_settings	2012-05-09 11:38:29 +08:00
tag.rb	Can show announcement and news list by tag's key	2012-05-08 17:27:42 +08:00