|  Stephen Ficklin | b7cb751ebd
							
							Merge branch '7.x-3.x-dashboard' of github.com:tripal/tripal into 7.x-3.x-dashboard | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | 8b867cacb3
							
							Merge branch '7.x-3.x' into 7.x-3.x-dashboard | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | 82ba0937ec
							
							Minor adjustment to web services | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | 1d06fb36aa
							
							Merge branch '7.x-3.x' of github.com:tripal/tripal into 7.x-3.x | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | cab8852f14
							
							Fixed lots of bugs with web services and added new update function for tripal_chado | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | 2960082360
							
							Merge branch '103-tripal-daemon' into 7.x-3.x | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | f49424f41b
							
							Added tripal daemon admin status block. | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | 647d233bf1
							
							Continued working on web service conversion to classes | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | f7b8c27fa2
							
							Small fix to Tripal Daemon to ensure only waiting jobs get run... there was an assumption that is no longer valid. | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | 0860827c2a
							
							Forgot to remove dpm | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | f12a6ce25e
							
							Fixed a bug when creating new content types that have properties set | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | 96ab976a55
							
							Converting web services to classes | 8 жил өмнө | 
				
					
						|  Shawna | fcae52f09f
							
							Merge branch '7.x-3.x' into 7.x-3.x-dashboard | 8 жил өмнө | 
				
					
						|  Shawna | 062f0c1379
							
							alpha order for manage display tab of tripal content types | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | 475c18bf1a
							
							Make daemon compatible with Tripal 3 | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | d066855b26
							
							Fix for issue for hiding fields that are not for TripalEntity content types | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | 62b71e81ae
							
							Merge branch '7.x-1.x' of ../tripal_daemon into 103-tripal-daemon | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | a96c4a2c24
							
							Fixed issue with tripal logo block | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | c2cd66d314
							
							Merge branch '7.x-3.x-dashboard' of github.com:tripal/tripal into 7.x-3.x-dashboard | 8 жил өмнө | 
				
					
						|  Shawna | 9fee9721f0
							
							the font would help | 8 жил өмнө | 
				
					
						|  Shawna | 0660ae8509
							
							Merge branch '7.x-3.x-dashboard' of github.com:tripal/tripal into 7.x-3.x-dashboard | 8 жил өмнө | 
				
					
						|  Shawna | ccf651d887
							
							icons for download and close | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | f8ba831753
							
							Merge branch '7.x-3.x' of https://github.com/tripal/tripal into 7.x-3.x | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | 29b8ff0d57
							
							Issue #43: Fixed small typos in the interface. | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | 21a3d6b027
							
							Added missing update to tripal_ds.  Added a temp fix for adding properties | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | 512847e578
							
							Merge branch '7.x-3.x' into 7.x-3.x-dashboard | 8 жил өмнө | 
				
					
						|  Stephen Ficklin | f0201fc309
							
							Fixes to content type creation | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | a45eaf1991
							
							Fixed some errors on tripal content pages (missed some; see previous commit). | 8 жил өмнө | 
				
					
						|  Lacey Sanderson | 8c9820868d
							
							Fixed some errors on tripal content pages. | 8 жил өмнө | 
				
					
						|  Shawna | c122e292b6
							
							cleaning up documentation | 8 жил өмнө |