Jay R. Newlin (PromptWorks) 
							
						 
					 
					
						
						
							
						
						92f425ac79 
					 
					
						
						
							
							Merge pull request  #504  from dod-ccpo/jrn_no_branch_coverage  
						
						... 
						
						
						
						JRN no branch coverage 
						
						
					 
					
						2018-12-18 16:54:36 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						c8da258d33 
					 
					
						
						
							
							polish task order forms  
						
						
						
						
					 
					
						2018-12-18 16:32:40 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						2ea8e489b3 
					 
					
						
						
							
							Merge branch 'master' of github-DDS:dod-ccpo/atst into jrn_no_branch_coverage  
						
						
						
						
					 
					
						2018-12-18 16:29:06 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						bb640cdcd7 
					 
					
						
						
							
							Lambda function refactor suggested by Patrick  
						
						
						
						
					 
					
						2018-12-18 16:11:25 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						5cc5b700b7 
					 
					
						
						
							
							move task order routes file  
						
						
						
						
					 
					
						2018-12-18 13:32:51 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						ad03b58dee 
					 
					
						
						
							
							tests for new task order endpoints, remove new workspace routes  
						
						
						
						
					 
					
						2018-12-18 13:22:54 -05:00 
						 
				 
			
				
					
						
							
							
								patricksmithdds 
							
						 
					 
					
						
						
							
						
						b6f9f39282 
					 
					
						
						
							
							Merge pull request  #501  from dod-ccpo/show-env-role-change  
						
						... 
						
						
						
						Show environment role name in audit log 
						
						
					 
					
						2018-12-18 13:20:57 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						0800e506e4 
					 
					
						
						
							
							Format changed file  
						
						
						
						
					 
					
						2018-12-18 11:32:21 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						628c61024b 
					 
					
						
						
							
							Remove intentional partial branch from coverage stats  
						
						
						
						
					 
					
						2018-12-18 11:32:00 -05:00 
						 
				 
			
				
					
						
							
							
								Patrick Smith 
							
						 
					 
					
						
						
							
						
						a63df5083d 
					 
					
						
						
							
							Show environment role name in audit log  
						
						
						
						
					 
					
						2018-12-18 11:16:02 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						4d834e65c7 
					 
					
						
						
							
							All conditions are met by this point; no branch really exists  
						
						
						
						
					 
					
						2018-12-18 11:14:19 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						9a12c14636 
					 
					
						
						
							
							domain methods for checking task order sections  
						
						
						
						
					 
					
						2018-12-18 10:51:37 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						2e2eff2e8e 
					 
					
						
						
							
							Remove intentional partial branch from coverage stats  
						
						
						
						
					 
					
						2018-12-18 10:46:51 -05:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						fa2cad3291 
					 
					
						
						
							
							Move logic about invite into Invitation model  
						
						
						
						
					 
					
						2018-12-18 10:38:26 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						b8dbfdfbaa 
					 
					
						
						
							
							Merge branch 'master' of github-DDS:dod-ccpo/atst into jrn_no_branch_coverage  
						
						
						
						
					 
					
						2018-12-18 10:14:14 -05:00 
						 
				 
			
				
					
						
							
							
								Jay R. Newlin (PromptWorks) 
							
						 
					 
					
						
						
							
						
						c5f878df24 
					 
					
						
						
							
							Merge pull request  #500  from dod-ccpo/jrn_fix_repr_exclusion  
						
						... 
						
						
						
						Adjust coverage and __repr__ method handling 
						
						
					 
					
						2018-12-18 10:11:18 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						c6686d70e8 
					 
					
						
						
							
							multistep task order workflow  
						
						
						
						
					 
					
						2018-12-18 09:44:02 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						c5580733ba 
					 
					
						
						
							
							fields for the new task order  
						
						
						
						
					 
					
						2018-12-18 09:44:02 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						6d92755a7f 
					 
					
						
						
							
							new workspace and task order routes  
						
						
						
						
					 
					
						2018-12-18 09:44:02 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						ff3b76ecc4 
					 
					
						
						
							
							Ignore __repr__ method for test coverage  
						
						
						
						
					 
					
						2018-12-17 18:09:17 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						f07d14339d 
					 
					
						
						
							
							Ignore __repr__ method for test coverage  
						
						
						
						
					 
					
						2018-12-17 18:06:04 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						929d143389 
					 
					
						
						
							
							Ignore __repr__ method for test coverage  
						
						
						
						
					 
					
						2018-12-17 18:03:29 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						16016e8bc7 
					 
					
						
						
							
							Ignore __repr__ method for test coverage  
						
						
						
						
					 
					
						2018-12-17 17:52:08 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						6adafeee45 
					 
					
						
						
							
							Ignore __repr__ method for test coverage  
						
						
						
						
					 
					
						2018-12-17 17:49:55 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						4db011b7ab 
					 
					
						
						
							
							Ignore __repr__ method for test coverage  
						
						
						
						
					 
					
						2018-12-17 17:45:29 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						c2ac43d0d3 
					 
					
						
						
							
							Remove exclude_lines, which decreases code coverage accuracy  
						
						
						
						
					 
					
						2018-12-17 17:41:06 -05:00 
						 
				 
			
				
					
						
							
							
								Jay Newlin (PW) 
							
						 
					 
					
						
						
							
						
						95f9e5a925 
					 
					
						
						
							
							Ignore false partial branch  
						
						
						
						
					 
					
						2018-12-17 17:38:27 -05:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						9597966bcd 
					 
					
						
						
							
							Update function to determine when invite can be resent and added lots of  
						
						... 
						
						
						
						tests 
						
						
					 
					
						2018-12-17 13:20:35 -05:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						3ca9d51b04 
					 
					
						
						
							
							Merge pull request  #491  from dod-ccpo/default-headers  
						
						... 
						
						
						
						Suggestions from http://flask.pocoo.org/docs/1.0/security/  
						
						
					 
					
						2018-12-17 12:00:09 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						dec14eee2d 
					 
					
						
						
							
							Merge pull request  #498  from dod-ccpo/lock-pytest  
						
						... 
						
						
						
						lock pytest for now 
						
						
					 
					
						2018-12-17 11:47:34 -05:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						15a32a1dc5 
					 
					
						
						
							
							Exclude set_default_headers from coverage report  
						
						
						
						
					 
					
						2018-12-17 11:42:27 -05:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						93af6116c2 
					 
					
						
						
							
							Add conditional so workspace invitation is only revokable if the user is active  
						
						
						
						
					 
					
						2018-12-17 10:11:57 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						d3fd32d7a0 
					 
					
						
						
							
							lock pytest for now  
						
						
						
						
					 
					
						2018-12-14 16:06:13 -05:00 
						 
				 
			
				
					
						
							
							
								Montana 
							
						 
					 
					
						
						
							
						
						57f648b720 
					 
					
						
						
							
							Add pagination to v-cloaked section  
						
						
						
						
					 
					
						2018-12-14 14:04:19 -05:00 
						 
				 
			
				
					
						
							
							
								Montana 
							
						 
					 
					
						
						
							
						
						8c2a35c7ca 
					 
					
						
						
							
							Add v-cloak to all tables and charts  
						
						
						
						
					 
					
						2018-12-14 13:53:04 -05:00 
						 
				 
			
				
					
						
							
							
								montana-mil 
							
						 
					 
					
						
						
							
						
						eb873d0fda 
					 
					
						
						
							
							Merge pull request  #486  from dod-ccpo/table-loading  
						
						... 
						
						
						
						Members List Showing Markup 
						
						
					 
					
						2018-12-14 13:21:15 -05:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						81f648c15e 
					 
					
						
						
							
							Merge pull request  #496  from  dod-ccpo/workspace-num-of-users-#162648520  
						
						... 
						
						
						
						Update Workspace user_count exclude disabled users 
						
						
					 
					
						2018-12-14 13:16:37 -05:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						7c5a9df4bb 
					 
					
						
						
							
							Update Workspace user_count exclude disabled users  
						
						
						
						
					 
					
						2018-12-14 11:28:23 -05:00 
						 
				 
			
				
					
						
							
							
								patricksmithdds 
							
						 
					 
					
						
						
							
						
						090d6470f8 
					 
					
						
						
							
							Merge pull request  #494  from dod-ccpo/fix-pipenv-deps  
						
						... 
						
						
						
						Fix conflicting pipenv dependencies 
						
						
					 
					
						2018-12-14 11:06:54 -05:00 
						 
				 
			
				
					
						
							
							
								Patrick Smith 
							
						 
					 
					
						
						
							
						
						88339e9d36 
					 
					
						
						
							
							Use updated pip when building on CircleCI  
						
						
						
						
					 
					
						2018-12-14 10:39:15 -05:00 
						 
				 
			
				
					
						
							
							
								Patrick Smith 
							
						 
					 
					
						
						
							
						
						9370029058 
					 
					
						
						
							
							Update pipfile.lock  
						
						
						
						
					 
					
						2018-12-13 16:27:29 -05:00 
						 
				 
			
				
					
						
							
							
								patricksmithdds 
							
						 
					 
					
						
						
							
						
						27b2e61c65 
					 
					
						
						
							
							Merge pull request  #493  from dod-ccpo/run-js-tests-in-script  
						
						... 
						
						
						
						Run JS tests in "script/test" 
						
						
					 
					
						2018-12-13 16:14:37 -05:00 
						 
				 
			
				
					
						
							
							
								Patrick Smith 
							
						 
					 
					
						
						
							
						
						41f98cf726 
					 
					
						
						
							
							Pin rq-scheduler dependency to resolve dependency conflict  
						
						... 
						
						
						
						The latest version of `flask-rq2` depends on:
* rq-scheduler>=0.8.3
* rq>=0.12,<0.13
Previously, `rq-scheduler` (0.8.3) requires:
* rq>=0.8
A recent release of `rq-scheduler`, 0.9 requires:
* rq>=0.13
`rq-scheduler`'s requirement conflicts directly with `flask-rq2`'s
version requirement of `rq`.
Manully pinning `rq-scheduler` to `>=0.8.3,<0.9` causes `0.8.3` to be
installed, so both dependencies can be satisfied. 
						
						
					 
					
						2018-12-13 16:07:27 -05:00 
						 
				 
			
				
					
						
							
							
								Patrick Smith 
							
						 
					 
					
						
						
							
						
						98d08cb255 
					 
					
						
						
							
							Run JS tests in "script/test"  
						
						
						
						
					 
					
						2018-12-13 15:52:24 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						76c3bb2bd5 
					 
					
						
						
							
							Merge pull request  #489  from dod-ccpo/legacy-task-orders  
						
						... 
						
						
						
						change current task order name 
						
						
					 
					
						2018-12-13 15:50:39 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						e7ee2b3f43 
					 
					
						
						
							
							Merge pull request  #488  from  dod-ccpo/workspace-role-change-bug-#162345640  
						
						... 
						
						
						
						Workspace role change bug #162345640  
						
						
					 
					
						2018-12-13 14:29:46 -05:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						3bff2fcb23 
					 
					
						
						
							
							Format code  
						
						
						
						
					 
					
						2018-12-13 13:59:54 -05:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						ec09c27a38 
					 
					
						
						
							
							On fix unsafe-eval header and websockets on development  
						
						
						
						
					 
					
						2018-12-13 13:54:19 -05:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						c8bdf57ecd 
					 
					
						
						
							
							Merge pull request  #492  from  dod-ccpo/confirmation-for-workspace-revokation-#162348648  
						
						... 
						
						
						
						Change copy when workspace access is revoked 
						
						
					 
					
						2018-12-13 13:42:29 -05:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						c90550b647 
					 
					
						
						
							
							resolve migration chain  
						
						
						
						
					 
					
						2018-12-13 11:38:12 -05:00