Commit Graph

899 Commits

Author SHA1 Message Date
chris 455a27437d Changes for announcement widget style 2 2012-12-28 13:47:30 +08:00
chris 17d93409b3 Remove extra double quote in sub_menu
Fix web link widget pagination
2012-12-28 11:10:33 +08:00
Rueshyna c219792a13 fixed delete function of archive file 2012-12-28 10:02:16 +08:00
chris 751d3b1220 Announcement widget: remove I18n.locale
Add part_id in url
2012-12-27 16:52:58 +08:00
Matthew K. Fu JuYuan 2dd2368378 remove merge marks 2012-12-25 11:26:23 +08:00
Matthew K. Fu JuYuan 49e6c33b57 Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/routes.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/archive/init.rb
	vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
2012-12-25 11:01:36 +08:00
Matthew K. Fu JuYuan 41bcbdd2f0 missing file? 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 062ebecae3 fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 2c69590c36 rename of GPRS
now it's named location
2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 397729d3a1 Remove GPRS 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 53afb6ea0c sidebar rewrited 2012-12-24 16:39:53 +08:00
Matthew K. Fu JuYuan 5f712622ad default widgets and sidebar. 2012-12-24 16:38:35 +08:00
Matthew K. Fu JuYuan 6995bb1622 put module app json into init,making orbit app work with module app. 2012-12-24 16:23:16 +08:00
Matthew K. Fu JuYuan 36f6a6fdd6 first version of confined sidebar render 2012-12-24 16:17:00 +08:00
chris e9815c3d9b Fix css bug when precompiling assets 2012-12-20 14:34:02 +08:00
Rueshyna b4633a2ccb .not_guest_user 2012-12-19 19:48:13 +08:00
chris fcbba6660b Only one parser for front end
Separate site map for i18n
2012-12-19 17:15:31 +08:00
Matthew K. Fu JuYuan 858e942da2 fix serval bugs on sidebar. 2012-12-07 12:40:47 +08:00
Matthew K. Fu JuYuan bd743a0ca5 rename of GPRS
now it's named location
2012-12-07 12:40:21 +08:00
Matthew K. Fu JuYuan e07fb7d434 Remove GPRS 2012-12-07 12:36:25 +08:00
OrbitServer fbed496034 Harry's changes in i18n 2012-12-06 23:08:13 +08:00
Rueshyna 4a8878132e add content for announcement rss 2012-12-06 07:59:42 +08:00
Matthew K. Fu JuYuan 99f28a0cba sidebar rewrited 2012-12-05 18:35:58 +08:00
Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
2012-12-05 11:36:32 +08:00
chris 2983b181e6 Fix some translations 2012-12-04 01:03:28 +08:00
Rueshyna eb97d417bd if coauthor not in coauthor db then it will be add in db 2012-12-04 00:31:06 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
Matthew K. Fu JuYuan 4bc80f2bd3 default widgets and sidebar. 2012-12-03 18:52:36 +08:00
Matthew K. Fu JuYuan f9bcb27efc put module app json into init,making orbit app work with module app. 2012-11-29 14:21:46 +08:00
chris 390da0e49a Change icons 2012-11-29 00:49:53 +08:00
Rueshyna 114ca5493a replace rss format with json in announcement 2012-11-28 13:43:48 +08:00
Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config
Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-11-26 17:55:53 +08:00
chris 6a12aec67c Fix album images display 2012-11-22 20:01:10 +08:00
chris 475642d375 Remove news and fix default_url in ImageUploader 2012-11-22 09:30:25 +08:00
devin 25a9987f13 calendar js minor update 2012-11-21 19:02:54 +08:00
chris 2d0e8b37b2 Fix:
- Widgets for announcement
  - Facebook link
  - AdBanner nav
2012-11-21 18:42:14 +08:00
Matthew K. Fu JuYuan ec0ec46303 visitor now can browse gallery 2012-11-21 18:39:28 +08:00
chris 0aaadbc82d Merge branch 'openness' of github.com:Rulingcom/orbit into openness
Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
2012-11-21 18:33:04 +08:00
Matthew K. Fu JuYuan 1279af0c11 fix and hide for visitors,except for album 2012-11-21 18:31:57 +08:00
Matthew K. Fu JuYuan 1f8f58e930 album and gallery is now opened 2012-11-21 17:52:25 +08:00
Harry Bomrah ef3fddd863 fixed sutpid bug for calendar 2012-11-21 16:55:18 +08:00
Harry Bomrah 9fc8ec8e16 back button fix for frontend 2012-11-21 15:00:07 +08:00
Matthew K. Fu JuYuan fda7c43efc Merge branch 'master' of github.com:Rulingcom/orbit into openness 2012-11-21 11:46:44 +08:00
Matthew K. Fu JuYuan ee053cd8ac fix and hide for visitors,except for album 2012-11-21 11:46:06 +08:00
Rueshyna b359d5d566 some bugs 2012-11-21 07:37:44 +08:00
Rueshyna d7599f1ccf add edit function 2012-11-21 07:37:43 +08:00
Rueshyna 5eb8cc4063 finished some method of list and journal 2012-11-21 07:37:43 +08:00
devin f2e76d27b8 minor update for gallery and calendar backend 2012-11-21 07:36:59 +08:00
Matthew K. Fu JuYuan 96fe482d50 for openness 2012-11-20 20:20:59 +08:00
Matthew K. Fu JuYuan c6894be962 first version of confined sidebar render 2012-11-20 15:56:52 +08:00
chris df58d4c5f3 Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format
Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb
2012-11-20 12:14:53 +08:00
Rueshyna 47075944e7 make gallery json format to two layer 2012-11-20 12:13:18 +08:00
Rueshyna 81f67fc08a make announcement json format to two layer 2012-11-20 12:11:35 +08:00
Rueshyna bfef1a8e7c tmp 2012-11-20 12:11:35 +08:00
Rueshyna bd7518093f about route url link bug 2012-11-20 12:11:35 +08:00
Rueshyna 310d7523bd modified gallery json format but it have some bugs... 2012-11-20 12:11:35 +08:00
Rueshyna 36b4cb1ec1 modified announcement json format but it have some bugs... 2012-11-20 12:09:58 +08:00
chris 747b0d4620 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb
2012-11-20 10:11:59 +08:00
chris 1a76d5d3cb Merge branch 'new' of github.com:Rulingcom/orbit into new 2012-11-20 10:10:16 +08:00
chris 609c932cca Fix some gallery routes 2012-11-20 10:05:56 +08:00
Harry Bomrah 04469ff845 Minor update for gallery frontend 2012-11-19 18:18:46 +08:00
chris fb74d74c72 Fix:
- page_part not including items_helper
  - categories for bulletins front-end
2012-11-15 18:01:49 +08:00
chris 112f7000a0 Fix announcement front-end bug 2012-11-15 17:23:24 +08:00
chris 9b1ada0af9 Fix these bugs:
1.結構部份
    a.原選單,點選編輯,無動作反應
    b.新增選單後,左邊灰色架構部份不會更新

  2.檔案室
    a.無法編輯分類
2012-11-15 15:51:44 +08:00
Rueshyna 4a7b5a1bf6 make gallery json format to two layer 2012-11-15 12:11:58 +08:00
Rueshyna 97c2366221 make announcement json format to two layer 2012-11-15 11:49:00 +08:00
Rueshyna ba4bc67e0e tmp 2012-11-15 11:06:33 +08:00
Harry Bomrah 46f80ade6a Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit
Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb
2012-11-14 16:25:02 +08:00
Rueshyna 4b3911e866 about route url link bug 2012-11-14 16:20:32 +08:00
Harry Bomrah d7d1b9e31b widget update 2012-11-14 15:28:55 +08:00
Rueshyna 96622b168f modified gallery json format but it have some bugs... 2012-11-14 12:01:42 +08:00
Rueshyna ad429af58c modified announcement json format but it have some bugs... 2012-11-14 12:01:18 +08:00
chris 9095713769 Fix bugs in Json when missing files 2012-11-13 15:21:59 +08:00
devin e5d31f50a0 calendar "edit calendar" update 2012-11-12 15:11:36 +08:00
Rueshyna 295aef32ab change host with host_with_port 2012-11-09 16:31:36 +08:00
Rueshyna 275c6f4c8a get_album_json function can get readable json 2012-11-09 16:25:11 +08:00
Rueshyna e4de229b22 make json readable 2012-11-09 16:24:37 +08:00
Rueshyna 624d12de6d make json readable 2012-11-09 16:24:23 +08:00
Rueshyna 80abfc80bf fixed get_bulletins_json of gprs bug 2012-11-09 10:41:49 +08:00
Harry Bomrah b1d808cb86 Merge branch 'gallery_orbit' into desktop_devin 2012-11-08 17:05:49 +08:00
Rueshyna 7595e20d0c fixed language of announcement filter 2012-11-08 16:01:08 +08:00
Rueshyna 800279ea69 add get_bulletins_json function 2012-11-08 15:56:14 +08:00
Rueshyna e6a9555dd8 refine the location module done 2012-11-08 12:34:26 +08:00
Rueshyna dbfc70e520 Refine the location module, but it have some bugs about path ... 2012-11-08 01:26:33 +08:00
Rueshyna 11fefa100f all of user can get json of gprs from outside 2012-11-08 01:24:37 +08:00
Rueshyna b4f5a0b04b all of user can get json of gallery from outside 2012-11-08 01:24:01 +08:00
unknown 97d2380406 Merge branch 'new' of https://github.com/Rulingcom/orbit into new 2012-11-06 14:28:03 +08:00
unknown b9c8d9d657 plugin edit 2012-11-06 14:26:37 +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
chris 3c85f3ef00 Make the archive module work (it needs more details) 2012-11-06 10:35:11 +08:00
Rueshyna c314745545 add link of title 2012-11-05 11:42:50 +08:00
Rueshyna e4de1e34a2 add announcement plugin 2012-11-05 11:42:50 +08:00
Rueshyna 9433d59c04 relpace tab with sapce 2012-11-05 11:42:49 +08:00
Rueshyna ed3644fb89 done journal 2012-11-05 11:42:49 +08:00
chris a5e2c3e0ce Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
Conflicts:
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
2012-11-05 11:41:48 +08:00
Harry Bomrah 2e809c5c19 Calander view updated... 2012-11-05 11:40:11 +08:00
devin 228d43d0e2 calendar update 2012-11-05 11:40:11 +08:00
Harry Bomrah 6dd9f441ef Agenda View 2012-11-05 11:40:11 +08:00
devin d070c70512 calendar agenda view update 2012-11-05 11:40:11 +08:00
Harry Bomrah 513671e498 lot of updates 2012-11-05 11:34:35 +08:00
chris fe0e49c3e9 Remove a folder in wich Chinese characters 2012-11-04 20:32:54 +08:00
unknown bd17641d18 member plugin list add new 2012-11-04 20:24:36 +08:00
unknown 2f61b3e0c9 member plugin list add new 2012-11-02 18:28:23 +08:00
devin 9bf812b8d9 calendar "edit calendar" update 2012-11-01 15:21:42 +08:00
Harry Bomrah d904163090 Merge branch 'gallery_orbit' into desktop_devin 2012-11-01 10:47:23 +08:00
Harry Bomrah a25199d33b Calander view updated... 2012-11-01 10:45:22 +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
devin 167c993108 calendar update 2012-10-30 17:26:52 +08:00
chris 63a57682e6 Fix bugs:
TinyMCE: the size of the textarea change depending on the language
	Page content edit: no tab selected on first load
2012-10-30 17:09:00 +08:00
chris cc5e238576 Fix after merge from NCCU, the translations still need to be cleaned 2012-10-30 11:08:26 +08:00
Harry Bomrah 5da35ee65b Agenda View 2012-10-29 19:52:34 +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
Harry Bomrah b73981b19a Devin commit 2012-10-29 10:17:49 +08:00
devin 12b7618cc7 calendar agenda view update 2012-10-27 00:11:26 +08:00
Harry Bomrah 5e25cf5849 lot of updates 2012-10-26 19:04:51 +08:00
chris 579c7b5e81 Add missing helper 2012-10-26 11:19:56 +08:00
chris cbfa659928 Changes for side_bar 2012-10-26 11:19:56 +08:00
Harry Bomrah a5722af315 Calendar updates for day view 2012-10-26 11:15:37 +08:00
devin 8c6e5deb64 gallery update
please don't forget to add translation in other language
2012-10-26 11:15:37 +08:00
Harry Bomrah 79e0b8e383 week view updates 2012-10-26 11:15:37 +08:00
devin 98ef582e17 shit calendar update 2012-10-26 11:15:37 +08:00
Harry Bomrah c29955d9e3 external commit 2012-10-26 11:15:37 +08:00
Harry Bomrah d7e8663c1d calendar updated for week 2012-10-26 11:15:36 +08:00
chris 6b8255f8f8 Remove a folder in wich Chinese characters 2012-10-26 11:14:13 +08:00
Harry Bomrah 974849b85a Merge branch 'gallery_orbit' into desktop_devin 2012-10-24 19:11:12 +08:00
Harry Bomrah f4eb95881f Calendar updates for day view 2012-10-24 18:55:06 +08:00
devin 8c63be5c33 gallery update
please don't forget to add translation in other language
2012-10-24 09:47:09 +08:00
Harry Bomrah a810312da4 week view updates 2012-10-18 22:21:13 +08:00
chris 976114cfa9 Add missing helper 2012-10-18 18:50:46 +08:00
devin 47df69f8cf shit calendar update 2012-10-17 17:35:30 +08:00
Harry Bomrah 6113b9c46c external commit 2012-10-16 21:52:10 +08:00
Harry Bomrah 0971e00511 calendar updated for week 2012-10-16 21:51:06 +08:00
chris 0babd5f302 Changes for side_bar 2012-10-15 15:30:48 +08:00
OrbitServer 9e2bc7e1c1 Ray's changes in css and js 2012-10-09 07:48:05 +08:00
Harry Bomrah f76253f512 Week View changes 2012-10-09 06:42:00 +08:00
Harry Bomrah bb626470e7 week view updates 2012-10-09 06:42:00 +08:00
Harry Bomrah 022d28e5e7 change in algo of event generation plus now multi week events enabled 2012-10-09 06:42:00 +08:00
Harry Bomrah d2fea92969 GPRS and CALENDAR 2012-10-09 06:42:00 +08:00
unknown a4c94c4404 demo site plugin 2012-10-08 16:20:21 +08:00
Matthew K. Fu JuYuan 0663e43be7 fix for web_resource tool bar 2012-10-08 16:02:33 +08:00
Matthew K. Fu JuYuan ae48ab5cbd clean commit 2012-10-04 15:53:42 +08:00
Matthew K. Fu JuYuan b0cdcbecca fix preview bug only happen when production 2012-10-01 21:05:16 +08:00
Matt b65d785834 harry's fix, announcement still broken 2012-10-01 17:21:23 +08:00
Matthew K. Fu JuYuan edcef5a8f7 make manager's news and announcement can be shown at once it be submitted. 2012-10-01 16:11:58 +08:00
Fu Matthew dc8ca7e575 fix i18n.file upload failed 2012-09-27 13:34:40 +08:00
Matthew K. Fu JuYuan 7a523281c3 fix announcement 2012-09-25 09:52:13 +08:00
Matthew K. Fu JuYuan 5634e87144 fix announcement block 2012-09-24 18:43:43 +08:00
Matthew K. Fu JuYuan 78a01f5d29 fix for 0924 2012-09-24 18:30:19 +08:00
Matt 5f63af4e77 fix for search news,needs to applied to announcement,also need to fix some translation 2012-09-24 18:10:48 +08:00
Matthew K. Fu JuYuan 029c84328d code that can not run on matt's air 2012-09-24 15:37:28 +08:00