Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e447dc411a
								
							
						 | 
						
							
							
								
								design update
							
							
							
							
							
						 | 
						
							2012-08-21 19:36:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								6923b82284
								
							
						 | 
						
							
							
								
								Added seminar section
							
							
							
							
							
						 | 
						
							2012-07-04 19:12:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f635f642fc
								
							
						 | 
						
							
							
								
								Merge for new timeline updates and font updates
							
							
							
							
							
						 | 
						
							2012-07-04 18:49:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Joshua Milton
							
						 | 
						
							
							
							
							
							
								
							
							
								441929eb74
								
							
						 | 
						
							
							
								
								Latest code by joshua
							
							
							
							
							
						 | 
						
							2012-07-04 18:39:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Joshua Milton
							
						 | 
						
							
							
							
							
							
								
							
							
								6b9926539d
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_joshua' of https://github.com/Rulingcom/orbit into desktop_joshua
							
							
							
							
							
							
							
							Conflicts:
	app/assets/javascripts/orbitdesktop.js
	app/controllers/desktop_publications_controller.rb
	config/routes.rb 
							
						 | 
						
							2012-07-04 18:31:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Joshua Milton
							
						 | 
						
							
							
							
							
							
								
							
							
								3f42a22094
								
							
						 | 
						
							
							
								
								Books section added
							
							
							
							
							
						 | 
						
							2012-07-04 17:55:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f20f36383e
								
							
						 | 
						
							
							
								
								Timeline ajax load fixed… a bit change in structure..
							
							
							
							
							
						 | 
						
							2012-07-03 19:45:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								7151102a86
								
							
						 | 
						
							
							
								
								new page add and timeline changes
							
							
							
							
							
						 | 
						
							2012-06-28 17:31:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4aa155a44d
								
							
						 | 
						
							
							
								
								timeline updates major ones..
							
							
							
							
							
						 | 
						
							2012-06-26 21:09:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								fcc875bb5d
								
							
						 | 
						
							
							
								
								app store page added… and few other changes..
							
							
							
							
							
						 | 
						
							2012-05-04 20:28:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a3a1e4b92e
								
							
						 | 
						
							
							
								
								controller change, views working and db for paper and journals
							
							
							
							
							
						 | 
						
							2012-05-03 21:30:12 +08:00 |