developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,358 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

1358 Commits

Author SHA1 Message Date
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
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
Christophe Vilayphiou a04e1fd10b Hot or top for news home banner 2012-09-24 08:43:10 +08:00
Christophe Vilayphiou 88d562450a Fix home banner for hot news 2012-09-21 15:34:18 +08:00
Harry Bomrah b6c06c6d4f tiny mce fix 2012-09-19 17:59:17 +08:00
Matthew K. Fu JuYuan a32027b64b ray's fix 2012-09-19 16:34:43 +08:00
Matthew K. Fu JuYuan 12db3118b4 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-09-19 15:09:56 +08:00
Matthew K. Fu JuYuan 8b68387199 fix share loading failed 2012-09-19 15:09:08 +08:00
Matt 79006201cd ad_image date picker fixed 2012-09-19 12:23:05 +08:00
Matthew K. Fu JuYuan 6fd2dac4d5 fix ad_banner data picker not working when on 180 2012-09-19 12:15:03 +08:00
Matthew K. Fu JuYuan d480a10661 fix for object_auth update 2012-09-19 11:12:22 +08:00
Matthew K. Fu JuYuan 959b6aee12 fix for listing object error 2012-09-19 10:45:03 +08:00
Matthew K. Fu JuYuan 1240064e23 add url generate 2012-09-18 17:37:52 +08:00
Matthew K. Fu JuYuan c813a6143b fb share for iNCCU 2012-09-18 17:31:51 +08:00
Matthew K. Fu JuYuan 6da3928626 change for NCCU ask 2012-09-18 15:49:05 +08:00
Christophe Vilayphiou 42c62ebca0 Fix preview for announcement (was retuning js instead of html) 2012-09-18 14:31:50 +08:00
Matthew K. Fu JuYuan ce47109d33 change link for rss 2012-09-18 12:04:45 +08:00
Matthew K. Fu JuYuan 0ecb4eca46 change for NCCU entry site 2012-09-18 10:54:11 +08:00
Christophe Vilayphiou e7240f2205 Fix typos after i18n yml 2012-09-12 20:36:24 +08:00
Christophe Vilayphiou 3989d382b0 Fix bugs in zh_tw main 2012-09-12 19:42:37 +08:00
Christophe Vilayphiou 8b2bc207de Changes for i18n yml 2012-09-12 19:12:50 +08:00
Christophe Vilayphiou a579e16109 Change rows for news textarea 2012-09-11 16:41:35 +08:00
Christophe Vilayphiou 0a3a140b18 Fix migration bug 2012-09-11 16:32:20 +08:00
Christophe Vilayphiou 73e48aebc6 Change news subtitle to textarea, no tinymce 2012-09-11 15:40:27 +08:00
Matt 71021b8c69 Changes for empty file and link in create and edit for news and announcement + partially fix tinymce 2012-09-11 00:41:52 +08:00
Christophe Vilayphiou b110b22daa Change 熱門 to 頭版 for news 2012-09-10 15:55:06 +08:00
Christophe Vilayphiou 4dfe3e7b3b Change 熱門 to 頭版 for news 2012-09-10 15:19:29 +08:00
Matthew K. Fu JuYuan 3db2664c14 add missing file 2012-09-10 14:23:45 +08:00
Matthew K. Fu JuYuan e12701b34b preview for association object 2012-09-10 14:19:39 +08:00
Matthew K. Fu JuYuan 768f907f66 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-09-10 11:54:20 +08:00
Matthew K. Fu JuYuan a20db344f1 preview for update 2012-09-10 11:53:59 +08:00
Matt 9d21a86f53 Ray's CSS changes for NCCU email 2012-09-07 18:16:34 +08:00
Fu Matthew 6044857fea complete preview for both new and announcement 2012-09-07 17:55:59 +08:00
Fu Matthew 8bd5481b3f fix object_auth security problem 2012-09-07 17:53:43 +08:00
Matthew K. Fu JuYuan 671f86b612 First version of new preview. Only plain text 2012-09-04 12:31:27 +08:00
Matthew K. Fu JuYuan ecb3b5b25c stop saving sold files on git 2012-09-04 09:34:14 +08:00
Matthew K. Fu JuYuan ae1595a008 view for preview 2012-09-04 09:24:12 +08:00
Matthew K. Fu JuYuan fc4e2ceba5 fix for 403 for new interface 2012-08-31 18:56:26 +08:00
Matthew K. Fu JuYuan 26f99c296f fix page blank for 403 forbidden. 2012-08-31 18:33:18 +08:00
Matthew K. Fu JuYuan 6b904a37ad let all signed in users at NCCU upload files 2012-08-31 17:54:25 +08:00
Matthew K. Fu JuYuan 0ea73fa874 Merge branches 'master' and 'master' of github.com:Rulingcom/NCCU 2012-08-29 10:03:34 +08:00
chris edf9d8a159 Fix can_display 2012-08-16 18:55:34 +08:00
chris 3c283d1a7a Set default picture 
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
 2012-08-16 17:24:12 +08:00