Commit Graph

1975 Commits

Author SHA1 Message Date
Rueshyna b4f5a0b04b all of user can get json of gallery from outside 2012-11-08 01:24:01 +08:00
chris 43d969a72b Fix attribute_field_helper and comment admin in I18n 2012-11-06 17:51:42 +08:00
chris 12f5d93e1a Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-11-06 12:35:34 +08:00
Harry Bomrah eaf465525a rake update 2012-11-06 12:35:15 +08:00
chris 23e86bfe31 Fix bug due to change of structure for stylesheet 2012-11-06 12:33:00 +08:00
Harry Bomrah 16e5473418 rake update 2012-11-06 12:21:09 +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 159e41639d Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit 2012-11-06 10:36:52 +08:00
Harry Bomrah da5e7f670e Desktop Widgtes updates.. 2012-11-06 10:36:34 +08:00
chris 3c85f3ef00 Make the archive module work (it needs more details) 2012-11-06 10:35:11 +08:00
Harry Bomrah f68fe22cba Desktop Widgtes updates.. 2012-11-05 23:04:54 +08:00
chris 73fd9d1f97 Merge branch 'modified_show_plugin_profile' of github.com:Rulingcom/orbit into modified_show_plugin_profile 2012-11-05 11:43:00 +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 ca3e06c58b update for desktop widgets 2012-11-05 11:40:11 +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 58d4554b0b Fixing bugs 2012-11-05 11:30:15 +08:00
Rueshyna 9f3c3f0d7e add link of title 2012-11-05 10:37:04 +08:00
Rueshyna 3d5274a6f9 add announcement plugin 2012-11-04 22:05:03 +08:00
Rueshyna 0e1f3d81d1 relpace tab with sapce 2012-11-04 22:04:13 +08:00
chris 6783844937 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 2012-11-04 20:43:23 +08:00
Matthew K. Fu JuYuan beb843f75b add new member with role interface. add more not usable.
role management new attribute is ok. delete is ok.
2012-11-04 20:42:58 +08:00
chris fe0e49c3e9 Remove a folder in wich Chinese characters 2012-11-04 20:32:54 +08:00
chris be08682c6b Merge branch 'new' of github.com:Rulingcom/orbit into new 2012-11-04 20:25:05 +08:00
unknown bd17641d18 member plugin list add new 2012-11-04 20:24:36 +08:00
Matthew K. Fu JuYuan e47465d4b7 add new member with role interface. add more not usable.
role management new attribute is ok. delete is ok.
2012-11-04 05:56:29 +08:00
unknown 2f61b3e0c9 member plugin list add new 2012-11-02 18:28:23 +08:00
Rueshyna f61a81ab56 done journal 2012-11-02 16:31:41 +08:00
Harry Bomrah 28337c6b5b update for desktop widgets 2012-11-01 20:42:40 +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 bc9082a858 Fix bug: Fix the bug due to not finding the ModuleApp 2012-10-30 17:10:59 +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
Matthew K. Fu JuYuan 664c6d2f61 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/images/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/javascripts/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/assets/stylesheets/personal_patent/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/application_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/tags_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patent_categorys_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.00.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/back_end/writing_patents_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/controllers/panel/personal_patent/plugin/writing_patents_controller.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/helpers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/mailers/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/personal_patent_tag.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_category.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/models/writing_patent_file.rb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/.gitkeep
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/_writing_patent_category.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/create.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/edit.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/new.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patent_categorys/update.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_filter.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/back_end/writing_patents/_form_file.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_list_writing_patent_category.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_sort_headers.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_writing_patent_category_qe.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/create_writing_patent_setting.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/edit.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/index.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/new.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/show.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/toggle_enable.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/update_writing_patent_setting.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_add.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_category_quick_edit.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/writing_patent_setting.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_filter.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form_file.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_sort_headers.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_writing_patent.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/destroy.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/edit.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/index.js.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/new.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/show.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/toggle_enable.js.erb
2012-10-30 10:11:51 +08:00
Matthew K. Fu JuYuan ff9b9af7df Remove useless files,add test files and Guardfile 2012-10-30 10:00:27 +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