chris
							
						 
						
							 
							
							
							
							
								
							
							
								856898016b 
								
							 
						 
						
							
							
								
								New UI changes(tags, categories, authorisations, module index…)  
							
							 
							
							... 
							
							
							
							To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) 
							
						 
						
							2013-07-02 16:46:44 +08:00  
						
					 
				
					
						
							
							
								 
								Matt K. Fu
							
						 
						
							 
							
							
							
							
								
							
							
								2806dd35a9 
								
							 
						 
						
							
							
								
								spen's fix for user  
							
							 
							
							
							
						 
						
							2013-05-23 14:03:18 +08:00  
						
					 
				
					
						
							
							
								 
								Matt K. Fu
							
						 
						
							 
							
							
							
							
								
							
							
								37aa950028 
								
							 
						 
						
							
							
								
								user action  
							
							 
							
							
							
						 
						
							2013-05-23 11:55:57 +08:00  
						
					 
				
					
						
							
							
								 
								Spen
							
						 
						
							 
							
							
							
							
								
							
							
								5b368235e8 
								
							 
						 
						
							
							
								
								ntu dropdown fix list sort  
							
							 
							
							
							
						 
						
							2013-05-14 14:19:55 +08:00  
						
					 
				
					
						
							
							
								 
								Spen
							
						 
						
							 
							
							
							
							
								
							
							
								b8da40b4ae 
								
							 
						 
						
							
							
								
								ntu_dropdown_fix  
							
							 
							
							
							
						 
						
							2013-05-14 14:19:55 +08:00  
						
					 
				
					
						
							
							
								 
								Spen
							
						 
						
							 
							
							
							
							
								
							
							
								697944a029 
								
							 
						 
						
							
							
								
								user id set & user fields set & role set & member frontend list & user translation & create new member bug fix  
							
							 
							
							
							
						 
						
							2013-04-25 19:59:59 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								504f5027cc 
								
							 
						 
						
							
							
								
								member role edit  
							
							 
							
							
							
						 
						
							2013-01-14 19:00:08 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								758cab5ecd 
								
							 
						 
						
							
							
								
								move journal code to persional_journal modulaar  
							
							 
							
							
							
						 
						
							2013-01-14 17:53:59 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								84e4a558be 
								
							 
						 
						
							
							
								
								member roles edit  
							
							 
							
							
							
						 
						
							2013-01-14 17:02:51 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								35e0011111 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/publication' into desktop  
							
							 
							
							... 
							
							
							
							* remotes/origin/publication:
  new desktop framework updates 
							
						 
						
							2013-01-07 12:44:30 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								37f8c1637a 
								
							 
						 
						
							
							
								
								new desktop framework updates  
							
							 
							
							
							
						 
						
							2012-12-27 18:25:54 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								b4633a2ccb 
								
							 
						 
						
							
							
								
								.not_guest_user  
							
							 
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								3d39c2c3c3 
								
							 
						 
						
							
							
								
								hidden guest user  
							
							 
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								ec1fad9729 
								
							 
						 
						
							
							
								
								fixed empty name of member list  
							
							 
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								7d3c535e01 
								
							 
						 
						
							
							
								
								add info field  
							
							 
							
							
							
						 
						
							2012-12-06 07:58:39 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								58e71c29b3 
								
							 
						 
						
							
							
								
								uniq relation  
							
							 
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								9759a32394 
								
							 
						 
						
							
							
								
								can display relation between author  
							
							 
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								e143f9a345 
								
							 
						 
						
							
							
								
								can select relection from relation db  
							
							 
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								7822ffc33d 
								
							 
						 
						
							
							
								
								can add relation between co-author  
							
							 
							
							
							
						 
						
							2012-12-04 00:31:06 +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  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								9254b9960d 
								
							 
						 
						
							
							
								
								Add timeout to user  
							
							 
							
							
							
						 
						
							2012-12-03 21:45:00 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								77386f0284 
								
							 
						 
						
							
							
								
								disable data transform when switching attribute field type. new member stable  
							
							 
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								d502f561ef 
								
							 
						 
						
							
							
								
								add co-author db and curd page, but it can't destory it...  
							
							 
							
							
							
						 
						
							2012-11-21 18:36:32 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								97ffb5ff18 
								
							 
						 
						
							
							
								
								file view update  
							
							 
							
							
							
						 
						
							2012-11-21 07:37:42 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								d61621e198 
								
							 
						 
						
							
							
								
								Remove some pry and add address code  
							
							 
							
							
							
						 
						
							2012-11-20 10:05:38 +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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								be448d42c9 
								
							 
						 
						
							
							
								
								add_more ok  
							
							 
							
							
							
						 
						
							2012-11-20 09:52:50 +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  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								58d4554b0b 
								
							 
						 
						
							
							
								
								Fixing bugs  
							
							 
							
							
							
						 
						
							2012-11-05 11:30:15 +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
							
						 
						
							 
							
							
							
							
								
							
							
								9b5f4e4775 
								
							 
						 
						
							
							
								
								Fix bug: User cannot connect using the orbit button (Devise configuration)  
							
							 
							
							
							
						 
						
							2012-10-26 17:42:14 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								bd0d975014 
								
							 
						 
						
							
							
								
								for user new interface, member  role is working.  
							
							 
							
							
							
						 
						
							2012-10-26 11:27:37 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								0a1a9d2c2e 
								
							 
						 
						
							
							
								
								member for THU  
							
							 
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								03b608593d 
								
							 
						 
						
							
							
								
								can add member  
							
							 
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								8b9cffd4f2 
								
							 
						 
						
							
							
								
								new code for attribute fields and values for new member interface  
							
							 
							
							
							
						 
						
							2012-10-26 11:19:55 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								9f825de288 
								
							 
						 
						
							
							
								
								user new interface 70%  
							
							 
							
							
							
						 
						
							2012-10-09 06:40:18 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								19db9d0037 
								
							 
						 
						
							
							
								
								basic function  
							
							 
							
							
							
						 
						
							2012-09-17 13:32:52 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								5fb94f644d 
								
							 
						 
						
							
							
								
								break down Ray's HTML  
							
							 
							
							
							
						 
						
							2012-09-14 00:02:22 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4818e3f444 
								
							 
						 
						
							
							
								
								first version for new member html  
							
							 
							
							
							
						 
						
							2012-09-14 00:02:21 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								04877b9945 
								
							 
						 
						
							
							
								
								design update  
							
							 
							
							
							
						 
						
							2012-09-12 01:58:23 +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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								e8317e0a4b 
								
							 
						 
						
							
							
								
								1.Remove category column when category is specified  
							
							 
							
							... 
							
							
							
							2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable. 
							
						 
						
							2012-08-08 14:46:08 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a6a8fe3d64 
								
							 
						 
						
							
							
								
								Remove remaining 18n_variables  
							
							 
							
							
							
						 
						
							2012-07-27 19:37:25 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								53cae0a9ee 
								
							 
						 
						
							
							
								
								Remove i18n_variable for views  
							
							 
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								49dd3a1770 
								
							 
						 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models  
							
							 
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00