OrbitServer
|
3fdff9357c
|
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
|
2012-08-08 11:52:11 +08:00 |
OrbitServer
|
fbb53cca36
|
Ray's changes for sitemap backend
|
2012-08-08 11:51:20 +08:00 |
Christophe Vilayphiou
|
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 |
Christophe Vilayphiou
|
db16fdc7b5
|
Change for getting url from key
|
2012-08-08 07:46:10 +08:00 |
Christophe Vilayphiou
|
f7e6703d5f
|
Change the way the orig_url is passed to fb
|
2012-08-08 06:50:28 +08:00 |
Christophe Vilayphiou
|
fc560f4205
|
Try fb from override and generated page
|
2012-08-08 05:40:50 +08:00 |
Christophe Vilayphiou
|
3cb182ff8e
|
Add meta to head for fb share
|
2012-08-08 03:10:26 +08:00 |
Matthew K. Fu JuYuan
|
1c62c1a799
|
first version of fb_share
|
2012-08-06 16:12:49 +08:00 |
Matthew K. Fu JuYuan
|
b79de66973
|
fix variable.
|
2012-08-03 14:42:18 +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 |
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 |
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 |
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 |
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 |
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 |