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 |
|
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 |
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 |
|
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
|
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 |
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 |