6426fb74d9 
								
							 
						 
						
							
							
								
								remove edit page cancel buttom  
							
							
							
						 
						
							2012-12-04 00:25:58 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								d70ef4666b 
								
							 
						 
						
							
							
								
								delete fixed..  
							
							
							
						 
						
							2012-12-04 00:25:58 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								43a9f231a6 
								
							 
						 
						
							
							
								
								multiple file fixed  
							
							
							
						 
						
							2012-12-04 00:25:58 +08:00  
				
					
						
							
							
								 
						
							
								d806e8cf82 
								
							 
						 
						
							
							
								
								have done multiple file  
							
							
							
						 
						
							2012-12-04 00:25:58 +08:00  
				
					
						
							
							
								 
						
							
								4a0cc61852 
								
							 
						 
						
							
							
								
								can add multiple file  
							
							
							
						 
						
							2012-12-04 00:25:58 +08:00  
				
					
						
							
							
								 
						
							
								5a9d9151d9 
								
							 
						 
						
							
							
								
								add journal list template  
							
							
							
						 
						
							2012-12-04 00:25:58 +08:00  
				
					
						
							
							
								 
						
							
								e2da22b29c 
								
							 
						 
						
							
							
								
								Clean translations  
							
							
							
						 
						
							2012-12-04 00:17:12 +08:00  
				
					
						
							
							
								 
						
							
								dc3be3c9a1 
								
							 
						 
						
							
							
								
								Translation changes  
							
							
							
						 
						
							2012-12-03 23:00:04 +08:00  
				
					
						
							
							
								 
						
							
								9c6c622a49 
								
							 
						 
						
							
							
								
								Add missing icons and css for icons in layout  
							
							
							
						 
						
							2012-12-03 22:31:00 +08:00  
				
					
						
							
							
								 
						
							
								9254b9960d 
								
							 
						 
						
							
							
								
								Add timeout to user  
							
							
							
						 
						
							2012-12-03 21:45:00 +08:00  
				
					
						
							
							
								 
						
							
								fbe2b26e9f 
								
							 
						 
						
							
							
								
								Do not create layout part if it already exists  
							
							
							
						 
						
							2012-12-03 18:59:32 +08:00  
				
					
						
							
							
								 
						
							
								4f9aa63045 
								
							 
						 
						
							
							
								
								Remove extra end  
							
							
							
						 
						
							2012-12-03 18:45:32 +08:00  
				
					
						
							
							
								 
						
							
								5c7f1aa164 
								
							 
						 
						
							
							
								
								Fix saving of page_part after layout change  
							
							
							
						 
						
							2012-12-03 18:42:50 +08:00  
				
					
						
							
							
								 
						
							
								2757044c32 
								
							 
						 
						
							
							
								
								Forgot to save the page_parts  
							
							
							
						 
						
							2012-12-03 17:49:26 +08:00  
				
					
						
							
							
								 
						
							
								bdcfb46294 
								
							 
						 
						
							
							
								
								Fix previous commit  
							
							
							
						 
						
							2012-12-03 17:38:55 +08:00  
				
					
						
							
							
								 
						
							
								6543491a53 
								
							 
						 
						
							
							
								
								Save pages to generate page_parts when a layout is updated  
							
							
							
						 
						
							2012-12-03 17:25:27 +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  
				
					
						
							
							
								 
						
							
								390da0e49a 
								
							 
						 
						
							
							
								
								Change icons  
							
							
							
						 
						
							2012-11-29 00:49:53 +08:00  
				
					
						
							
							
								 
						
							
								9e2d6cfcdd 
								
							 
						 
						
							
							
								
								add quick link to change user password, but it's not work  
							
							
							
						 
						
							2012-11-28 23:44:43 +08:00  
				
					
						
							
							
								 
						
							
								6ed1dd0cc6 
								
							 
						 
						
							
							
								
								change template  
							
							
							
						 
						
							2012-11-28 23:43:39 +08:00  
				
					
						
							
							
								 
						
							
								7853aec886 
								
							 
						 
						
							
							
								
								Merge branch 'publication' into multiple_file_upload  
							
							... 
							
							
							
							* publication:
  url fixed and edit form fixed for tinyscrollbar 
							
						 
						
							2012-11-28 18:19:06 +08:00  
				
					
						
							
							
								 
						
							
								aad1b2e47b 
								
							 
						 
						
							
							
								
								Merge branch 'publication' of  https://github.com/Rulingcom/orbit  into publication  
							
							... 
							
							
							
							* 'publication' of https://github.com/Rulingcom/orbit :
  url fixed and edit form fixed for tinyscrollbar 
							
						 
						
							2012-11-28 18:13:00 +08:00  
				
					
						
							
							
								 
						
							
								6d159a3a9e 
								
							 
						 
						
							
							
								
								add templete  
							
							
							
						 
						
							2012-11-28 18:12:37 +08:00  
				
					
						
							
							
								 
						
							
								254a81fa5d 
								
							 
						 
						
							
							
								
								add templete  
							
							
							
						 
						
							2012-11-28 18:12:21 +08:00  
				
					
						
							
							
								 
						
							
								2f67a96532 
								
							 
						 
						
							
							
								
								url fixed and edit form fixed for tinyscrollbar  
							
							
							
						 
						
							2012-11-28 18:12:00 +08:00  
				
					
						
							
							
								 
						
							
								796dcc4dc6 
								
							 
						 
						
							
							
								
								easy to make fake data  
							
							
							
						 
						
							2012-11-28 15:20:02 +08:00  
				
					
						
							
							
								 
						
							
								25324809bb 
								
							 
						 
						
							
							
								
								add account link  
							
							
							
						 
						
							2012-11-28 14:42:15 +08:00  
				
					
						
							
							
								 
						
							
								730c29bf49 
								
							 
						 
						
							
							
								
								change layout  
							
							
							
						 
						
							2012-11-28 14:28:41 +08:00  
				
					
						
							
							
								 
						
							
								114ca5493a 
								
							 
						 
						
							
							
								
								replace rss format with json in announcement  
							
							
							
						 
						
							2012-11-28 13:43:48 +08:00  
				
					
						
							
							
								 
						
							
								452b1525de 
								
							 
						 
						
							
							
								
								Merge branch 'publication' of  https://github.com/Rulingcom/orbit  into publication  
							
							... 
							
							
							
							* 'publication' of https://github.com/Rulingcom/orbit :
  autocomplete done 
							
						 
						
							2012-11-27 15:57:18 +08:00  
				
					
						
							
							
								 
						
							
								9cc518b456 
								
							 
						 
						
							
							
								
								autocomplete done  
							
							
							
						 
						
							2012-11-27 15:55:32 +08:00  
				
					
						
							
							
								 
						
							
								46576c6947 
								
							 
						 
						
							
							
								
								modify fake data  
							
							
							
						 
						
							2012-11-27 00:18:34 +08:00  
				
					
						
							
							
								 
						
							
								6de62318c5 
								
							 
						 
						
							
							
								
								fake data for journal and coauthor  
							
							
							
						 
						
							2012-11-27 00:05:04 +08:00  
				
					
						
							
							
								 
						
							
								c9e3d5271a 
								
							 
						 
						
							
							
								
								remove '"' candidate list  
							
							
							
						 
						
							2012-11-26 16:06:22 +08:00  
				
					
						
							
							
								 
						
							
								0125010a05 
								
							 
						 
						
							
							
								
								modified error msgs and cancle button, but those two have bug...  
							
							
							
						 
						
							2012-11-26 15:45:51 +08:00  
				
					
						
							
							
								 
						
							
								613bbec1f0 
								
							 
						 
						
							
							
								
								Merge branch 'autocomplete' into publication  
							
							... 
							
							
							
							* autocomplete:
  add autocomplete js 
							
						 
						
							2012-11-26 14:44:52 +08:00  
				
					
						
							
							
								 
						
							
								065d38c797 
								
							 
						 
						
							
							
								
								add autocomplete js  
							
							
							
						 
						
							2012-11-26 14:44:35 +08:00  
				
					
						
							
							
								 
						
							
								f2d1b0eaf7 
								
							 
						 
						
							
							
								
								Merge branch 'fake_journal_data' into publication  
							
							... 
							
							
							
							* fake_journal_data:
  make a 'real' fake data 
							
						 
						
							2012-11-26 14:05:50 +08:00  
				
					
						
							
							
								 
						
							
								5e04ec70a3 
								
							 
						 
						
							
							
								
								make a 'real' fake data  
							
							
							
						 
						
							2012-11-26 11:52:11 +08:00  
				
					
						
							
							
								 
						
							
								10c1b3e6a2 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Rulingcom/orbit  
							
							... 
							
							
							
							* 'master' of https://github.com/Rulingcom/orbit : (136 commits)
  member selects
  add paper status textfield
  fix for showing subroles
  member selects
  fix for showing subroles
  add paper status textfield
  delete fixed
  fixed delete function
  delete update
  add co-author json
  user roles starts
  disable data transform when switching attribute field type. new member stable
  correct 'edit' button of journal list
  make fake data
  fix for json and some other bugs
  add delete link
  fixed add journal and co-author curd problem, but have redirect problem...
  hidden file field, and fixed updated function
  Fix album images display
  user roles starts
  ... 
							
						 
						
							2012-11-26 11:36:13 +08:00  
				
					
						
							
							
								 
						
							
								6b248a949b 
								
							 
						 
						
							
							
								
								Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin  
							
							
							
						 
						
							2012-11-26 10:25:57 +08:00  
				
					
						
							
							
								 
						
							
								8a79d7ff2e 
								
							 
						 
						
							
							
								
								member selects  
							
							
							
						 
						
							2012-11-26 10:25:34 +08:00  
				
					
						
							
							
								 
						
							
								4e7ff62c2b 
								
							 
						 
						
							
							
								
								Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP  
							
							
							
						 
						
							2012-11-26 10:24:15 +08:00  
				
					
						
							
							
								 
						
							
								9061448c5f 
								
							 
						 
						
							
							
								
								add paper status textfield  
							
							
							
						 
						
							2012-11-26 10:23:50 +08:00  
				
					
						
							
							
								 
						
							
								23de4f72a6 
								
							 
						 
						
							
							
								
								Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member  
							
							
							
						 
						
							2012-11-26 10:22:52 +08:00  
				
					
						
							
							
								 
						
							
								9a684f54b4 
								
							 
						 
						
							
							
								
								fix for showing subroles  
							
							
							
						 
						
							2012-11-26 10:22:36 +08:00  
				
					
						
							
							
								 
						
							
								1f0287dd7e 
								
							 
						 
						
							
							
								
								member selects  
							
							
							
						 
						
							2012-11-26 10:14:43 +08:00  
				
					
						
							
							
								 
						
							
								046dbc9524 
								
							 
						 
						
							
							
								
								fix for showing subroles  
							
							
							
						 
						
							2012-11-26 10:08:06 +08:00  
				
					
						
							
							
								 
						
							
								6d861f8be0 
								
							 
						 
						
							
							
								
								add paper status textfield  
							
							
							
						 
						
							2012-11-26 09:37:24 +08:00