Christophe Vilayphiou
|
0d330edfa3
|
New css and images for rss
|
2012-08-15 17:42:45 +08:00 |
Christophe Vilayphiou
|
a19a5415c1
|
Ray's changes for list.css
|
2012-08-15 12:13:58 +08:00 |
Christophe Vilayphiou
|
ab1c457a51
|
Add i18n for message in editor pop-up
|
2012-08-14 01:20:45 +08:00 |
Harry Bomrah
|
9ff60d2ba4
|
form validation again
|
2012-08-14 01:02:45 +08:00 |
Harry Bomrah
|
ffa49fd092
|
form validation
|
2012-08-14 01:02:45 +08:00 |
Christophe Vilayphiou
|
9196deb997
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-14 01:00:25 +08:00 |
Christophe Vilayphiou
|
c32b0dd4b4
|
Move delete checkboxes to js
|
2012-08-14 00:59:01 +08:00 |
Matthew K. Fu JuYuan
|
6cc470ede9
|
nccu fix
|
2012-08-13 18:35:47 +08:00 |
Christophe Vilayphiou
|
18e18a4add
|
Fix for banner on ie
|
2012-08-13 15:10:53 +08:00 |
Christophe Vilayphiou
|
2bd132cef9
|
Pass category and tag to search to redirect to the right page
Ray's change for mouseover (take out the black background)
|
2012-08-09 19:16:26 +08:00 |
Matt
|
1aea8d91f4
|
Merge branch 'master' of github.com:Rulingcom/NCCU
|
2012-08-08 18:16:38 +08:00 |
Christophe Vilayphiou
|
0645f04240
|
Ray's change in css
|
2012-08-08 18:11:18 +08:00 |
Matt
|
62ba8c9f18
|
Fix bugs on 172:180
|
2012-08-08 17:56:00 +08:00 |
Christophe Vilayphiou
|
b4c2dfe0ef
|
Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share
|
2012-08-08 11:53:47 +08:00 |
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
|
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 |
Matthew K. Fu JuYuan
|
85a556a4a2
|
first version of fb_share
|
2012-08-08 11:04:19 +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
|
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 |
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
|
934b515914
|
Sitemap with main
|
2012-07-27 19:13:39 +08:00 |
Christophe Vilayphiou
|
db9c4c0e10
|
Partial sitemap
|
2012-07-27 19:13:39 +08:00 |
Matthew K. Fu JuYuan
|
04a23db745
|
fix invalid invalid byte sequence in US-ASCII for js files
|
2012-06-27 14:27:27 +08:00 |
Matthew K. Fu JuYuan
|
55449efb35
|
fix 新聞與公告QA
1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
2.優先處理-編輯中的檔案列表,無法刪除
3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除
|
2012-06-27 14:21:06 +08:00 |
Christophe Vilayphiou
|
4c4929c20a
|
Fix js for news quick_edit and edit for files
|
2012-06-27 11:36:18 +08:00 |
Matthew K. Fu JuYuan
|
6a4abc6c43
|
fix news error
|
2012-06-27 09:59:32 +08:00 |
Christophe Vilayphiou
|
c062b43069
|
Merge branch 'design_team' into ldap
|
2012-05-23 12:11:38 +08:00 |
Christophe Vilayphiou
|
006b84f6a1
|
Ray's fix for ie
|
2012-05-23 12:06:09 +08:00 |
Christophe Vilayphiou
|
f1c8bed29d
|
Merge branch 'design_team' into ldap
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
|
2012-05-22 20:33:07 +08:00 |
Christophe Vilayphiou
|
541aa5831e
|
JS changes to load drag and drop
|
2012-05-22 17:37:15 +08:00 |
Christophe Vilayphiou
|
874a89d99b
|
Ray's fix for structure side_bar
|
2012-05-22 16:48:57 +08:00 |
Christophe Vilayphiou
|
d0b030c47d
|
Put inc/ajax_setting in new_admin
Fix callback for link on save
|
2012-05-22 16:11:00 +08:00 |
Matthew K. Fu JuYuan
|
99bcdf6e1e
|
clean up unless code
|
2012-05-22 14:59:54 +08:00 |
Matthew K. Fu JuYuan
|
79f67208fa
|
js for preventing user do stupid things durning ajax
|
2012-05-22 14:59:54 +08:00 |
Christophe Vilayphiou
|
5e9836f371
|
Changes for structure
|
2012-05-22 14:45:49 +08:00 |
Christophe Vilayphiou
|
4d33c7a56d
|
Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
|
2012-05-18 19:42:36 +08:00 |
Matt
|
6a022c90da
|
Changes on nccu
|
2012-05-18 15:20:45 +08:00 |
Christophe Vilayphiou
|
17b6a70506
|
Merge branch 'design_team' into ldap
|
2012-05-17 23:36:24 +08:00 |
Matthew K. Fu JuYuan
|
16ada34585
|
fix ad_banner. new ad_image with best size from ad_banner. content editable at tab
|
2012-05-17 23:35:46 +08:00 |
Harry Bomrah
|
1b1c2c0032
|
image title and description callback fixed…
|
2012-05-17 20:19:31 +08:00 |
Christophe Vilayphiou
|
5e93fe51a9
|
Merge branch 'design_team' into ldap
|
2012-05-17 16:41:11 +08:00 |