Montana 
							
						 
					 
					
						
						
							
						
						41818d7955 
					 
					
						
						
							
							Toggle on click  
						
						 
						
						... 
						
						
						
						- New copy to the translations file
- CSS is not updated 
						
						
					 
					
						2019-05-14 11:45:39 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						4aea264026 
					 
					
						
						
							
							Avoid double lookup  
						
						 
						
						
						
						
					 
					
						2019-05-14 11:37:33 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						4c2b6c331b 
					 
					
						
						
							
							Merge pull request  #799  from dod-ccpo/edit-env-form-view-part-2  
						
						 
						
						... 
						
						
						
						Edit env form view part 2 
						
						
					 
					
						2019-05-14 11:14:46 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						27a4ef12c6 
					 
					
						
						
							
							Delete an application member  
						
						 
						
						
						
						
					 
					
						2019-05-14 11:07:08 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						c5e85c4f1e 
					 
					
						
						
							
							Rebase fix  
						
						 
						
						
						
						
					 
					
						2019-05-14 11:05:40 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						547d813970 
					 
					
						
						
							
							Merge pull request  #818  from dod-ccpo/remove-unused-constant  
						
						 
						
						... 
						
						
						
						Remove unused constant 
						
						
					 
					
						2019-05-14 11:03:07 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						4206aa8a59 
					 
					
						
						
							
							Use member.role_name in template and JS  
						
						 
						
						... 
						
						
						
						change name of data from roles to rolesCategory to make less confusing 
						
						
					 
					
						2019-05-14 11:00:14 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						546e04555d 
					 
					
						
						
							
							Update role div height  
						
						 
						
						... 
						
						
						
						Move serialization into the route
change member.role to member.role_name in form and route
Return 400 for invalid form submission 
						
						
					 
					
						2019-05-14 11:00:14 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						fd84e902e3 
					 
					
						
						
							
							Use is rather than ==  
						
						 
						
						
						
						
					 
					
						2019-05-14 11:00:14 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						a35349cc88 
					 
					
						
						
							
							Set ToggleSection macro "classes" default  
						
						 
						
						
						
						
					 
					
						2019-05-14 11:00:14 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						3a2e2aa878 
					 
					
						
						
							
							Wip tests  
						
						 
						
						
						
						
					 
					
						2019-05-14 11:00:14 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						e0872d1095 
					 
					
						
						
							
							Move text to translations file  
						
						 
						
						
						
						
					 
					
						2019-05-14 11:00:14 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						be178733cf 
					 
					
						
						
							
							Add note about future refactoring  
						
						 
						
						
						
						
					 
					
						2019-05-14 10:58:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						8c6aa77431 
					 
					
						
						
							
							Move edit env team form into its own file  
						
						 
						
						
						
						
					 
					
						2019-05-14 10:58:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						319cc17c1c 
					 
					
						
						
							
							Start vue component for edit-environment-role  
						
						 
						
						
						
						
					 
					
						2019-05-14 10:58:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						addf2e97a1 
					 
					
						
						
							
							Update form to nest all envs in one form  
						
						 
						
						
						
						
					 
					
						2019-05-14 10:58:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						060c6834bf 
					 
					
						
						
							
							Add save button and temp member role toggle to env member form  
						
						 
						
						
						
						
					 
					
						2019-05-14 10:58:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						aab01b3947 
					 
					
						
						
							
							Remove save button and move footer into file with env panel  
						
						 
						
						
						
						
					 
					
						2019-05-14 10:58:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								leigh-mil 
							
						 
					 
					
						
						
							
						
						4c40c9238e 
					 
					
						
						
							
							Sort env members by role  
						
						 
						
						
						
						
					 
					
						2019-05-14 10:58:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						dc629192df 
					 
					
						
						
							
							Remove unused constant  
						
						 
						
						
						
						
					 
					
						2019-05-14 10:53:54 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						a4156507d3 
					 
					
						
						
							
							Merge pull request  #814  from dod-ccpo/delete-environment-translations  
						
						 
						
						... 
						
						
						
						Add in missing "delete environment" translations 
						
						
					 
					
						2019-05-14 10:25:05 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rachel-dtr 
							
						 
					 
					
						
						
							
						
						5244b6a14f 
					 
					
						
						
							
							Merge pull request  #812  from dod-ccpo/content-updates  
						
						 
						
						... 
						
						
						
						Updating content across the site 
						
						
					 
					
						2019-05-13 16:59:05 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						1f0b48703c 
					 
					
						
						
							
							Pass in resource as a variable  
						
						 
						
						
						
						
					 
					
						2019-05-13 09:48:28 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						3544386670 
					 
					
						
						
							
							Add in missing "delete environment" translations  
						
						 
						
						
						
						
					 
					
						2019-05-13 09:43:54 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						0a52cd0144 
					 
					
						
						
							
							Update csrf test for updated content  
						
						 
						
						
						
						
					 
					
						2019-05-13 09:35:31 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						74422c57aa 
					 
					
						
						
							
							Use common "View" for translations  
						
						 
						
						... 
						
						
						
						-also pipe translate in injected html for a flash 
						
						
					 
					
						2019-05-13 09:28:47 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						26efc77561 
					 
					
						
						
							
							Merge pull request  #813  from dod-ccpo/clin-total-not-updating  
						
						 
						
						... 
						
						
						
						Fix issue with CLIN changes not updating funding total 
						
						
					 
					
						2019-05-10 14:43:19 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						951ef9212d 
					 
					
						
						
							
							Fix issue with CLIN changes not updating funding total  
						
						 
						
						
						
						
					 
					
						2019-05-10 13:16:08 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rachel-dtr 
							
						 
					 
					
						
						
							
						
						39a0716028 
					 
					
						
						
							
							Updating content across the site  
						
						 
						
						
						
						
					 
					
						2019-05-10 10:28:02 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						2435f91b13 
					 
					
						
						
							
							Merge pull request  #809  from dod-ccpo/resource-finder  
						
						 
						
						... 
						
						
						
						Resource finder 
						
						
					 
					
						2019-05-10 06:07:45 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						d3b775150c 
					 
					
						
						
							
							Merge pull request  #811  from dod-ccpo/app-team-form-submit  
						
						 
						
						... 
						
						
						
						App team form submit 
						
						
					 
					
						2019-05-09 11:00:51 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						2d99b5cfc5 
					 
					
						
						
							
							Permission-check for templates accounts for all permission levels.  
						
						 
						
						... 
						
						
						
						`user_can` function built for Jinja template contexts should check
application, portfolio, and atat level permissions depending on what
resources are available on `g`. 
						
						
					 
					
						2019-05-08 13:25:38 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						4afa88a3b2 
					 
					
						
						
							
							Move application team permissions form.  
						
						 
						
						... 
						
						
						
						The submit input needs to be inside the form to work on IE 10. 
						
						
					 
					
						2019-05-08 11:24:13 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						457b1f9523 
					 
					
						
						
							
							Detangle the MultiStepModalForm modal-open link from the modal.  
						
						 
						
						... 
						
						
						
						In order to place modal forms in other places on the page (so that forms
are not nested) it's necessary to move MultiStepModalForm links out of
the component. They just need to refer to the correct modal.
This PR also makes changes to ensure that the active modal is being
unset everywhere correctly when a modal is closed. 
						
						
					 
					
						2019-05-08 11:16:56 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						f52f2a9ade 
					 
					
						
						
							
							Merge pull request  #810  from dod-ccpo/empty-state-app-member  
						
						 
						
						... 
						
						
						
						Add new application members to an empty application. 
						
						
					 
					
						2019-05-07 16:54:44 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						f974dab330 
					 
					
						
						
							
							Add new application members to an empty application.  
						
						 
						
						... 
						
						
						
						The link button to add a new application member to an app that did not
have any ("empty state")  was not wired up. This:
- Moves the two steps of the new member modal into macros so that they
  can be reused with different button/link types
- Wires the "invite a new team member" button on the application team
  page
- Makes a minor CSS tweak so that icons nested under `.empty-state` in
  the modal aren't enormous 
						
						
					 
					
						2019-05-07 16:47:45 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								montana-mil 
							
						 
					 
					
						
						
							
						
						fb7efc6057 
					 
					
						
						
							
							Merge pull request  #801  from dod-ccpo/app-team-permissions  
						
						 
						
						... 
						
						
						
						Application Team Table Permissions 
						
						
					 
					
						2019-05-07 16:27:23 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						644acc68fa 
					 
					
						
						
							
							Refactor application team routes  
						
						 
						
						... 
						
						
						
						- pulling out helper functions for constructing forms
- return 400 for form validation errors
- "Yes" appears green on the read only version 
						
						
					 
					
						2019-05-07 16:21:17 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						d5307b440f 
					 
					
						
						
							
							Make user_id required and add post tests  
						
						 
						
						... 
						
						
						
						- raise an exception in ApplicationRoles.get()
- permission_sets is not changed if bad data is sent 
						
						
					 
					
						2019-05-07 16:21:17 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rachel-dtr 
							
						 
					 
					
						
						
							
						
						298681598b 
					 
					
						
						
							
							Merge pull request  #807  from dod-ccpo/content-cleanup  
						
						 
						
						... 
						
						
						
						Cleaning up content 
						
						
					 
					
						2019-05-07 11:00:22 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						d9ed8ed2f1 
					 
					
						
						
							
							Merge pull request  #806  from dod-ccpo/delete-environment  
						
						 
						
						... 
						
						
						
						Delete environments from an application 
						
						
					 
					
						2019-05-07 10:18:32 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						09c0bed47d 
					 
					
						
						
							
							Move edit form outside of the for loop  
						
						 
						
						
						
						
					 
					
						2019-05-07 09:37:53 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						2a9de4f3b9 
					 
					
						
						
							
							Match the orders of the permissions everywhere  
						
						 
						
						
						
						
					 
					
						2019-05-07 09:35:38 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						1a2051b2bf 
					 
					
						
						
							
							Don't store empty strings as perm values  
						
						 
						
						
						
						
					 
					
						2019-05-07 09:33:42 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Montana 
							
						 
					 
					
						
						
							
						
						526bcb1661 
					 
					
						
						
							
							Update tests  
						
						 
						
						
						
						
					 
					
						2019-05-07 09:31:04 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						3c1f4ac6df 
					 
					
						
						
							
							Standardize token argument in routes.  
						
						 
						
						... 
						
						
						
						- `token` becomes `portfolio_token` in routes.
- Find relevant portfolio from token in `before_request` hook, like
  other routes. 
						
						
					 
					
						2019-05-06 16:35:33 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dandds 
							
						 
					 
					
						
						
							
						
						42b912d4cb 
					 
					
						
						
							
							Look up major database resources in a before_request hook.  
						
						 
						
						... 
						
						
						
						A `before_request` hook queries the database for portfolios, requests,
and task orders based on the route arguments. The resources are added as
attributes on `g`. The portfolio context processor and the access
decorator now rely on those resources being available on `g`.
WIP: find major resources in before_request hook, apply to g
WIP: use g.portfolio for portfolio context processor
WIP: the access decorator should rely on the resources being available on g 
						
						
					 
					
						2019-05-06 16:32:55 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rachel-dtr 
							
						 
					 
					
						
						
							
						
						dbdaf376a0 
					 
					
						
						
							
							Cleaning up content  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:22:17 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						f314e9238d 
					 
					
						
						
							
							Fix button copy  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:21:27 -04:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Drummond 
							
						 
					 
					
						
						
							
						
						ef23b1d776 
					 
					
						
						
							
							Move to a component  
						
						 
						
						
						
						
					 
					
						2019-05-06 15:18:53 -04:00