Commit Graph

453 Commits

Author SHA1 Message Date
Harry Bomrah 90fd9de5a8 fix for json and some other bugs 2012-11-22 16:31:52 +08:00
Rueshyna 9e400e6e6a fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 10:49:54 +08:00
chris 475642d375 Remove news and fix default_url in ImageUploader 2012-11-22 09:30:25 +08:00
Rueshyna bb69a059e8 hidden file field, and fixed updated function 2012-11-22 02:37:56 +08:00
Harry Bomrah 73e76f2477 routes fixed 2012-11-21 18:36:56 +08:00
Harry Bomrah c53581c999 small fix for journal_pages desktop 2012-11-21 18:36:56 +08:00
Harry Bomrah 0b9af044ba new file created for journal pages 2012-11-21 18:36:56 +08:00
Rueshyna b47be52309 tmp 2012-11-21 18:36:56 +08:00
Rueshyna 6a9426c9c8 add co-author page and new it, but can't destory it... 2012-11-21 18:36:32 +08:00
Harry Bomrah 91005bb00a routes fixed 2012-11-21 17:39:01 +08:00
Harry Bomrah c94940214c small fix for journal_pages desktop 2012-11-21 17:11:18 +08:00
Harry Bomrah b571373c8f new file created for journal pages 2012-11-21 15:35:23 +08:00
Rueshyna 5c0b137c6d tmp 2012-11-21 14:52:26 +08:00
Rueshyna da1b871481 merge 2012-11-21 10:46:33 +08:00
Harry Bomrah 8f65284932 Desktop updates various 2012-11-21 07:37:44 +08:00
Rueshyna 703324063e change journal list json link 2012-11-21 07:37:44 +08:00
Rueshyna 5eb8cc4063 finished some method of list and journal 2012-11-21 07:37:43 +08:00
Rueshyna 1c6badfb10 add more fake data 2012-11-21 07:37:43 +08:00
Rueshyna f93d019ba0 check file type 2012-11-21 07:37:42 +08:00
Rueshyna 61c0c4b542 modified file of view bug 2012-11-21 07:37:42 +08:00
Harry Bomrah 97ffb5ff18 file view update 2012-11-21 07:37:42 +08:00
Rueshyna ccfecb8243 add co-author page and new it, but can't destory it... 2012-11-21 01:54:06 +08:00
Matthew K. Fu JuYuan 2aa9a19deb complete address field. still have javascript issue for fill back and display address ext fields in modal. 2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan 17988f2fb2 address field and text field convert 2012-11-20 09:53:37 +08:00
Matthew K. Fu JuYuan a85e5fcc0d address field. js and style is broken 2012-11-20 09:53:36 +08:00
Rueshyna db3797694b change journal list json link 2012-11-19 12:13:05 +08:00
Rueshyna 26436395f5 finished some method of list and journal 2012-11-18 03:07:50 +08:00
Rueshyna 34f0eea1ff add more fake data 2012-11-16 09:13:51 +08:00
Rueshyna 3144b84d10 check file type 2012-11-15 22:39:01 +08:00
Rueshyna c627376fbe modified file of view bug 2012-11-15 11:18:55 +08:00
Harry Bomrah 351767cd98 file view update 2012-11-14 21:12:10 +08:00
Harry Bomrah e498be9753 desktopAPI update. 2012-11-12 15:11:36 +08:00
Harry Bomrah a56d80698f desktop api update.. 2012-11-12 15:11:36 +08:00
chris b40d4702d5 Merge branch 'master' into various_bugs
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
2012-11-06 11:44:00 +08:00
Harry Bomrah da5e7f670e Desktop Widgtes updates.. 2012-11-06 10:36:34 +08:00
Harry Bomrah 2e809c5c19 Calander view updated... 2012-11-05 11:40:11 +08:00
chris 451d73897b Fix bugs:
Page content: after edit and redirect to index, there's a gap between the headers and the first row
	TinyMCE: the size of the textarea change depending on the language
2012-11-01 09:30:12 +08:00
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
2012-10-29 16:10:07 +08:00
chris d7fd61ce55 Edit uploaded package 2012-10-26 11:19:57 +08:00
OrbitServer 9e2bc7e1c1 Ray's changes in css and js 2012-10-09 07:48:05 +08:00
Matthew K. Fu JuYuan 67bd68d492 harry's js fix 2012-10-08 10:11:45 +08:00
Matthew K. Fu JuYuan 7919750d4f 171 doesn't have bug with javascript remove log script 2012-10-01 19:05:23 +08:00
Matthew K. Fu JuYuan 3dc4dc2316 debug commit 2012-10-01 17:56:55 +08:00
Matthew K. Fu JuYuan 506fa179a1 fix announcement 2012-10-01 17:48:51 +08:00
Matt b65d785834 harry's fix, announcement still broken 2012-10-01 17:21:23 +08:00
Matthew K. Fu JuYuan aa5d0bb1ad Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
	config/locales/zh_tw.yml
2012-09-28 09:49:22 +08:00
Matthew K. Fu JuYuan cfc80340b8 add setting for tinymce config 2012-09-28 09:45:50 +08:00
Harry Bomrah 9a4c8137fe Fix for images 2012-09-27 15:33:37 +08:00
Christophe Vilayphiou bdd5a1a047 Changes for i18n yml 2012-09-24 09:02:45 +08:00
Harry Bomrah b6c06c6d4f tiny mce fix 2012-09-19 17:59:17 +08:00
OrbitServer ee51240102 Ray's changes for new backend 2012-09-14 02:38:56 +08:00
unknown 42d50ae534 Plugins 2012-09-14 00:05:31 +08:00
Matthew K. Fu JuYuan 803f83b239 fix for no login window for backend 2012-09-12 16:20:15 +08:00
Harry Bomrah 04877b9945 design update 2012-09-12 01:58:23 +08:00
Matt 71021b8c69 Changes for empty file and link in create and edit for news and announcement + partially fix tinymce 2012-09-11 00:41:52 +08:00
Matthew K. Fu JuYuan a20db344f1 preview for update 2012-09-10 11:53:59 +08:00
Fu Matthew 6044857fea complete preview for both new and announcement 2012-09-07 17:55:59 +08:00
Matthew K. Fu JuYuan ae1595a008 view for preview 2012-09-04 09:24:12 +08:00
unknown a1560ebcf5 update archive 2012-08-30 15:17:39 +08:00
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
Harry Bomrah 2c0058e8c9 authorization 2012-08-20 23:18:50 +08:00
Harry Bomrah faf2d914b6 Page added for desktop 2012-08-20 23:17:31 +08:00
Harry Bomrah 69304fda43 UI modifications 2012-08-20 23:16:06 +08:00
Harry Bomrah 587595f815 gallery translation supported 2012-08-20 23:14:11 +08:00
Harry Bomrah 797c9e57b8 Gallery update 2012-08-20 23:14:10 +08:00
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
Christophe Vilayphiou 96fd89cca3 Fix js for ie in list 2012-08-16 01:09:45 +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 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
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
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
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 08fd07b6aa timeline and font update 2012-07-02 16:22:51 +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 541aa5831e JS changes to load drag and drop 2012-05-22 17:37:15 +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
Harry Bomrah 81ff0f2c1c Merge branch 'desktop_harry' into desktop_devin 2012-05-21 15:26:38 +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
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
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 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
Christophe Vilayphiou 53a0fbddf0 Fix commit error 2012-05-15 21:25:51 +08:00
Christophe Vilayphiou 281cfa6518 Changes for widgets 2012-05-13 21:55:39 +08:00
Christophe Vilayphiou 803253ebcf Put nestedSortable in page_edit.js.erb 2012-05-12 22:12:17 +08:00
Harry Bomrah 1a9fa8f505 Merge branch 'desktop_harry' into desktop_devin 2012-05-11 15:28:05 +08:00
Harry Bomrah 2c3637e9b4 very important update for widgets management.. 2012-05-11 15:27:16 +08:00
Christophe Vilayphiou fd52d00187 Add drag and drop to structure side_bar 2012-05-11 10:00:45 +08:00
Christophe Vilayphiou 63f904d3b0 Fix tinymce js load
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
devin 97b60c48b2 update 2012-05-10 17:41:56 +08:00
Matthew K. Fu JuYuan b6aad17681 Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page. 2012-05-10 14:16:37 +08:00
devin ada56a7a63 some update 2012-05-10 10:54:43 +08:00
Christophe Vilayphiou a43877323e Add tinymce to page_part edit for text 2012-05-10 10:34:13 +08:00
Christophe Vilayphiou 9ead6cafda Ray's changes 2012-05-09 04:15:02 +08:00
Harry Bomrah 2083e0bf4f widget structure improvised… 2012-05-07 19:00:50 +08:00
Harry Bomrah fcc875bb5d app store page added… and few other changes.. 2012-05-04 20:28:12 +08:00
Christophe Vilayphiou e0a191162d Ray's changes 2012-05-04 19:11:28 +08:00
Harry Bomrah 3ad11f2098 View functionality, changed controller, journal and pages collections 2012-05-03 21:38:03 +08:00