Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config ...

Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb

2012-12-05 11:36:32 +08:00

..

design

Fix previous commit

2012-12-03 17:38:55 +08:00

desktop

Desktop Widgtes updates..

2012-11-06 10:36:34 +08:00

meta

Remove i18n_variable for controllers, helpers and models

2012-07-27 19:13:39 +08:00

purchase

Merge with sub_roles

2011-12-23 18:34:21 +08:00

user

uniq relation

2012-12-04 00:31:46 +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

Fix for banner link

2012-08-13 11:03:11 +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 object auth without app_auth

2012-10-16 14:23:44 +08:00

asset_category.rb

Remove i18n_variable for controllers, helpers and models

2012-07-27 19:13:39 +08:00

asset_tag.rb

Add tags to assets

2012-05-16 18:19:41 +08:00

asset.rb

Add time to announcement quick edit

2012-08-14 14:38:21 +08:00

component.rb

- No more Home object

2011-05-09 18:49:57 +08:00

i18n_variable.rb

working cache

2012-07-13 15:36:10 +08:00

item.rb

put module app json into init,making orbit app work with module app.

2012-11-29 14:21:46 +08:00

link.rb

Put inc/ajax_setting in new_admin

2012-05-22 16:11:00 +08:00

module_app.rb

default widgets and sidebar.

2012-12-03 18:52:36 +08:00

object_auth.rb

default widgets and sidebar.

2012-12-03 18:52:36 +08:00

page_part.rb

Merge branch 'nccu_master' into demo_site

2012-08-22 18:07:49 +08:00

page.rb

Remove extra end

2012-12-03 18:45:32 +08:00

preview_association.rb

add missing file

2012-09-10 14:23:45 +08:00

preview_file.rb

complete preview for both new and announcement

2012-09-07 17:55:59 +08:00

preview.rb

preview for association object

2012-09-10 14:19:39 +08:00

proto_tag.rb

basic function

2012-09-17 13:32:52 +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

guest user

2012-09-12 16:20:15 +08:00

sub_role_tag.rb

basic function

2012-09-17 13:32:52 +08:00

tag.rb

basic function

2012-09-17 13:32:52 +08:00