Commit Graph

2002 Commits

Author SHA1 Message Date
Harry Bomrah a08f85a3e2 Button fixes 2012-08-06 17:49:10 +08:00
Christophe Vilayphiou 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
Harry Bomrah 5f0d6c9003 Code Merge 2012-08-06 17:05:12 +08:00
Harry Bomrah 47408f4467 UI modifications 2012-08-06 17:01:53 +08:00
Matthew K. Fu JuYuan 1c62c1a799 first version of fb_share 2012-08-06 16:12:49 +08:00
Christophe Vilayphiou 80887ace3c Remove console.log 2012-08-06 15:15:44 +08:00
Christophe Vilayphiou 9a103bbb7e Fix remote upload file for tinymce 2012-08-06 15:13:21 +08:00
devin 9ebee5daea gallery update 2012-08-06 14:02:55 +08:00
devin 337d690c54 gallery update 2012-08-06 11:07:58 +08:00
Christophe Vilayphiou 73b2cd1035 Fix typo and title in news and announcement frontend 2012-08-05 15:04:52 +08:00
Christophe Vilayphiou 5f88408dcb Check for 'http' or 'https' before saving a link 2012-08-04 16:29:31 +08:00
Christophe Vilayphiou 5fc679e0ca Toggle line color for announcement frontend 2012-08-04 16:16:28 +08:00
Christophe Vilayphiou 6a94d4f550 Put back impressionist where it was commented out 2012-08-04 15:42:53 +08:00
Christophe Vilayphiou 50b313976e Fix page: take category and tag at the same time 2012-08-03 17:12:54 +08:00
Matthew K. Fu JuYuan b79de66973 fix variable. 2012-08-03 14:42:18 +08:00
Christophe Vilayphiou c4e12ff347 Add missing class to ad_banner for link 2012-08-03 13:55:22 +08:00
Matthew K. Fu JuYuan a9141f91ba Merge branch 'sunspot_search' 2012-08-03 12:51:33 +08:00
Matthew K. Fu JuYuan d7ad029d4b fix approval at news and announcement for abnormal flags that causing search result fault. 2012-08-03 12:45:47 +08:00
Matthew K. Fu JuYuan 69901403cd First version of Solr search. 2012-08-03 09:30:12 +08:00
Christophe Vilayphiou 2d2e01115b Fix page: take category and tag at the same time
With news and announcement views
2012-08-03 01:44:06 +08:00
Christophe Vilayphiou 4127d7f2eb Fix tags 2012-08-03 01:35:41 +08:00
Harry Bomrah 6159c04da6 Merge branch 'gallery_orbit' into desktop_devin 2012-08-01 20:09:58 +08:00
Harry Bomrah b0ef2b6957 Multi language and side bar update 2012-08-01 20:07:54 +08:00
Matthew K. Fu JuYuan 1b29eb5de4 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-01 18:15:28 +08:00
Matthew K. Fu JuYuan ee5ac0227e change the algorithm of tag cloud. 2012-08-01 18:15:10 +08:00
Christophe Vilayphiou df9a1e8057 Fix typo 2012-08-01 17:11:37 +08:00
Christophe Vilayphiou f917adcdf3 Fix typo 2012-08-01 17:09:00 +08:00
Christophe Vilayphiou 0d048de33f Fix link in sitemap 2012-08-01 17:08:07 +08:00
Christophe Vilayphiou 83acb78966 path instead of url 2012-08-01 17:05:34 +08:00
Christophe Vilayphiou 410dfe62e8 Fix typo 2012-08-01 17:03:39 +08:00
Christophe Vilayphiou 02ade108d0 Fix typo 2012-08-01 16:59:11 +08:00
Christophe Vilayphiou d2564af001 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-01 16:38:35 +08:00
Christophe Vilayphiou 4df4274629 Add links to frontend_sitemap 2012-08-01 16:38:07 +08:00
devin eaa8171689 gallery update 2012-08-01 16:35:59 +08:00
Christophe Vilayphiou 25a911b4f8 Change for page: take category and tag at the same time 2012-08-01 16:33:46 +08:00
Matthew K. Fu JuYuan acebec8904 don't dislay web links if no eng. lists in widget is now sorted. 2012-08-01 15:24:55 +08:00
Christophe Vilayphiou 625801c0e9 Fix auth_users bug without category in news 2012-08-01 03:07:23 +08:00
Christophe Vilayphiou 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
Christophe Vilayphiou c951cc6b6f Fix for data_migration 2012-08-01 00:58:59 +08:00
Harry Bomrah 7accbed1a0 gallery translation supported 2012-07-31 21:15:42 +08:00
Matthew K. Fu JuYuan b2f28eabaf Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 18:23:01 +08:00
Matthew K. Fu JuYuan b989f458d3 Do not show news/anc if no context. 2012-07-31 18:22:40 +08:00
Christophe Vilayphiou 0078c97b19 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 14:27:44 +08:00
Christophe Vilayphiou 9f859b903d Add custom validator and fix .html_safe with rescue 2012-07-31 14:25:46 +08:00
Matthew K. Fu JuYuan 7e3b59c09a finished tag clouds 2012-07-31 11:57:32 +08:00
Matthew K. Fu JuYuan af4865ceb7 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 11:01:11 +08:00
Matthew K. Fu JuYuan 4dea025c8a fix for
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +08:00
Harry Bomrah 19b60a2ddb Merge branch 'desktop_harry' into desktop_devin 2012-07-31 01:16:43 +08:00
Harry Bomrah 45da2971ef Merge branch 'gallery_orbit' into desktop_harry 2012-07-31 01:16:22 +08:00
Harry Bomrah 17dffb15e1 Major updates for gallery 2012-07-31 01:15:48 +08:00