Commit Graph

446 Commits

Author SHA1 Message Date
Harry Bomrah 1daf405b3d Gallery started. 2012-08-20 23:14:10 +08:00
devin 801c7cab0c tinyscroll bar update 2012-08-20 23:11:32 +08:00
Harry Bomrah 1efb807246 tinyscrollbar extension 2012-08-20 23:11:32 +08:00
chris 3c283d1a7a Set default picture
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
2012-08-16 17:24:12 +08:00
Christophe Vilayphiou 96fd89cca3 Fix js for ie in list 2012-08-16 01:09:45 +08:00
Christophe Vilayphiou 53c5f6a3b9 New css and images for rss 2012-08-15 18:00:55 +08:00
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
unknown c0cac812c5 demo site widget 2012-07-26 16:39:29 +08:00
OrbitServer f223e4bb1e Ika's changes for orbit bar 2012-07-20 15:41:27 +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
devin bfedf207c9 some changes 2012-07-09 15:37:47 +08:00
devin 58d162d225 publication adjustment 2012-07-09 10:44:01 +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
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 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
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
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
devin 08fd07b6aa timeline and font update 2012-07-02 16:22:51 +08:00
devin 6533abf214 font awesome update 2012-07-02 11:10:01 +08:00
Christophe Vilayphiou a1e74987dc Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry
Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb
2012-06-29 16:10:29 +08:00
Harry Bomrah 7151102a86 new page add and timeline changes 2012-06-28 17:31:48 +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
Harry Bomrah 4aa155a44d timeline updates major ones.. 2012-06-26 21:09:33 +08:00
Harry Bomrah 555ec86403 Timeline commit 2012-06-26 15:59:28 +08:00
Harry Bomrah 7488341836 Commit for app window.. 2012-05-25 15:41:07 +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
devin 6fedf7232a app update 2012-05-21 15:45:15 +08:00
Harry Bomrah 81ff0f2c1c Merge branch 'desktop_harry' into desktop_devin 2012-05-21 15:26:38 +08:00
devin a78b72ebfc app update 2012-05-21 15:25:18 +08:00
Harry Bomrah dfe7ccf166 general commit 2012-05-21 15:24:47 +08:00
devin ab7ae6dcee app 2012-05-21 14:55:51 +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
Christophe Vilayphiou 29c54e6480 Add mandatory fields to assets 2012-05-17 16:40:09 +08:00
Christophe Vilayphiou eba4671733 Merge branch 'design_team' into ldap 2012-05-17 06:46:29 +08:00
Matthew K. Fu JuYuan a3acd865d7 AdBanner reopen new banner and delete. Rename title with content editable tag. 2012-05-17 06:44:14 +08:00
Christophe Vilayphiou 6b9c8eb15d Merge branch 'design_team' into ldap 2012-05-17 06:31:57 +08:00
Christophe Vilayphiou 26292f0dcc Asset upload 2012-05-17 06:28:29 +08:00
Harry Bomrah 617a683d00 image insertion completed.. 2012-05-16 16:22:50 +08:00
Harry Bomrah c380c4cad0 popup fixed 2012-05-16 15:34:23 +08:00
Harry Bomrah 30137b50b4 popup fix.. 2012-05-16 15:33:54 +08:00
Harry Bomrah 75cbae049b few experiments… 2012-05-16 11:18:54 +08:00
Christophe Vilayphiou 0b0916179f Change assets 2012-05-16 11:07:11 +08:00