87904f8b8d
fix i18n
2012-09-27 11:03:08 +08:00
170bfbab52
fix i18n
2012-09-26 10:21:50 +08:00
54b874b2c9
fix nccu login
2012-09-25 15:07:07 +08:00
7a523281c3
fix announcement
2012-09-25 09:52:13 +08:00
16c51a77a7
change in algo of event generation plus now multi week events enabled
2012-09-24 21:26:15 +08:00
87e2510d02
add rake task for rebuild index
2012-09-24 18:46:38 +08:00
5634e87144
fix announcement block
2012-09-24 18:43:43 +08:00
78a01f5d29
fix for 0924
2012-09-24 18:30:19 +08:00
5f63af4e77
fix for search news,needs to applied to announcement,also need to fix some translation
2012-09-24 18:10:48 +08:00
029c84328d
code that can not run on matt's air
2012-09-24 15:37:28 +08:00
fb3364b28e
Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config
2012-09-24 14:14:13 +08:00
975523c8b2
demo site plugin
2012-09-24 14:10:44 +08:00
e5fa86c24a
fix i18n for search field
2012-09-24 12:25:43 +08:00
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
136fc68cdc
nccu data task
2012-09-24 12:18:40 +08:00
3a65f599e6
first version app config for Spen durning Chris's leave.
2012-09-24 11:43:48 +08:00
1646b13f43
Change status translation in Chinese
2012-09-24 10:10:06 +08:00
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
c846a102ff
Page by page changes for i18n yml
2012-09-24 09:06:44 +08:00
4fb35b00f2
Add missing translations
2012-09-24 09:02:46 +08:00
2ca7e1b548
Fix typos after i18n yml
2012-09-24 09:02:45 +08:00
e71e890bb6
Fix bugs in zh_tw main
2012-09-24 09:02:45 +08:00
bdd5a1a047
Changes for i18n yml
2012-09-24 09:02:45 +08:00
a04e1fd10b
Hot or top for news home banner
2012-09-24 08:43:10 +08:00
88d562450a
Fix home banner for hot news
2012-09-21 15:34:18 +08:00
b6c06c6d4f
tiny mce fix
2012-09-19 17:59:17 +08:00
a32027b64b
ray's fix
2012-09-19 16:34:43 +08:00
12db3118b4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-09-19 15:09:56 +08:00
8b68387199
fix share loading failed
2012-09-19 15:09:08 +08:00
79006201cd
ad_image date picker fixed
2012-09-19 12:23:05 +08:00
6fd2dac4d5
fix ad_banner data picker not working when on 180
2012-09-19 12:15:03 +08:00
d480a10661
fix for object_auth update
2012-09-19 11:12:22 +08:00
959b6aee12
fix for listing object error
2012-09-19 10:45:03 +08:00
1240064e23
add url generate
2012-09-18 17:37:52 +08:00
c813a6143b
fb share for iNCCU
2012-09-18 17:31:51 +08:00
2321116597
Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config
2012-09-18 16:30:34 +08:00
5de433d219
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-09-18 16:22:56 +08:00
6da3928626
change for NCCU ask
2012-09-18 15:49:05 +08:00
42c62ebca0
Fix preview for announcement (was retuning js instead of html)
2012-09-18 14:31:50 +08:00
ce47109d33
change link for rss
2012-09-18 12:04:45 +08:00
0ecb4eca46
change for NCCU entry site
2012-09-18 10:54:11 +08:00
84205379c1
GPRS and CALENDAR
2012-09-17 21:37:05 +08:00
43ecebf934
Merge branch 'new' of github.com:Rulingcom/orbit into new
2012-09-17 14:31:42 +08:00
2c55430c52
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-09-17 14:20:07 +08:00
0907324a2f
add member link to orbit menu
2012-09-17 14:18:27 +08:00
6a174d57a6
fix setting menu
2012-09-17 14:17:06 +08:00
4c7906898e
add member link to orbit menu
2012-09-17 14:12:01 +08:00
228fa0fca3
Remove setting from side bar
2012-09-17 13:40:14 +08:00
19db9d0037
basic function
2012-09-17 13:32:52 +08:00
9eed9ec7b6
demo site plugin
2012-09-17 13:32:52 +08:00
Fu Matthew
Matthew K. Fu JuYuan
Harry Bomrah
Matt
unknown
Christophe Vilayphiou