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
d7ad029d4b
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-03 12:45:47 +08:00
69901403cd
First version of Solr search.
2012-08-03 09:30:12 +08:00
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
6159c04da6
Merge branch 'gallery_orbit' into desktop_devin
2012-08-01 20:09:58 +08:00
b0ef2b6957
Multi language and side bar update
2012-08-01 20:07:54 +08:00
1b29eb5de4
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 18:15:28 +08:00
ee5ac0227e
change the algorithm of tag cloud.
2012-08-01 18:15:10 +08:00
df9a1e8057
Fix typo
2012-08-01 17:11:37 +08:00
f917adcdf3
Fix typo
2012-08-01 17:09:00 +08:00
0d048de33f
Fix link in sitemap
2012-08-01 17:08:07 +08:00
83acb78966
path instead of url
2012-08-01 17:05:34 +08:00
410dfe62e8
Fix typo
2012-08-01 17:03:39 +08:00
02ade108d0
Fix typo
2012-08-01 16:59:11 +08:00
d2564af001
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 16:38:35 +08:00
4df4274629
Add links to frontend_sitemap
2012-08-01 16:38:07 +08:00
eaa8171689
gallery update
2012-08-01 16:35:59 +08:00
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
acebec8904
don't dislay web links if no eng. lists in widget is now sorted.
2012-08-01 15:24:55 +08:00
625801c0e9
Fix auth_users bug without category in news
2012-08-01 03:07:23 +08:00
f092aff9e9
Fix for data_migration but there's still a bug with red is, the red is code has to be commented out to run the rake task
2012-08-01 02:43:06 +08:00
c951cc6b6f
Fix for data_migration
2012-08-01 00:58:59 +08:00
7accbed1a0
gallery translation supported
2012-07-31 21:15:42 +08:00
b2f28eabaf
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 18:23:01 +08:00
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +08:00
0078c97b19
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 14:27:44 +08:00
Harry Bomrah
Matthew K. Fu JuYuan
Christophe Vilayphiou
devin