7ba65caa70 
								
							 
						 
						
							
							
								
								can select relection from relation db  
							
							
							
						 
						
							2012-12-03 14:55:57 +08:00  
				
					
						
							
							
								 
						
							
								3e1e2c47ec 
								
							 
						 
						
							
							
								
								modify delete co-author message  
							
							
							
						 
						
							2012-12-03 14:04:23 +08:00  
				
					
						
							
							
								 
						
							
								a0aa5e6d45 
								
							 
						 
						
							
							
								
								can add relation between co-author  
							
							
							
						 
						
							2012-12-03 12:10:45 +08:00  
				
					
						
							
							
								 
						
							
								a0fc2caaf6 
								
							 
						 
						
							
							
								
								refine co-authro page  
							
							
							
						 
						
							2012-12-01 00:21:49 +08:00  
				
					
						
							
							
								 
						
							
								cc6339d59b 
								
							 
						 
						
							
							
								
								add journal_list. now, those pair, (journal_title, journal_levels), is uniq  
							
							
							
						 
						
							2012-11-30 23:50:46 +08:00  
				
					
						
							
							
								 
						
							
								ccacef6d9e 
								
							 
						 
						
							
							
								
								Merge branch 'publication' into journal_list  
							
							... 
							
							
							
							* publication: (23 commits)
  adjust update password textfield position
  correct user passwd and sent json to front-end
  correct user passwd and sent json to front-end
  if coauthor not in coauthor db then it will be add in db
  fixed journal update method
  jumping menus updated..
  remove edit page cancel buttom
  delete fixed..
  multiple file fixed
  have done multiple file
  can add multiple file
  Module store
  Joshua's html
  Change icons
  add quick link to change user password, but it's not work
  change template
  add templete
  add templete
  url fixed and edit form fixed for tinyscrollbar
  easy to make fake data
  ... 
							
						 
						
							2012-11-30 21:02:18 +08:00  
				
					
						
							
							
								 
						
							
								129d68817e 
								
							 
						 
						
							
							
								
								correct user passwd and sent json to front-end  
							
							
							
						 
						
							2012-11-30 15:17:39 +08:00  
				
					
						
							
							
								 
						
							
								55dbfd8c4e 
								
							 
						 
						
							
							
								
								fixed journal update method  
							
							
							
						 
						
							2012-11-29 16:48:07 +08:00  
				
					
						
							
							
								 
						
							
								036d7bbb0e 
								
							 
						 
						
							
							
								
								Module store  
							
							
							
						 
						
							2012-11-29 02:02:37 +08:00  
				
					
						
							
							
								 
						
							
								06335f9bd1 
								
							 
						 
						
							
							
								
								Joshua's html  
							
							
							
						 
						
							2012-11-29 00:59:46 +08:00  
				
					
						
							
							
								 
						
							
								2f05885c4a 
								
							 
						 
						
							
							
								
								add journal list template  
							
							
							
						 
						
							2012-11-28 11:45:23 +08:00  
				
					
						
							
							
								 
						
							
								0125010a05 
								
							 
						 
						
							
							
								
								modified error msgs and cancle button, but those two have bug...  
							
							
							
						 
						
							2012-11-26 15:45:51 +08:00  
				
					
						
							
							
								 
						
							
								065d38c797 
								
							 
						 
						
							
							
								
								add autocomplete js  
							
							
							
						 
						
							2012-11-26 14:44:35 +08:00  
				
					
						
							
							
								 
						
							
								8a79d7ff2e 
								
							 
						 
						
							
							
								
								member selects  
							
							
							
						 
						
							2012-11-26 10:25:34 +08:00  
				
					
						
							
							
								 
						
							
								9061448c5f 
								
							 
						 
						
							
							
								
								add paper status textfield  
							
							
							
						 
						
							2012-11-26 10:23:50 +08:00  
				
					
						
							
							
								 
						
							
								9a684f54b4 
								
							 
						 
						
							
							
								
								fix for showing subroles  
							
							
							
						 
						
							2012-11-26 10:22:36 +08:00  
				
					
						
							
							
								 
						
							
								1e89c30150 
								
							 
						 
						
							
							
								
								Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP  
							
							
							
						 
						
							2012-11-26 05:02:58 +08:00  
				
					
						
							
							
								 
						
							
								3933c048b0 
								
							 
						 
						
							
							
								
								delete fixed  
							
							
							
						 
						
							2012-11-23 13:22:01 +08:00  
				
					
						
							
							
								 
						
							
								8009c6aa34 
								
							 
						 
						
							
							
								
								fixed delete function  
							
							
							
						 
						
							2012-11-23 12:28:36 +08:00  
				
					
						
							
							
								 
						
							
								996a69f595 
								
							 
						 
						
							
							
								
								add co-author json  
							
							
							
						 
						
							2012-11-23 10:44:48 +08:00  
				
					
						
							
							
								 
						
							
								5b39d10ac6 
								
							 
						 
						
							
							
								
								user roles starts  
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
				
					
						
							
							
								 
						
							
								77386f0284 
								
							 
						 
						
							
							
								
								disable data transform when switching attribute field type. new member stable  
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
				
					
						
							
							
								 
						
							
								e29583ed1f 
								
							 
						 
						
							
							
								
								add delete link  
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
				
					
						
							
							
								 
						
							
								78500e0661 
								
							 
						 
						
							
							
								
								fixed add journal and co-author curd problem, but have redirect problem...  
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
				
					
						
							
							
								 
						
							
								c281ae9447 
								
							 
						 
						
							
							
								
								hidden file field, and fixed updated function  
							
							
							
						 
						
							2012-11-22 21:06:30 +08:00  
				
					
						
							
							
								 
						
							
								e453cfce9c 
								
							 
						 
						
							
							
								
								add delete link  
							
							
							
						 
						
							2012-11-22 15:21:43 +08:00  
				
					
						
							
							
								 
						
							
								c0ac69fc84 
								
							 
						 
						
							
							
								
								Merge branch 'make_jsFunc_for_journalP' of  https://github.com/Rulingcom/orbit  into make_jsFunc_for_journalP  
							
							... 
							
							
							
							* 'make_jsFunc_for_journalP' of https://github.com/Rulingcom/orbit :
  calendar js minor update
  Fix:   - Widgets for announcement   - Facebook link   - AdBanner nav
  visitor now can browse gallery
  routes fixed
  small fix for journal_pages desktop
  new file created for journal pages
  tmp
  add co-author db and curd page, but it can't destory it...
  add co-author page and new it, but can't destory it...
  visitor now can browse gallery
  done add journals function
  fix and hide for visitors,except for album
  album and gallery is now opened
  fixed sutpid bug for calendar
  back button fix for frontend
  fix and hide for visitors,except for album
  calendar js minor update
  minor update for gallery and calendar backend 
							
						 
						
							2012-11-22 10:51:30 +08:00  
				
					
						
							
							
								 
						
							
								9e400e6e6a 
								
							 
						 
						
							
							
								
								fixed add journal and co-author curd problem, but have redirect problem...  
							
							
							
						 
						
							2012-11-22 10:49:54 +08:00  
				
					
						
							
							
								 
						
							
								39adbb35c1 
								
							 
						 
						
							
							
								
								Remove before_filter for sub_manager in users  
							
							
							
						 
						
							2012-11-22 09:37:31 +08:00  
				
					
						
							
							
								 
						
							
								475642d375 
								
							 
						 
						
							
							
								
								Remove news and fix default_url in ImageUploader  
							
							
							
						 
						
							2012-11-22 09:30:25 +08:00  
				
					
						
							
							
								 
						
							
								bb69a059e8 
								
							 
						 
						
							
							
								
								hidden file field, and fixed updated function  
							
							
							
						 
						
							2012-11-22 02:37:56 +08:00  
				
					
						
							
							
								 
						
							
								c53581c999 
								
							 
						 
						
							
							
								
								small fix for journal_pages desktop  
							
							
							
						 
						
							2012-11-21 18:36:56 +08:00  
				
					
						
							
							
								 
						
							
								b47be52309 
								
							 
						 
						
							
							
								
								tmp  
							
							
							
						 
						
							2012-11-21 18:36:56 +08:00  
				
					
						
							
							
								 
						
							
								d502f561ef 
								
							 
						 
						
							
							
								
								add co-author db and curd page, but it can't destory it...  
							
							
							
						 
						
							2012-11-21 18:36:32 +08:00  
				
					
						
							
							
								 
						
							
								6a9426c9c8 
								
							 
						 
						
							
							
								
								add co-author page and new it, but can't destory it...  
							
							
							
						 
						
							2012-11-21 18:36:32 +08:00  
				
					
						
							
							
								 
						
							
								5006cd2f61 
								
							 
						 
						
							
							
								
								done add journals function  
							
							
							
						 
						
							2012-11-21 18:34:03 +08:00  
				
					
						
							
							
								 
						
							
								1279af0c11 
								
							 
						 
						
							
							
								
								fix and hide for visitors,except for album  
							
							
							
						 
						
							2012-11-21 18:31:57 +08:00  
				
					
						
							
							
								 
						
							
								c94940214c 
								
							 
						 
						
							
							
								
								small fix for journal_pages desktop  
							
							
							
						 
						
							2012-11-21 17:11:18 +08:00  
				
					
						
							
							
								 
						
							
								5c0b137c6d 
								
							 
						 
						
							
							
								
								tmp  
							
							
							
						 
						
							2012-11-21 14:52:26 +08:00  
				
					
						
							
							
								 
						
							
								da1b871481 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2012-11-21 10:46:33 +08:00  
				
					
						
							
							
								 
						
							
								8f65284932 
								
							 
						 
						
							
							
								
								Desktop updates various  
							
							
							
						 
						
							2012-11-21 07:37:44 +08:00  
				
					
						
							
							
								 
						
							
								d7599f1ccf 
								
							 
						 
						
							
							
								
								add edit function  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								5eb8cc4063 
								
							 
						 
						
							
							
								
								finished some method of list and journal  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								ae10a2b8a2 
								
							 
						 
						
							
							
								
								convert html template to html.erb  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								bf4c75fcdc 
								
							 
						 
						
							
							
								
								add new function  
							
							
							
						 
						
							2012-11-21 07:37:43 +08:00  
				
					
						
							
							
								 
						
							
								f93d019ba0 
								
							 
						 
						
							
							
								
								check file type  
							
							
							
						 
						
							2012-11-21 07:37:42 +08:00  
				
					
						
							
							
								 
						
							
								97ffb5ff18 
								
							 
						 
						
							
							
								
								file view update  
							
							
							
						 
						
							2012-11-21 07:37:42 +08:00  
				
					
						
							
							
								 
						
							
								02643c12bf 
								
							 
						 
						
							
							
								
								modified getjournals format  
							
							
							
						 
						
							2012-11-21 07:37:41 +08:00  
				
					
						
							
							
								 
						
							
								4ce10d2fd9 
								
							 
						 
						
							
							
								
								make a json format for view of journal_p  
							
							
							
						 
						
							2012-11-21 07:37:41 +08:00  
				
					
						
							
							
								 
						
							
								95fc5676bf 
								
							 
						 
						
							
							
								
								add co-author db and curd page, but it can't destory it...  
							
							
							
						 
						
							2012-11-21 01:56:30 +08:00