Commit Graph

2207 Commits

Author SHA1 Message Date
chris c2c3774cf9 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-10-09 06:40:59 +08:00
Matthew K. Fu JuYuan 9f825de288 user new interface 70% 2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan 1aacf5e2ce user status method. Now the sub_role shall be sat with it's status in order to record sub_role status into user object.
Sub_role can be removed normally and the method check_status_record  will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists.
2012-10-09 06:40:18 +08:00
Matthew K. Fu JuYuan e16a27601d user new interface 70% 2012-10-08 16:58:33 +08:00
Harry Bomrah 59f97f3fef Week View changes 2012-10-08 16:47:56 +08:00
Matthew K. Fu JuYuan 89b1aace8a fix for rescue job failed on 171 2012-10-08 16:42:49 +08:00
unknown a4c94c4404 demo site plugin 2012-10-08 16:20:21 +08:00
Matthew K. Fu JuYuan 0663e43be7 fix for web_resource tool bar 2012-10-08 16:02:33 +08:00
Matthew K. Fu JuYuan cf68022d4f fix resque server stop 2012-10-08 11:26:24 +08:00
Matthew K. Fu JuYuan 4a5fc47c0a NCCU maintenance rake task 2012-10-08 10:35:11 +08:00
Matthew K. Fu JuYuan 67bd68d492 harry's js fix 2012-10-08 10:11:45 +08:00
Matthew K. Fu JuYuan e67ca84282 object_auth change to reload 2012-10-04 18:20:21 +08:00
Matthew K. Fu JuYuan ae48ab5cbd clean commit 2012-10-04 15:53:42 +08:00
Matt 962bae9a82 merge 2012-10-01 21:09:09 +08:00
Matthew K. Fu JuYuan b0cdcbecca fix preview bug only happen when production 2012-10-01 21:05:16 +08:00
Matthew K. Fu JuYuan 7919750d4f 171 doesn't have bug with javascript remove log script 2012-10-01 19:05:23 +08:00
Matthew K. Fu JuYuan 3dc4dc2316 debug commit 2012-10-01 17:56:55 +08:00
Matthew K. Fu JuYuan 506fa179a1 fix announcement 2012-10-01 17:48:51 +08:00
Matt b65d785834 harry's fix, announcement still broken 2012-10-01 17:21:23 +08:00
Matthew K. Fu JuYuan edcef5a8f7 make manager's news and announcement can be shown at once it be submitted. 2012-10-01 16:11:58 +08:00
Matthew K. Fu JuYuan 5ac04ea07d devin's css for tinymce 2012-09-28 09:58:28 +08:00
Matthew K. Fu JuYuan aa5d0bb1ad Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
	config/locales/zh_tw.yml
2012-09-28 09:49:22 +08:00
Matthew K. Fu JuYuan 4397adec5c fix i18n 2012-09-28 09:46:06 +08:00
Matthew K. Fu JuYuan cfc80340b8 add setting for tinymce config 2012-09-28 09:45:50 +08:00
Harry Bomrah 9a4c8137fe Fix for images 2012-09-27 15:33:37 +08:00
Harry Bomrah e44495ac9b week view updates 2012-09-27 13:44:22 +08:00
Fu Matthew dc8ca7e575 fix i18n.file upload failed 2012-09-27 13:34:40 +08:00
Fu Matthew 87904f8b8d fix i18n 2012-09-27 11:03:08 +08:00
Matthew K. Fu JuYuan 170bfbab52 fix i18n 2012-09-26 10:21:50 +08:00
Matthew K. Fu JuYuan 54b874b2c9 fix nccu login 2012-09-25 15:07:07 +08:00
Matthew K. Fu JuYuan 7a523281c3 fix announcement 2012-09-25 09:52:13 +08:00
Harry Bomrah 16c51a77a7 change in algo of event generation plus now multi week events enabled 2012-09-24 21:26:15 +08:00
Matthew K. Fu JuYuan 87e2510d02 add rake task for rebuild index 2012-09-24 18:46:38 +08:00
Matthew K. Fu JuYuan 5634e87144 fix announcement block 2012-09-24 18:43:43 +08:00
Matthew K. Fu JuYuan 78a01f5d29 fix for 0924 2012-09-24 18:30:19 +08:00
Matt 5f63af4e77 fix for search news,needs to applied to announcement,also need to fix some translation 2012-09-24 18:10:48 +08:00
Matthew K. Fu JuYuan 029c84328d code that can not run on matt's air 2012-09-24 15:37:28 +08:00
Matthew K. Fu JuYuan fb3364b28e Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config 2012-09-24 14:14:13 +08:00
unknown 975523c8b2 demo site plugin 2012-09-24 14:10:44 +08:00
Matthew K. Fu JuYuan e5fa86c24a fix i18n for search field 2012-09-24 12:25:43 +08:00
Matthew K. Fu JuYuan 7ca0d2a62b Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-09-24 12:20:59 +08:00
Matthew K. Fu JuYuan 136fc68cdc nccu data task 2012-09-24 12:18:40 +08:00
Matthew K. Fu JuYuan 3a65f599e6 first version app config for Spen durning Chris's leave. 2012-09-24 11:43:48 +08:00
Christophe Vilayphiou 1646b13f43 Change status translation in Chinese 2012-09-24 10:10:06 +08:00
Christophe Vilayphiou b4ff5cea05 Merge branch 'yml' of github.com:Rulingcom/NCCU into yml
Conflicts:
	app/helpers/admin/item_helper.rb
	app/views/admin/ad_banners/_ad_banner_tab.html.erb
	app/views/admin/assets/edit.html.erb
	app/views/admin/assets/file_upload.html.erb
	app/views/admin/assets/new.html.erb
	app/views/admin/attributes/index.html.erb
	app/views/admin/object_auths_new_interface/setting.html.erb
	app/views/admin/page_parts/_edit.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/shared/_privilege_user.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/edit.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/new.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
	vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb
	vendor/built_in_modules/news/config/locales/en.yml
	vendor/built_in_modules/news/config/locales/zh_tw.yml
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
2012-09-24 09:19:19 +08:00
Christophe Vilayphiou c846a102ff Page by page changes for i18n yml 2012-09-24 09:06:44 +08:00
Christophe Vilayphiou 4fb35b00f2 Add missing translations 2012-09-24 09:02:46 +08:00
Christophe Vilayphiou 2ca7e1b548 Fix typos after i18n yml 2012-09-24 09:02:45 +08:00
Christophe Vilayphiou e71e890bb6 Fix bugs in zh_tw main 2012-09-24 09:02:45 +08:00
Christophe Vilayphiou bdd5a1a047 Changes for i18n yml 2012-09-24 09:02:45 +08:00