Commit Graph

2164 Commits

Author SHA1 Message Date
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
Christophe Vilayphiou ecb75fd085 Fix typo 2012-07-30 18:37:20 +08:00
Christophe Vilayphiou 39b63a970c Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00
Christophe Vilayphiou f3ccbce5c8 Put back impressions for new and bulletin.
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
Christophe Vilayphiou 4d7a53866e Delete remaining impressionist files 2012-07-30 17:45:26 +08:00
Christophe Vilayphiou 7440727acd Fix: "._type" to ".class" 2012-07-30 17:21:37 +08:00
Matthew K. Fu JuYuan bb154f5be6 fix error when creating bulletin and news 2012-07-30 16:38:02 +08:00
Matthew K. Fu JuYuan 4e1a91ed90 Merge branch 'changing_tag'
Conflicts:
	vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
Matthew K. Fu JuYuan effad63c92 make sure no pending news or announcement will be searched out 2012-07-30 14:39:40 +08:00
Matthew K. Fu JuYuan 946ec9306f first version of tag cloud. 2012-07-30 11:59:20 +08:00
Harry Bomrah 929cd3b0cc Gallery update.. 2012-07-29 18:52:30 +08:00
Christophe Vilayphiou afa4b7dcb3 Remove cache 2012-07-28 16:06:44 +08:00
Christophe Vilayphiou a6a8fe3d64 Remove remaining 18n_variables 2012-07-27 19:37:25 +08:00
Christophe Vilayphiou 23854e7adc Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var
Conflicts:
	app/controllers/pages_controller.rb
	app/models/item.rb
	app/models/site.rb
	config/environments/development.rb
	vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-07-27 19:21:39 +08:00
Christophe Vilayphiou cd6d95204f Move Impressionist to Gemfile 2012-07-27 19:14:25 +08:00
Matthew K. Fu JuYuan a657a7d615 remove cache 2012-07-27 19:14:24 +08:00
Matthew K. Fu JuYuan f76b1c02b5 first version of mid_site_sync for new i18n var 2012-07-27 19:13:40 +08:00
Christophe Vilayphiou a8cc581279 Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
Christophe Vilayphiou 934b515914 Sitemap with main 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 38804bd118 Add disable for main title 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou db9c4c0e10 Partial sitemap 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 12f9f666eb Fix bugs after i18n_variable removal 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou ad3ec43a00 Remove comments in migrate task 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 804695749d Fix bugs after removal of i18n_variable 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 780386d7f1 Remove i18n_variable for parser 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 53cae0a9ee Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 49dd3a1770 Remove i18n_variable for controllers, helpers and models 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 327996a7b0 Task part for i18n_variable removal for web_resource 2012-07-27 19:12:59 +08:00
Christophe Vilayphiou 207b0c5886 Remove i18n_variable for web_resource 2012-07-27 19:12:59 +08:00
Christophe Vilayphiou 30624c0bd8 Fix error in i18n_variable removal for page_content 2012-07-27 19:12:59 +08:00
Christophe Vilayphiou 50813eb57d Remove i18n_variable for page_content 2012-07-27 19:12:59 +08:00
Christophe Vilayphiou 61c1af7316 Remove i18n_variable for news 2012-07-27 19:12:58 +08:00
Christophe Vilayphiou 8eec7b4dac Fix announcement for i18n_variable removal 2012-07-27 19:12:58 +08:00
Christophe Vilayphiou e2ebd48b22 Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan d589a1b522 fix for 標題後台為「校園新聞」,前台顯示為「新聞」 該頁面為列表,最上方卻出現「搜尋結果」? from Mr.張 2012-07-27 07:42:00 +08:00
Matthew K. Fu JuYuan eed7b78357 fix for loading failed 2012-07-27 05:45:39 +08:00
Matthew K. Fu JuYuan de831f1f96 disable homepage cache for english page 2012-07-27 05:08:24 +08:00
Matthew K. Fu JuYuan 7c3cc30784 fix for rake encoding 2012-07-26 16:58:17 +08:00
unknown c0cac812c5 demo site widget 2012-07-26 16:39:29 +08:00