b4c2dfe0ef
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:53:47 +08:00
3fdff9357c
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:52:11 +08:00
fbb53cca36
Ray's changes for sitemap backend
2012-08-08 11:51:20 +08:00
00e15d4814
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
2012-08-08 11:04:38 +08:00
05e61b63bb
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 11:04:19 +08:00
a03d1ad10b
Change for getting url from key
2012-08-08 11:04:19 +08:00
6cfdf0f25a
Change the way the orig_url is passed to fb
2012-08-08 11:04:19 +08:00
4bed925e0f
Try fb from override and generated page
2012-08-08 11:04:19 +08:00
acf4446523
Add meta to head for fb share
2012-08-08 11:04:19 +08:00
85a556a4a2
first version of fb_share
2012-08-08 11:04:19 +08:00
2ed0f709c8
Merge branch 'master' of github.com:Rulingcom/NCCU
...
Conflicts:
vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
2012-08-08 11:03:44 +08:00
06919e76ed
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-08 11:01:50 +08:00
1cdc0e24bd
First version of Solr search.
2012-08-08 10:59:55 +08:00
ef96ec841a
Merge branch 'nccu_fix' of github.com:Rulingcom/NCCU into nccu_fix
...
Conflicts:
app/assets/javascripts/ajax_form.js
2012-08-08 10:53:52 +08:00
c6c8187bda
Changes for design: menu, frontend news and announcement
2012-08-08 10:53:04 +08:00
9982fd880f
Update the path when name is changed in item.rb
2012-08-08 10:53:04 +08:00
c8dcc9734d
Change width for site map frontend, add link for more in announcement widget
2012-08-08 10:53:04 +08:00
292105bdf1
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
2012-08-08 10:53:04 +08:00
86a3d4a4b1
Remove console.log
2012-08-08 10:52:22 +08:00
ecc5c39840
Fix remote upload file for tinymce
2012-08-08 10:51:54 +08:00
cd4c9306da
Revert useless changes
2012-08-08 10:24:44 +08:00
e9de0e24b4
Fix fb share, redirect with js when the page is not requested by fb but by user
2012-08-08 10:12:21 +08:00
db16fdc7b5
Change for getting url from key
2012-08-08 07:46:10 +08:00
f7e6703d5f
Change the way the orig_url is passed to fb
2012-08-08 06:50:28 +08:00
fc560f4205
Try fb from override and generated page
2012-08-08 05:40:50 +08:00
3cb182ff8e
Add meta to head for fb share
2012-08-08 03:10:26 +08:00
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
fe4aadef29
Merge branch 'nccu_fix' of github.com:Rulingcom/NCCU into nccu_fix_matt
2012-08-07 19:22:16 +08:00
cbf7ccc13b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-07 19:21:54 +08:00
8ea7bf75cd
Fix uploader, ie9 ok, not ie8
2012-08-07 17:32:15 +08:00
b5227c7b6c
gallery update
2012-08-07 14:33:30 +08:00
0f5707394b
encoding fixed
...
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
2012-08-06 22:11:36 +08:00
13f3d4db70
tp
2012-08-06 20:10:38 +08:00
a08f85a3e2
Button fixes
2012-08-06 17:49:10 +08:00
3f543193f0
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
2012-08-06 17:34:00 +08:00
5f0d6c9003
Code Merge
2012-08-06 17:05:12 +08:00
47408f4467
UI modifications
2012-08-06 17:01:53 +08:00
1c62c1a799
first version of fb_share
2012-08-06 16:12:49 +08:00
80887ace3c
Remove console.log
2012-08-06 15:15:44 +08:00
9a103bbb7e
Fix remote upload file for tinymce
2012-08-06 15:13:21 +08:00
9ebee5daea
gallery update
2012-08-06 14:02:55 +08:00
337d690c54
gallery update
2012-08-06 11:07:58 +08:00
73b2cd1035
Fix typo and title in news and announcement frontend
2012-08-05 15:04:52 +08:00
5f88408dcb
Check for 'http' or 'https' before saving a link
2012-08-04 16:29:31 +08:00
5fc679e0ca
Toggle line color for announcement frontend
2012-08-04 16:16:28 +08:00
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
50b313976e
Fix page: take category and tag at the same time
2012-08-03 17:12:54 +08:00
b79de66973
fix variable.
2012-08-03 14:42:18 +08:00
c4e12ff347
Add missing class to ad_banner for link
2012-08-03 13:55:22 +08:00
a9141f91ba
Merge branch 'sunspot_search'
2012-08-03 12:51:33 +08:00
Christophe Vilayphiou
OrbitServer
Matthew K. Fu JuYuan
Harry Bomrah
devin