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 |
|
Christophe Vilayphiou
|
f3ccbce5c8
|
Put back impressions for new and bulletin.
Add view_count field to tag.
|
2012-07-30 17:57:55 +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 |
|
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
|
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
|
fb1f08327d
|
fix redis search limit for 10 items
|
2012-07-26 12:12:43 +08:00 |
|
Christophe Vilayphiou
|
a1cf0a3eb6
|
Remove i18n_variable for web_resource
|
2012-07-26 04:10:15 +08:00 |
|
Christophe Vilayphiou
|
3466a19362
|
Fix error in i18n_variable removal for page_content
|
2012-07-26 04:10:02 +08:00 |
|
Christophe Vilayphiou
|
4a6b9fbe64
|
Remove i18n_variable for page_content
|
2012-07-26 03:47:14 +08:00 |
|
Christophe Vilayphiou
|
e33afc0822
|
Remove i18n_variable for news
|
2012-07-26 03:37:07 +08:00 |
|
Christophe Vilayphiou
|
875fad848c
|
Fix announcement for i18n_variable removal
|
2012-07-26 03:29:06 +08:00 |
|
Christophe Vilayphiou
|
b9cf5263f6
|
Remove i18n_variable for announcement
|
2012-07-26 02:27:43 +08:00 |
|
Matthew K. Fu JuYuan
|
4768da3c7a
|
fix announcement loading failed caused by impression. disable pinyin search.
|
2012-07-25 18:26:05 +08:00 |
|
Matthew K. Fu JuYuan
|
25f4e292e6
|
add not found for no result
|
2012-07-25 13:58:09 +08:00 |
|
Matthew K. Fu JuYuan
|
98fd9223a8
|
open search for news
|
2012-07-25 10:42:55 +08:00 |
|
Matthew K. Fu JuYuan
|
397b444390
|
fix for bugs
|
2012-07-24 20:58:34 +08:00 |
|
Matthew K. Fu JuYuan
|
f9bdb4a327
|
New and Announcement search. Disabled impression.
|
2012-07-20 15:47:40 +08:00 |
|
Matthew K. Fu JuYuan
|
033667f99b
|
fix for missing disable category at frontend and widget
|
2012-07-17 11:26:50 +08:00 |
|
Matthew K. Fu JuYuan
|
a4b1681d39
|
fix rejection for announcement and news.
|
2012-07-17 10:21:46 +08:00 |
|
Matthew K. Fu JuYuan
|
4daf36908c
|
working cache
|
2012-07-13 15:36:10 +08:00 |
|
Matthew K. Fu JuYuan
|
85d6bbe1c9
|
add i18n variable. fix web_links for disable category
|
2012-07-11 17:56:31 +08:00 |
|
Matthew K. Fu JuYuan
|
ca2c056a07
|
fix for not displaying bulletin at fronted when it's parent category is disable
|
2012-07-11 17:17:44 +08:00 |
|
Matthew K. Fu JuYuan
|
773371e885
|
fix from messy search
|
2012-07-09 16:48:23 +08:00 |
|
Matthew K. Fu JuYuan
|
09d46f2f75
|
NCCU 上傳版本 0709
Merge branch 'nccu0621'
Conflicts:
Gemfile
config/resque.god
vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
|
2012-07-09 16:02:59 +08:00 |
|
Matthew K. Fu JuYuan
|
49862e70f9
|
hide category at front end
|
2012-07-09 12:05:21 +08:00 |
|
Matthew K. Fu JuYuan
|
56caf4b34e
|
category disable for backend
|
2012-07-06 18:11:55 +08:00 |
|
Matthew K. Fu JuYuan
|
c5fdff764e
|
orbit disable object for categories
|
2012-07-05 16:00:45 +08:00 |
|
Matthew K. Fu JuYuan
|
32480e10ed
|
en translation
|
2012-07-04 17:43:52 +08:00 |
|
Matthew K. Fu JuYuan
|
ae2cbb728e
|
archive for announcement
|
2012-07-04 17:36:51 +08:00 |
|
Matthew K. Fu JuYuan
|
4fe92b844e
|
Add sorting order for NCCU request
|
2012-07-03 15:47:28 +08:00 |
|
Matthew K. Fu JuYuan
|
c0b3798bad
|
fix for date for qu menu
|
2012-06-29 11:41:06 +08:00 |
|
Matthew K. Fu JuYuan
|
f66c3d9c0c
|
fix bugs.
|
2012-06-29 11:17:35 +08:00 |
|
Matthew K. Fu JuYuan
|
6c4c1046bc
|
fix date select cause error back to the time of Jesus
|
2012-06-28 15:19:51 +08:00 |
|
Matthew K. Fu JuYuan
|
58a11ff569
|
fix javascript for new and anc link removing
|
2012-06-28 13:50:11 +08:00 |