| 
							
						 | 
						
							
							
							
							
								
							
							
								a809ce06fb
								
							
						 | 
						
							
							
								
								Drop old requirements
							
							
							
							
							
						 | 
						
							2016-06-15 15:52:45 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								19d97cc79c
								
							
						 | 
						
							
							
								
								De-slugify
							
							
							
							
							
						 | 
						
							2016-06-15 15:52:18 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								65bc5c16d4
								
							
						 | 
						
							
							
								
								Fix up display names
							
							
							
							
							
						 | 
						
							2016-06-15 15:45:54 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								a541a6f301
								
							
						 | 
						
							
							
								
								SQUASHING
							
							
							
							
							
						 | 
						
							2016-06-15 15:12:34 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								8573b0326b
								
							
						 | 
						
							
							
								
								Bump heroku python runtime to 3.5.1
							
							
							
							
							
						 | 
						
							2016-06-15 13:49:25 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								ab01518bdc
								
							
						 | 
						
							
							
								
								Set up DRF
							
							
							
							
							
							
							
							Fixes #5 
							
						 | 
						
							2016-06-15 13:27:56 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthew Dillon
								
							 
						 | 
						
							
							
							
							
								
							
							
								07ff19d5b3
								
							
						 | 
						
							
							
								
								Merge pull request #7 from thermokarst/tests_and_data
							
							
							
							
							
							
							
							Tests and data 
							
						 | 
						
							2016-06-15 10:44:21 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								70046b5104
								
							
						 | 
						
							
							
								
								Set backref labels
							
							
							
							
							
							
							
							Fixes #6 
							
						 | 
						
							2016-06-15 10:43:02 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								dbfe88610a
								
							
						 | 
						
							
							
								
								Experiment-Collections
							
							
							
							
							
						 | 
						
							2016-06-15 10:22:39 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								8b95a83b1b
								
							
						 | 
						
							
							
								
								experiments: data import and tests
							
							
							
							
							
						 | 
						
							2016-06-15 10:14:48 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f899a8c844
								
							
						 | 
						
							
							
								
								experiments: factories
							
							
							
							
							
						 | 
						
							2016-06-15 07:06:00 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								067448943e
								
							
						 | 
						
							
							
								
								add collection-species to data import and tests
							
							
							
							
							
						 | 
						
							2016-06-14 21:19:02 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								1b5cf2ebea
								
							
						 | 
						
							
							
								
								collections: tests and data migration
							
							
							
							
							
						 | 
						
							2016-06-14 16:09:13 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								033568646f
								
							
						 | 
						
							
							
								
								processing: tests and data migration
							
							
							
							
							
						 | 
						
							2016-06-14 12:27:24 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								afa22b046b
								
							
						 | 
						
							
							
								
								species: tests and data migration
							
							
							
							
							
						 | 
						
							2016-06-09 14:37:34 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								831e4091dc
								
							
						 | 
						
							
							
								
								locations: tests and data migration
							
							
							
							
							
						 | 
						
							2016-06-09 14:21:10 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								2bbfe7dd1c
								
							
						 | 
						
							
							
								
								misc: tests and data migration
							
							
							
							
							
						 | 
						
							2016-06-09 12:21:37 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								b6a1a60bfb
								
							
						 | 
						
							
							
								
								Linting
							
							
							
							
							
						 | 
						
							2016-06-09 10:13:47 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								2ec7fcabef
								
							
						 | 
						
							
							
								
								Project factories
							
							
							
							
							
						 | 
						
							2016-06-08 20:51:42 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								13925cef39
								
							
						 | 
						
							
							
								
								Stop tracking .env file
							
							
							
							
							
						 | 
						
							2016-06-08 20:40:58 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								9132cd142e
								
							
						 | 
						
							
							
								
								WIP
							
							
							
							
							
						 | 
						
							2016-06-08 16:18:35 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								75829eb4a1
								
							
						 | 
						
							
							
								
								Initial recut of data import
							
							
							
							
							
						 | 
						
							2016-06-08 11:54:20 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								6162bd984f
								
							
						 | 
						
							
							
								
								Remove timezone
							
							
							
							
							
						 | 
						
							2016-06-08 11:50:46 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								d7b1910839
								
							
						 | 
						
							
							
								
								Clean out stuff
							
							
							
							
							
						 | 
						
							2016-06-08 11:49:05 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								fd5927c31a
								
							
						 | 
						
							
							
								
								Clean up config
							
							
							
							
							
						 | 
						
							2016-06-08 11:14:04 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								39a46fe9e9
								
							
						 | 
						
							
							
								
								Updating README and requirements
							
							
							
							
							
						 | 
						
							2016-06-08 10:07:13 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								48b6adc70e
								
							
						 | 
						
							
							
								
								Drop unnecessary import
							
							
							
							
							
						 | 
						
							2016-02-11 20:23:41 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								c62fc40f72
								
							
						 | 
						
							
							
								
								Split up TR label
							
							
							
							
							
						 | 
						
							2016-02-03 13:25:30 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								1edb557f91
								
							
						 | 
						
							
							
								
								Meta cleanup
							
							
							
							
							
						 | 
						
							2016-02-03 13:02:30 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								e7c384ed5f
								
							
						 | 
						
							
							
								
								Collections ordering
							
							
							
							
							
						 | 
						
							2016-02-03 11:48:29 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f630cd9e11
								
							
						 | 
						
							
							
								
								Tweak Collections Label
							
							
							
							
							
						 | 
						
							2016-02-03 11:45:29 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthew Dillon
								
							 
						 | 
						
							
							
							
							
								
							
							
								e361ba26e2
								
							
						 | 
						
							
							
								
								Cached model name (collections)
							
							
							
							
							
						 | 
						
							2016-02-02 12:11:23 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthew Dillon
								
							 
						 | 
						
							
							
							
							
								
							
							
								432af284c2
								
							
						 | 
						
							
							
								
								Upgrade django 1.8.9
							
							
							
							
							
						 | 
						
							2016-02-01 18:23:59 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								8114bb9f2c
								
							
						 | 
						
							
							
								
								Experiment-Collection
							
							
							
							
							
						 | 
						
							2016-02-01 15:28:02 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								7c1b12f833
								
							
						 | 
						
							
							
								
								Alive-Dead Count
							
							
							
							
							
						 | 
						
							2016-02-01 15:22:04 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								75cb9a9eea
								
							
						 | 
						
							
							
								
								Clean out stuff not needed
							
							
							
							
							
						 | 
						
							2016-02-01 15:03:37 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								6d7242aacc
								
							
						 | 
						
							
							
								
								Treatment Replicate
							
							
							
							
							
						 | 
						
							2016-02-01 14:59:19 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								a8a87f7ddb
								
							
						 | 
						
							
							
								
								Treatment
							
							
							
							
							
						 | 
						
							2016-02-01 14:39:59 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								ab1d605c95
								
							
						 | 
						
							
							
								
								Treatment Type
							
							
							
							
							
						 | 
						
							2016-02-01 14:30:19 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								55e08501d5
								
							
						 | 
						
							
							
								
								Experiment
							
							
							
							
							
						 | 
						
							2016-02-01 14:08:44 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								80e96ec81b
								
							
						 | 
						
							
							
								
								Trap species and collection species
							
							
							
							
							
						 | 
						
							2016-02-01 13:31:32 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthew Dillon
								
							 
						 | 
						
							
							
							
							
								
							
							
								040fe41285
								
							
						 | 
						
							
							
								
								Merge pull request #1 from thermokarst/collections
							
							
							
							
							
							
							
							Collections 
							
						 | 
						
							2016-02-01 13:05:32 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								2c8681217b
								
							
						 | 
						
							
							
								
								Finish up collections admin
							
							
							
							
							
						 | 
						
							2016-02-01 13:04:51 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								60601beacb
								
							
						 | 
						
							
							
								
								Processing
							
							
							
							
							
						 | 
						
							2016-02-01 11:21:11 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								94d7143cd2
								
							
						 | 
						
							
							
								
								Collections too soon
							
							
							
							
							
						 | 
						
							2016-02-01 11:20:57 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								528dfcc57e
								
							
						 | 
						
							
							
								
								Fix locations integrity issue
							
							
							
							
							
						 | 
						
							2016-02-01 11:20:40 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthew Dillon
								
							 
						 | 
						
							
							
							
							
								
							
							
								847d4b372a
								
							
						 | 
						
							
							
								
								WIP
							
							
							
							
							
						 | 
						
							2016-01-31 20:39:23 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthew Dillon
								
							 
						 | 
						
							
							
							
							
								
							
							
								3be40fe7da
								
							
						 | 
						
							
							
								
								Species
							
							
							
							
							
						 | 
						
							2016-01-30 17:05:59 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Matthew Dillon
								
							 
						 | 
						
							
							
							
							
								
							
							
								e397e96dab
								
							
						 | 
						
							
							
								
								Fixing storage location code
							
							
							
							
							
						 | 
						
							2016-01-30 15:54:10 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								e5a3edb75e
								
							
						 | 
						
							
							
								
								Missed extra search field
							
							
							
							
							
						 | 
						
							2016-01-29 12:48:27 -07:00 | 
						
						
							
							
							
							
								
							
							
						 |