Christophe Vilayphiou
|
a03d1ad10b
|
Change for getting url from key
|
2012-08-08 11:04:19 +08:00 |
|
Christophe Vilayphiou
|
6cfdf0f25a
|
Change the way the orig_url is passed to fb
|
2012-08-08 11:04:19 +08:00 |
|
Christophe Vilayphiou
|
4bed925e0f
|
Try fb from override and generated page
|
2012-08-08 11:04:19 +08:00 |
|
Christophe Vilayphiou
|
acf4446523
|
Add meta to head for fb share
|
2012-08-08 11:04:19 +08:00 |
Matthew K. Fu JuYuan
|
85a556a4a2
|
first version of fb_share
|
2012-08-08 11:04:19 +08:00 |
|
Christophe Vilayphiou
|
c6c8187bda
|
Changes for design: menu, frontend news and announcement
|
2012-08-08 10:53:04 +08:00 |
|
Christophe Vilayphiou
|
9982fd880f
|
Update the path when name is changed in item.rb
|
2012-08-08 10:53:04 +08:00 |
|
Christophe Vilayphiou
|
c8dcc9734d
|
Change width for site map frontend, add link for more in announcement widget
|
2012-08-08 10:53:04 +08:00 |
|
Christophe Vilayphiou
|
292105bdf1
|
Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie
|
2012-08-08 10:53:04 +08:00 |
|
Christophe Vilayphiou
|
86a3d4a4b1
|
Remove console.log
|
2012-08-08 10:52:22 +08:00 |
|
Christophe Vilayphiou
|
ecc5c39840
|
Fix remote upload file for tinymce
|
2012-08-08 10:51:54 +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 |
Harry Bomrah
|
4660c26b7a
|
fix for ie8,9 for tinymce
|
2012-08-07 20:55:18 +08:00 |
|
Christophe Vilayphiou
|
8ea7bf75cd
|
Fix uploader, ie9 ok, not ie8
|
2012-08-07 17:32:15 +08:00 |
|
Matthew K. Fu JuYuan
|
1c62c1a799
|
first version of fb_share
|
2012-08-06 16:12:49 +08:00 |
|
Christophe Vilayphiou
|
5f88408dcb
|
Check for 'http' or 'https' before saving a link
|
2012-08-04 16:29:31 +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 |
|
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
|
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 |
|
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 |
|
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
|
7440727acd
|
Fix: "._type" to ".class"
|
2012-07-30 17:21:37 +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
|
946ec9306f
|
first version of tag cloud.
|
2012-07-30 11:59:20 +08:00 |
|
Christophe Vilayphiou
|
a6a8fe3d64
|
Remove remaining 18n_variables
|
2012-07-27 19:37:25 +08:00 |
|
Matthew K. Fu JuYuan
|
a657a7d615
|
remove cache
|
2012-07-27 19:14:24 +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
|
804695749d
|
Fix bugs after removal of i18n_variable
|
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
|
e2ebd48b22
|
Remove i18n_variable for announcement
|
2012-07-27 19:12:58 +08:00 |
|
Matthew K. Fu JuYuan
|
de831f1f96
|
disable homepage cache for english page
|
2012-07-27 05:08:24 +08:00 |
unknown
|
c0cac812c5
|
demo site widget
|
2012-07-26 16:39:29 +08:00 |
|
Matthew K. Fu JuYuan
|
87549d4e1f
|
fix for nil value
|
2012-07-25 17:49:16 +08:00 |
|
Matthew K. Fu JuYuan
|
13ec25ed10
|
fix for orbit bar broken
|
2012-07-25 17:44:50 +08:00 |
|
Matthew K. Fu JuYuan
|
97b4eee798
|
full site search with google
|
2012-07-25 17:20:25 +08:00 |
|
Matthew K. Fu JuYuan
|
f9bdb4a327
|
New and Announcement search. Disabled impression.
|
2012-07-20 15:47:40 +08:00 |
OrbitServer
|
f223e4bb1e
|
Ika's changes for orbit bar
|
2012-07-20 15:41:27 +08:00 |
|
unknown
|
10731dc211
|
demo widget
|
2012-07-18 18:07:45 +08:00 |
|
Matthew K. Fu JuYuan
|
2ae6b54a45
|
fix for not working cache
|
2012-07-13 18:32:17 +08:00 |
|
Matthew K. Fu JuYuan
|
4daf36908c
|
working cache
|
2012-07-13 15:36:10 +08:00 |
|
Matthew K. Fu JuYuan
|
0e65e379b0
|
cache first commit
|
2012-07-12 11:47:24 +08:00 |
|
Matthew K. Fu JuYuan
|
773371e885
|
fix from messy search
|
2012-07-09 16:48:23 +08:00 |
|
Christophe Vilayphiou
|
e48735a4ac
|
Merge branch 'desktop_devin' of github.com:Rulingcom/orbit into desktop_devin
|
2012-07-09 16:39:58 +08:00 |
|
unknown
|
1d8e386bde
|
demo website widget
|
2012-07-09 16:28:03 +08:00 |
devin
|
68fd726ce1
|
little
|
2012-07-09 16:25:41 +08:00 |
|
devin
|
b6266284b4
|
dump
|
2012-07-09 16:21:02 +08:00 |
|
Harry Bomrah
|
222c0b9564
|
Merge branch 'desktop_harry' into desktop_devin
|
2012-07-09 16:12:45 +08:00 |
|
Harry Bomrah
|
4796de882f
|
Scroll down fixes
|
2012-07-09 16:11:31 +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 |
|
devin
|
bfedf207c9
|
some changes
|
2012-07-09 15:37:47 +08:00 |
|
Matthew K. Fu JuYuan
|
49862e70f9
|
hide category at front end
|
2012-07-09 12:05:21 +08:00 |
|
devin
|
58d162d225
|
publication adjustment
|
2012-07-09 10:44:01 +08:00 |
|
Matthew K. Fu JuYuan
|
56caf4b34e
|
category disable for backend
|
2012-07-06 18:11:55 +08:00 |
|
Harry Bomrah
|
2e94c19019
|
Merge branch 'desktop_devin' into desktop_harry
|
2012-07-06 16:12:01 +08:00 |
|
Harry Bomrah
|
830eb8eb62
|
Timeline design and timescale update
|
2012-07-06 16:11:03 +08:00 |
|
devin
|
8948ccca25
|
little changes
|
2012-07-06 16:09:26 +08:00 |
|
devin
|
bfaed4deb4
|
timeline change
|
2012-07-05 16:49:03 +08:00 |
|
Harry Bomrah
|
312e63f242
|
New Timeline with books and seminar pages
|
2012-07-05 16:42:00 +08:00 |
Joshua Milton
|
bb75383ef0
|
Seminar Pages modified
|
2012-07-05 16:27:59 +08:00 |
|
Matthew K. Fu JuYuan
|
c5fdff764e
|
orbit disable object for categories
|
2012-07-05 16:00:45 +08:00 |
|
Harry Bomrah
|
6923b82284
|
Added seminar section
|
2012-07-04 19:12:02 +08:00 |
|
Harry Bomrah
|
f635f642fc
|
Merge for new timeline updates and font updates
|
2012-07-04 18:49:10 +08:00 |
|
Joshua Milton
|
441929eb74
|
Latest code by joshua
|
2012-07-04 18:39:28 +08:00 |
|
Joshua Milton
|
6b9926539d
|
Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
Conflicts:
app/assets/javascripts/orbitdesktop.js
app/controllers/desktop_publications_controller.rb
config/routes.rb
|
2012-07-04 18:31:00 +08:00 |
|
Joshua Milton
|
3f42a22094
|
Books section added
|
2012-07-04 17:55:30 +08:00 |
|
Matthew K. Fu JuYuan
|
ae2cbb728e
|
archive for announcement
|
2012-07-04 17:36:51 +08:00 |
|
devin
|
e133673736
|
some change
|
2012-07-04 13:38:18 +08:00 |
|
Harry Bomrah
|
a0c09046a8
|
Timeline merge plus font update
|
2012-07-03 19:53:34 +08:00 |
|
Harry Bomrah
|
f20f36383e
|
Timeline ajax load fixed… a bit change in structure..
|
2012-07-03 19:45:47 +08:00 |
|
Matthew K. Fu JuYuan
|
f7107936d0
|
fix for checking @rulingcom.com
|
2012-07-03 18:21:48 +08:00 |
|
Matthew K. Fu JuYuan
|
9607b5bbfd
|
rulingcom帳號不透過LDAP認證
|
2012-07-03 18:12:44 +08:00 |
|
Matthew K. Fu JuYuan
|
d0632b2e4c
|
change name format
|
2012-07-03 16:05:19 +08:00 |
|
Matthew K. Fu JuYuan
|
56ecf9c69b
|
remove remember for nccu
|
2012-07-03 15:59:25 +08:00 |
|
Matthew K. Fu JuYuan
|
4014f8ee47
|
fix over queue at resque
|
2012-07-03 10:51:26 +08:00 |
|
Harry Bomrah
|
bacb1f1e63
|
Timeline ajax loading
|
2012-07-02 21:06:36 +08:00 |
|
devin
|
f34cb47618
|
font aweosme change
|
2012-07-02 16:23:14 +08:00 |