be448d42c9 
								
							 
						 
						
							
							
								
								add_more ok  
							
							
							
						 
						
							2012-11-20 09:52:50 +08:00  
				
					
						
							
							
								 
						
							
								398432d0fc 
								
							 
						 
						
							
							
								
								some bugs  
							
							
							
						 
						
							2012-11-19 16:28:05 +08:00  
				
					
						
							
							
								 
						
							
								db3797694b 
								
							 
						 
						
							
							
								
								change journal list json link  
							
							
							
						 
						
							2012-11-19 12:13:05 +08:00  
				
					
						
							
							
								 
						
							
								8abb20b4c8 
								
							 
						 
						
							
							
								
								add edit function  
							
							
							
						 
						
							2012-11-19 12:07:24 +08:00  
				
					
						
							
							
								 
						
							
								9501bf2df3 
								
							 
						 
						
							
							
								
								midify checkbox value  
							
							
							
						 
						
							2012-11-18 14:15:00 +08:00  
				
					
						
							
							
								 
						
							
								26436395f5 
								
							 
						 
						
							
							
								
								finished some method of list and journal  
							
							
							
						 
						
							2012-11-18 03:07:50 +08:00  
				
					
						
							
							
								 
						
							
								024b331cf3 
								
							 
						 
						
							
							
								
								split form from add.html.erb  
							
							
							
						 
						
							2012-11-16 16:02:17 +08:00  
				
					
						
							
							
								 
						
							
								e60480a4be 
								
							 
						 
						
							
							
								
								add.html convert to add.html.erb done  
							
							
							
						 
						
							2012-11-16 15:33:31 +08:00  
				
					
						
							
							
								 
						
							
								b51397d2e2 
								
							 
						 
						
							
							
								
								convert html template to html.erb  
							
							
							
						 
						
							2012-11-16 12:54:21 +08:00  
				
					
						
							
							
								 
						
							
								c85b15e425 
								
							 
						 
						
							
							
								
								rm binding.pre ...  
							
							
							
						 
						
							2012-11-16 09:44:57 +08:00  
				
					
						
							
							
								 
						
							
								34f0eea1ff 
								
							 
						 
						
							
							
								
								add more fake data  
							
							
							
						 
						
							2012-11-16 09:13:51 +08:00  
				
					
						
							
							
								 
						
							
								b998b8f346 
								
							 
						 
						
							
							
								
								make it real  
							
							
							
						 
						
							2012-11-16 01:54:10 +08:00  
				
					
						
							
							
								 
						
							
								bf5a48ef4c 
								
							 
						 
						
							
							
								
								add new function  
							
							
							
						 
						
							2012-11-16 01:53:45 +08:00  
				
					
						
							
							
								 
						
							
								3144b84d10 
								
							 
						 
						
							
							
								
								check file type  
							
							
							
						 
						
							2012-11-15 22:39:01 +08:00  
				
					
						
							
							
								 
						
							
								69bf552fa7 
								
							 
						 
						
							
							
								
								Fix: remove i18n_variable from reload_frontend_pages.js.erb  
							
							
							
						 
						
							2012-11-15 18:11:01 +08:00  
				
					
						
							
							
								 
						
							
								fb74d74c72 
								
							 
						 
						
							
							
								
								Fix:  
							
							... 
							
							
							
							- page_part not including items_helper
  - categories for bulletins front-end 
							
						 
						
							2012-11-15 18:01:49 +08:00  
				
					
						
							
							
								 
						
							
								9b1ada0af9 
								
							 
						 
						
							
							
								
								Fix these bugs:  
							
							... 
							
							
							
							1.結構部份
    a.原選單,點選編輯,無動作反應
    b.新增選單後,左邊灰色架構部份不會更新
  2.檔案室
    a.無法編輯分類 
							
						 
						
							2012-11-15 15:51:44 +08:00  
				
					
						
							
							
								 
						
							
								c627376fbe 
								
							 
						 
						
							
							
								
								modified file of view bug  
							
							
							
						 
						
							2012-11-15 11:18:55 +08:00  
				
					
						
							
							
								 
						
							
								351767cd98 
								
							 
						 
						
							
							
								
								file view update  
							
							
							
						 
						
							2012-11-14 21:12:10 +08:00  
				
					
						
							
							
								 
						
							
								529e2110d7 
								
							 
						 
						
							
							
								
								modified getjournals format  
							
							
							
						 
						
							2012-11-14 17:27:36 +08:00  
				
					
						
							
							
								 
						
							
								11b602a1bf 
								
							 
						 
						
							
							
								
								delete demo db of journal and paper  
							
							
							
						 
						
							2012-11-13 17:22:25 +08:00  
				
					
						
							
							
								 
						
							
								bfdd155c1e 
								
							 
						 
						
							
							
								
								make a json format for view of journal_p  
							
							
							
						 
						
							2012-11-13 17:21:23 +08:00  
				
					
						
							
							
								 
						
							
								e498be9753 
								
							 
						 
						
							
							
								
								desktopAPI update.  
							
							
							
						 
						
							2012-11-12 15:11:36 +08:00  
				
					
						
							
							
								 
						
							
								a56d80698f 
								
							 
						 
						
							
							
								
								desktop api update..  
							
							
							
						 
						
							2012-11-12 15:11:36 +08:00  
				
					
						
							
							
								 
						
							
								43d969a72b 
								
							 
						 
						
							
							
								
								Fix attribute_field_helper and comment admin in I18n  
							
							
							
						 
						
							2012-11-06 17:51:42 +08:00  
				
					
						
							
							
								 
						
							
								23e86bfe31 
								
							 
						 
						
							
							
								
								Fix bug due to change of structure for stylesheet  
							
							
							
						 
						
							2012-11-06 12:33:00 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								da5e7f670e 
								
							 
						 
						
							
							
								
								Desktop Widgtes updates..  
							
							
							
						 
						
							2012-11-06 10:36:34 +08:00  
				
					
						
							
							
								 
						
							
								ca3e06c58b 
								
							 
						 
						
							
							
								
								update for desktop widgets  
							
							
							
						 
						
							2012-11-05 11:40:11 +08:00  
				
					
						
							
							
								 
						
							
								2e809c5c19 
								
							 
						 
						
							
							
								
								Calander view updated...  
							
							
							
						 
						
							2012-11-05 11:40:11 +08:00  
				
					
						
							
							
								 
						
							
								58d4554b0b 
								
							 
						 
						
							
							
								
								Fixing bugs  
							
							
							
						 
						
							2012-11-05 11:30:15 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								bc9082a858 
								
							 
						 
						
							
							
								
								Fix bug: Fix the bug due to not finding the ModuleApp  
							
							
							
						 
						
							2012-10-30 17:10:59 +08:00  
				
					
						
							
							
								 
						
							
								cc5e238576 
								
							 
						 
						
							
							
								
								Fix after merge from NCCU, the translations still need to be cleaned  
							
							
							
						 
						
							2012-10-30 11:08:26 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								9b5f4e4775 
								
							 
						 
						
							
							
								
								Fix bug: User cannot connect using the orbit button (Devise configuration)  
							
							
							
						 
						
							2012-10-26 17:42:14 +08:00  
				
					
						
							
							
								 
						
							
								bd0d975014 
								
							 
						 
						
							
							
								
								for user new interface, member  role is working.  
							
							
							
						 
						
							2012-10-26 11:27:37 +08:00  
				
					
						
							
							
								 
						
							
								b301f6522a 
								
							 
						 
						
							
							
								
								Merge branch 'design_update' of github.com:Rulingcom/orbit into design_update  
							
							
							
						 
						
							2012-10-26 11:20:26 +08:00  
				
					
						
							
							
								 
						
							
								d7fd61ce55 
								
							 
						 
						
							
							
								
								Edit uploaded package  
							
							
							
						 
						
							2012-10-26 11:19:57 +08:00  
				
					
						
							
							
								 
						
							
								0a1a9d2c2e 
								
							 
						 
						
							
							
								
								member for THU  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								68bc4c1874 
								
							 
						 
						
							
							
								
								Fix page_part creation when design is changed  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								cbfa659928 
								
							 
						 
						
							
							
								
								Changes for side_bar  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								f4f07c7206 
								
							 
						 
						
							
							
								
								fix sub role attribute fields  
							
							... 
							
							
							
							run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code. 
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								9c16da4f46 
								
							 
						 
						
							
							
								
								fixed html for add link. form html  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								03b608593d 
								
							 
						 
						
							
							
								
								can add member  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								0a56c555bb 
								
							 
						 
						
							
							
								
								new code for attribute fields and values for new member interface  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								8b9cffd4f2 
								
							 
						 
						
							
							
								
								new code for attribute fields and values for new member interface  
							
							
							
						 
						
							2012-10-26 11:19:55 +08:00  
				
					
						
							
							
								 
						
							
								a5722af315 
								
							 
						 
						
							
							
								
								Calendar updates for day view  
							
							
							
						 
						
							2012-10-26 11:15:37 +08:00  
				
					
						
							
							
								 
						
							
								2b2dd53218 
								
							 
						 
						
							
							
								
								Edit uploaded package  
							
							
							
						 
						
							2012-10-24 18:40:38 +08:00  
				
					
						
							
							
								 
						
							
								1b876d4305 
								
							 
						 
						
							
							
								
								for user new interface, member  role is working.  
							
							
							
						 
						
							2012-10-24 14:46:25 +08:00  
				
					
						
							
							
								 
						
							
								d1797ac8e3 
								
							 
						 
						
							
							
								
								Fix page_part creation when design is changed  
							
							
							
						 
						
							2012-10-18 18:50:46 +08:00  
				
					
						
							
							
								 
						
							
								13ae2602cd 
								
							 
						 
						
							
							
								
								member for THU  
							
							
							
						 
						
							2012-10-18 18:36:21 +08:00  
				
					
						
							
							
								 
						
							
								a50ccdafb2 
								
							 
						 
						
							
							
								
								consolidate_object_auth for 171 production  
							
							
							
						 
						
							2012-10-16 15:08:02 +08:00  
				
					
						
							
							
								 
						
							
								b3a9a7ab07 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-10-16 14:24:01 +08:00  
				
					
						
							
							
								 
						
							
								6dfe10040b 
								
							 
						 
						
							
							
								
								fix object auth without app_auth  
							
							
							
						 
						
							2012-10-16 14:23:44 +08:00  
				
					
						
							
							
								 
						
							
								afff128e9c 
								
							 
						 
						
							
							
								
								Fix page_part creation when design is changed  
							
							
							
						 
						
							2012-10-16 14:15:33 +08:00  
				
					
						
							
							
								 
						
							
								f7f0b48707 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							... 
							
							
							
							Conflicts:
	config/initializers/resque.rb 
							
						 
						
							2012-10-16 14:14:56 +08:00  
				
					
						
							
							
								 
						
							
								0babd5f302 
								
							 
						 
						
							
							
								
								Changes for side_bar  
							
							
							
						 
						
							2012-10-15 15:30:48 +08:00  
				
					
						
							
							
								 
						
							
								fe183c316f 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							
							
						 
						
							2012-10-15 14:46:13 +08:00  
				
					
						
							
							
								 
						
							
								84929f9b4c 
								
							 
						 
						
							
							
								
								fix sub role attribute fields  
							
							... 
							
							
							
							run: Role.any_in(:key=>['department_admin','administrator']).destroy_all
for deleting old role data to complete this code. 
							
						 
						
							2012-10-15 14:44:48 +08:00  
				
					
						
							
							
								 
						
							
								5913f73850 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							
							
						 
						
							2012-10-15 14:09:58 +08:00  
				
					
						
							
							
								 
						
							
								31b583228d 
								
							 
						 
						
							
							
								
								fixed html for add link. form html  
							
							
							
						 
						
							2012-10-15 14:07:53 +08:00  
				
					
						
							
							
								 
						
							
								334e5b464c 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							
							
						 
						
							2012-10-15 13:56:16 +08:00  
				
					
						
							
							
								 
						
							
								7901de7b31 
								
							 
						 
						
							
							
								
								can add member  
							
							
							
						 
						
							2012-10-15 13:54:29 +08:00  
				
					
						
							
							
								 
						
							
								c511600cad 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							
							
						 
						
							2012-10-15 12:35:27 +08:00  
				
					
						
							
							
								 
						
							
								9027562450 
								
							 
						 
						
							
							
								
								new code for attribute fields and values for new member interface  
							
							
							
						 
						
							2012-10-15 12:35:07 +08:00  
				
					
						
							
							
								 
						
							
								b5571dbc43 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							... 
							
							
							
							Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb 
							
						 
						
							2012-10-12 18:17:05 +08:00  
				
					
						
							
							
								 
						
							
								1ce7f00084 
								
							 
						 
						
							
							
								
								new code for attribute fields and values for new member interface  
							
							
							
						 
						
							2012-10-12 18:09:02 +08:00  
				
					
						
							
							
								 
						
							
								189fa553c5 
								
							 
						 
						
							
							
								
								Changes for helpers, not including all by default  
							
							
							
						 
						
							2012-10-09 14:47:16 +08:00  
				
					
						
							
							
								 
						
							
								9e2bc7e1c1 
								
							 
						 
						
							
							
								
								Ray's changes in css and js  
							
							
							
						 
						
							2012-10-09 07:48:05 +08:00  
				
					
						
							
							
								 
						
							
								d2fea92969 
								
							 
						 
						
							
							
								
								GPRS and CALENDAR  
							
							
							
						 
						
							2012-10-09 06:42:00 +08:00  
				
					
						
							
							
								 
						
							
								9f825de288 
								
							 
						 
						
							
							
								
								user new interface 70%  
							
							
							
						 
						
							2012-10-09 06:40:18 +08:00  
				
					
						
							
							
								 
						
							
								1aacf5e2ce 
								
							 
						 
						
							
							
								
								user status method.   Now the sub_role shall be sat with it's status in order to record sub_role status into user object.  
							
							... 
							
							
							
							Sub_role can be removed normally and the method check_status_record  will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists. 
							
						 
						
							2012-10-09 06:40:18 +08:00  
				
					
						
							
							
								 
						
							
								e16a27601d 
								
							 
						 
						
							
							
								
								user new interface 70%  
							
							
							
						 
						
							2012-10-08 16:58:33 +08:00  
				
					
						
							
							
								 
						
							
								67bd68d492 
								
							 
						 
						
							
							
								
								harry's js fix  
							
							
							
						 
						
							2012-10-08 10:11:45 +08:00  
				
					
						
							
							
								 
						
							
								e67ca84282 
								
							 
						 
						
							
							
								
								object_auth change to reload  
							
							
							
						 
						
							2012-10-04 18:20:21 +08:00  
				
					
						
							
							
								 
						
							
								962bae9a82 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2012-10-01 21:09:09 +08:00  
				
					
						
							
							
								 
						
							
								7919750d4f 
								
							 
						 
						
							
							
								
								171 doesn't have bug with javascript remove log script  
							
							
							
						 
						
							2012-10-01 19:05:23 +08:00  
				
					
						
							
							
								 
						
							
								3dc4dc2316 
								
							 
						 
						
							
							
								
								debug commit  
							
							
							
						 
						
							2012-10-01 17:56:55 +08:00  
				
					
						
							
							
								 
						
							
								506fa179a1 
								
							 
						 
						
							
							
								
								fix announcement  
							
							
							
						 
						
							2012-10-01 17:48:51 +08:00  
				
					
						
							
							
								 
						
							
								b65d785834 
								
							 
						 
						
							
							
								
								harry's fix, announcement still broken  
							
							
							
						 
						
							2012-10-01 17:21:23 +08:00  
				
					
						
							
							
								 
						
							
								5ac04ea07d 
								
							 
						 
						
							
							
								
								devin's css for tinymce  
							
							
							
						 
						
							2012-09-28 09:58:28 +08:00  
				
					
						
							
							
								 
						
							
								aa5d0bb1ad 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							... 
							
							
							
							Conflicts:
	config/locales/zh_tw.yml 
							
						 
						
							2012-09-28 09:49:22 +08:00  
				
					
						
							
							
								 
						
							
								cfc80340b8 
								
							 
						 
						
							
							
								
								add setting for tinymce config  
							
							
							
						 
						
							2012-09-28 09:45:50 +08:00  
				
					
						
							
							
								 
						
							
								9a4c8137fe 
								
							 
						 
						
							
							
								
								Fix for images  
							
							
							
						 
						
							2012-09-27 15:33:37 +08:00  
				
					
						
							
							
								 
						
							
								dc8ca7e575 
								
							 
						 
						
							
							
								
								fix i18n.file upload failed  
							
							
							
						 
						
							2012-09-27 13:34:40 +08:00  
				
					
						
							
							
								 
						
							
								87904f8b8d 
								
							 
						 
						
							
							
								
								fix i18n  
							
							
							
						 
						
							2012-09-27 11:03:08 +08:00  
				
					
						
							
							
								 
						
							
								54b874b2c9 
								
							 
						 
						
							
							
								
								fix nccu login  
							
							
							
						 
						
							2012-09-25 15:07:07 +08:00  
				
					
						
							
							
								 
						
							
								fb3364b28e 
								
							 
						 
						
							
							
								
								Merge commit '975523c8b2d886805a3622e3ef23b2f398722d45' into app_config  
							
							
							
						 
						
							2012-09-24 14:14:13 +08:00  
				
					
						
							
							
								 
						
							
								975523c8b2 
								
							 
						 
						
							
							
								
								demo site plugin  
							
							
							
						 
						
							2012-09-24 14:10:44 +08:00  
				
					
						
							
							
								 
						
							
								3a65f599e6 
								
							 
						 
						
							
							
								
								first version app config for Spen  durning Chris's leave.  
							
							
							
						 
						
							2012-09-24 11:43:48 +08:00  
				
					
						
							
							
								 
						
							
								c846a102ff 
								
							 
						 
						
							
							
								
								Page by page changes for i18n yml  
							
							
							
						 
						
							2012-09-24 09:06:44 +08:00  
				
					
						
							
							
								 
						
							
								4fb35b00f2 
								
							 
						 
						
							
							
								
								Add missing translations  
							
							
							
						 
						
							2012-09-24 09:02:46 +08:00  
				
					
						
							
							
								 
						
							
								2ca7e1b548 
								
							 
						 
						
							
							
								
								Fix typos after i18n yml  
							
							
							
						 
						
							2012-09-24 09:02:45 +08:00  
				
					
						
							
							
								 
						
							
								bdd5a1a047 
								
							 
						 
						
							
							
								
								Changes for i18n yml  
							
							
							
						 
						
							2012-09-24 09:02:45 +08:00  
				
					
						
							
							
								 
						
							
								b6c06c6d4f 
								
							 
						 
						
							
							
								
								tiny mce fix  
							
							
							
						 
						
							2012-09-19 17:59:17 +08:00  
				
					
						
							
							
								 
						
							
								12db3118b4 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-09-19 15:09:56 +08:00  
				
					
						
							
							
								 
						
							
								8b68387199 
								
							 
						 
						
							
							
								
								fix share loading failed  
							
							
							
						 
						
							2012-09-19 15:09:08 +08:00  
				
					
						
							
							
								 
						
							
								79006201cd 
								
							 
						 
						
							
							
								
								ad_image date picker fixed  
							
							
							
						 
						
							2012-09-19 12:23:05 +08:00  
				
					
						
							
							
								 
						
							
								6fd2dac4d5 
								
							 
						 
						
							
							
								
								fix ad_banner data picker not working when on 180  
							
							
							
						 
						
							2012-09-19 12:15:03 +08:00  
				
					
						
							
							
								 
						
							
								d480a10661 
								
							 
						 
						
							
							
								
								fix for object_auth update  
							
							
							
						 
						
							2012-09-19 11:12:22 +08:00  
				
					
						
							
							
								 
						
							
								959b6aee12 
								
							 
						 
						
							
							
								
								fix for listing object error  
							
							
							
						 
						
							2012-09-19 10:45:03 +08:00  
				
					
						
							
							
								 
						
							
								1240064e23 
								
							 
						 
						
							
							
								
								add url generate  
							
							
							
						 
						
							2012-09-18 17:37:52 +08:00  
				
					
						
							
							
								 
						
							
								5de433d219 
								
							 
						 
						
							
							
								
								user status method.   Now the sub_role shall be sat with it's status in order to record sub_role status into user object.  
							
							... 
							
							
							
							Sub_role can be removed normally and the method check_status_record  will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists. 
							
						 
						
							2012-09-18 16:22:56 +08:00  
				
					
						
							
							
								 
						
							
								0907324a2f 
								
							 
						 
						
							
							
								
								add member link to orbit menu  
							
							
							
						 
						
							2012-09-17 14:18:27 +08:00  
				
					
						
							
							
								 
						
							
								228fa0fca3 
								
							 
						 
						
							
							
								
								Remove setting from side bar  
							
							
							
						 
						
							2012-09-17 13:40:14 +08:00  
				
					
						
							
							
								 
						
							
								19db9d0037 
								
							 
						 
						
							
							
								
								basic function  
							
							
							
						 
						
							2012-09-17 13:32:52 +08:00  
				
					
						
							
							
								 
						
							
								9eed9ec7b6 
								
							 
						 
						
							
							
								
								demo site plugin  
							
							
							
						 
						
							2012-09-17 13:32:52 +08:00  
				
					
						
							
							
								 
						
							
								b09b1cf2f5 
								
							 
						 
						
							
							
								
								commit for calendar  
							
							
							
						 
						
							2012-09-14 21:59:20 +08:00  
				
					
						
							
							
								 
						
							
								af19f11668 
								
							 
						 
						
							
							
								
								calendar update  
							
							... 
							
							
							
							- delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality) 
							
						 
						
							2012-09-14 15:57:44 +08:00  
				
					
						
							
							
								 
						
							
								0e507d549d 
								
							 
						 
						
							
							
								
								some more changes  
							
							
							
						 
						
							2012-09-14 15:32:15 +08:00  
				
					
						
							
							
								 
						
							
								3d9fb548e1 
								
							 
						 
						
							
							
								
								calendar fixed  
							
							
							
						 
						
							2012-09-14 15:20:01 +08:00  
				
					
						
							
							
								 
						
							
								ee51240102 
								
							 
						 
						
							
							
								
								Ray's changes for new backend  
							
							
							
						 
						
							2012-09-14 02:38:56 +08:00  
				
					
						
							
							
								 
						
							
								194773f064 
								
							 
						 
						
							
							
								
								Fix bugs after merge  
							
							
							
						 
						
							2012-09-14 02:27:49 +08:00  
				
					
						
							
							
								 
						
							
								42d50ae534 
								
							 
						 
						
							
							
								
								Plugins  
							
							
							
						 
						
							2012-09-14 00:05:31 +08:00  
				
					
						
							
							
								 
						
							
								03b5827392 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							... 
							
							
							
							Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_side_bar.html.erb 
							
						 
						
							2012-09-14 00:03:52 +08:00  
				
					
						
							
							
								 
						
							
								5fb94f644d 
								
							 
						 
						
							
							
								
								break down Ray's HTML  
							
							
							
						 
						
							2012-09-14 00:02:22 +08:00  
				
					
						
							
							
								 
						
							
								3e5978c8fd 
								
							 
						 
						
							
							
								
								users new interface controller  
							
							
							
						 
						
							2012-09-14 00:02:21 +08:00  
				
					
						
							
							
								 
						
							
								4818e3f444 
								
							 
						 
						
							
							
								
								first version for new member html  
							
							
							
						 
						
							2012-09-14 00:02:21 +08:00  
				
					
						
							
							
								 
						
							
								29ea95b4c6 
								
							 
						 
						
							
							
								
								event_calendar testing  
							
							
							
						 
						
							2012-09-13 23:57:47 +08:00  
				
					
						
							
							
								 
						
							
								9bfd1d2b0c 
								
							 
						 
						
							
							
								
								break down Ray's HTML  
							
							
							
						 
						
							2012-09-13 18:39:27 +08:00  
				
					
						
							
							
								 
						
							
								2e9af5d1a8 
								
							 
						 
						
							
							
								
								fix commit bugs  
							
							
							
						 
						
							2012-09-13 15:53:36 +08:00  
				
					
						
							
							
								 
						
							
								f88176ee1f 
								
							 
						 
						
							
							
								
								Merge branch 'gallery_orbit' of  https://github.com/Rulingcom/orbit  into gallery_orbit  
							
							
							
						 
						
							2012-09-12 16:48:33 +08:00  
				
					
						
							
							
								 
						
							
								3432d1359b 
								
							 
						 
						
							
							
								
								Fix bug in show_from_link  
							
							
							
						 
						
							2012-09-12 16:46:03 +08:00  
				
					
						
							
							
								 
						
							
								17195a9a23 
								
							 
						 
						
							
							
								
								fix for admin has no orbit menu  
							
							
							
						 
						
							2012-09-12 16:20:15 +08:00  
				
					
						
							
							
								 
						
							
								98e8f5f607 
								
							 
						 
						
							
							
								
								complete visitor dashbroad  
							
							
							
						 
						
							2012-09-12 16:20:15 +08:00  
				
					
						
							
							
								 
						
							
								803f83b239 
								
							 
						 
						
							
							
								
								fix for no login window for backend  
							
							
							
						 
						
							2012-09-12 16:20:15 +08:00  
				
					
						
							
							
								 
						
							
								45ef7fd302 
								
							 
						 
						
							
							
								
								guest user  
							
							
							
						 
						
							2012-09-12 16:20:15 +08:00  
				
					
						
							
							
								 
						
							
								17f3104c8d 
								
							 
						 
						
							
							
								
								Merge branch 'gallery_orbit' into desktop_devin  
							
							
							
						 
						
							2012-09-12 16:18:13 +08:00  
				
					
						
							
							
								 
						
							
								e96ebefe9c 
								
							 
						 
						
							
							
								
								calendar update  
							
							
							
						 
						
							2012-09-12 16:16:01 +08:00  
				
					
						
							
							
								 
						
							
								905541aa38 
								
							 
						 
						
							
							
								
								Ray's tp CSS changes  
							
							
							
						 
						
							2012-09-12 03:50:20 +08:00  
				
					
						
							
							
								 
						
							
								816b542ca6 
								
							 
						 
						
							
							
								
								Change side bar to use key instead of title for ModuleApps  
							
							
							
						 
						
							2012-09-12 03:07:25 +08:00  
				
					
						
							
							
								 
						
							
								e88b09cf72 
								
							 
						 
						
							
							
								
								Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit  
							
							... 
							
							
							
							Conflicts:
	app/controllers/pages_controller.rb
	app/views/layouts/_side_bar.html.erb
	lib/parsers/parser_common.rb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
	vendor/built_in_modules/gallery/config/locales/en.yml
	vendor/built_in_modules/gallery/config/locales/zh_tw.yml 
							
						 
						
							2012-09-12 02:21:18 +08:00  
				
					
						
							
							
								 
						
							
								4ea0c0ec9c 
								
							 
						 
						
							
							
								
								minor fix for sidebar  
							
							
							
						 
						
							2012-09-12 02:14:50 +08:00  
				
					
						
							
							
								 
						
							
								8a71bd530f 
								
							 
						 
						
							
							
								
								page added...  
							
							
							
						 
						
							2012-09-12 02:14:50 +08:00  
				
					
						
							
							
								 
						
							
								8dd69a140f 
								
							 
						 
						
							
							
								
								frontend commits  
							
							
							
						 
						
							2012-09-12 02:12:15 +08:00  
				
					
						
							
							
								 
						
							
								3749e919cb 
								
							 
						 
						
							
							
								
								front ends updates  
							
							
							
						 
						
							2012-09-12 02:12:15 +08:00  
				
					
						
							
							
								 
						
							
								7ae1dcd8e0 
								
							 
						 
						
							
							
								
								Calendar Module  
							
							
							
						 
						
							2012-09-12 02:06:22 +08:00  
				
					
						
							
							
								 
						
							
								789c2df7fd 
								
							 
						 
						
							
							
								
								gallery frontend update  
							
							
							
						 
						
							2012-09-12 02:05:10 +08:00  
				
					
						
							
							
								 
						
							
								6a23e29f33 
								
							 
						 
						
							
							
								
								Ruby structure implementation  
							
							
							
						 
						
							2012-09-12 02:05:09 +08:00  
				
					
						
							
							
								 
						
							
								04877b9945 
								
							 
						 
						
							
							
								
								design update  
							
							
							
						 
						
							2012-09-12 01:58:23 +08:00  
				
					
						
							
							
								 
						
							
								c84b6a626e 
								
							 
						 
						
							
							
								
								minor fix for sidebar  
							
							
							
						 
						
							2012-09-11 16:50:42 +08:00  
				
					
						
							
							
								 
						
							
								01a8a9b5b6 
								
							 
						 
						
							
							
								
								users new interface controller  
							
							
							
						 
						
							2012-09-11 10:53:05 +08:00  
				
					
						
							
							
								 
						
							
								42cfe5ac91 
								
							 
						 
						
							
							
								
								first version for new member html  
							
							
							
						 
						
							2012-09-11 10:52:27 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								7bab8bf8ad 
								
							 
						 
						
							
							
								
								page added...  
							
							
							
						 
						
							2012-09-10 14:44:21 +08:00  
				
					
						
							
							
								 
						
							
								3db2664c14 
								
							 
						 
						
							
							
								
								add missing file  
							
							
							
						 
						
							2012-09-10 14:23:45 +08:00  
				
					
						
							
							
								 
						
							
								e12701b34b 
								
							 
						 
						
							
							
								
								preview for association  object  
							
							
							
						 
						
							2012-09-10 14:19:39 +08:00