leigh-mil 
							
						 
					 
					
						
						
							
						
						a9535edf3a 
					 
					
						
						
							
							Merge pull request  #855  from dod-ccpo/update-to-table  
						
						... 
						
						
						
						Update TO table 
						
						
					 
					
						2019-05-31 13:23:16 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						1784318e0e 
					 
					
						
						
							
							Update seed_sample with new TO info  
						
						
						
						
					 
					
						2019-05-31 13:07:03 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						7bec073f78 
					 
					
						
						
							
							Delete things related to deleted columns and table  
						
						
						
						
					 
					
						2019-05-31 13:07:03 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						fbfb04d763 
					 
					
						
						
							
							Update task order table and remove dd254  
						
						
						
						
					 
					
						2019-05-31 13:07:03 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						d3ba997106 
					 
					
						
						
							
							Merge pull request  #854  from dod-ccpo/environment-application-roles  
						
						... 
						
						
						
						Use application_role_id on environment_roles. 
						
						
					 
					
						2019-05-31 12:59:20 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						df06d1b62f 
					 
					
						
						
							
							Use application_role_id on environment_roles.  
						
						... 
						
						
						
						In the future, an `application_invitation1 will not refer to a `user` until
someone accepts the invitation; they'll only reference an
`application_role`. When a user is invited to an application, the
inviter can specify the environments the invitee should have access to.
For this to be possible, an `environment_role` should reference an
`application_role`, because no `user` entity will be known at that time.
In addition to updating all the models and domain methods necessary for
this change, this commit deletes unused code and tests that were
dependent on `environment_roles` having a `user_id` foreign key. 
						
						
					 
					
						2019-05-31 11:21:20 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						f6698b3880 
					 
					
						
						
							
							Merge pull request  #852  from dod-ccpo/portfolio-landing  
						
						... 
						
						
						
						/home no longer redirects and has add portfolio button 
						
						
					 
					
						2019-05-30 11:11:57 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						83adf1295c 
					 
					
						
						
							
							/home no longer redirects and has add portfolio button  
						
						
						
						
					 
					
						2019-05-30 09:33:33 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						c683a120e4 
					 
					
						
						
							
							Merge pull request  #850  from dod-ccpo/keep-alembic-version  
						
						... 
						
						
						
						Keep alembic_version table 
						
						
					 
					
						2019-05-29 16:43:39 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						6a504fdf89 
					 
					
						
						
							
							Merge pull request  #834  from dod-ccpo/limit-concurrent-logins  
						
						... 
						
						
						
						Prevent multiple active sessions 
						
						
					 
					
						2019-05-29 16:19:58 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						fc01fa6522 
					 
					
						
						
							
							Merge pull request  #849  from dod-ccpo/fix-remove-port-member  
						
						... 
						
						
						
						Fix removing portfolio member 
						
						
					 
					
						2019-05-29 16:12:33 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						9b3775291e 
					 
					
						
						
							
							Remove redundant make_session_limiter  
						
						
						
						
					 
					
						2019-05-29 16:05:52 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						857cd2adc1 
					 
					
						
						
							
							Merge pull request  #848  from dod-ccpo/logout-flash  
						
						... 
						
						
						
						Display a flash message when a user logs out 
						
						
					 
					
						2019-05-29 16:02:06 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						7e8407ba1d 
					 
					
						
						
							
							Use portfolio_role_id in delete member url instead of user_id  
						
						
						
						
					 
					
						2019-05-29 15:59:19 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						1b217113d4 
					 
					
						
						
							
							Keep alembic_version table  
						
						
						
						
					 
					
						2019-05-29 11:40:23 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						d755d30175 
					 
					
						
						
							
							Merge pull request  #847  from dod-ccpo/delete-member-regression  
						
						... 
						
						
						
						Fix deleting application members from the team page 
						
						
					 
					
						2019-05-29 11:05:03 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						c653cf2dbf 
					 
					
						
						
							
							Display a flash message when a user logs out  
						
						
						
						
					 
					
						2019-05-28 16:55:52 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						454181665c 
					 
					
						
						
							
							Fix deleting application members from the team page  
						
						
						
						
					 
					
						2019-05-28 15:41:31 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						d82fd46a3c 
					 
					
						
						
							
							Mock out g in logging utils test.  
						
						... 
						
						
						
						This gives us better test isolation. Previously, we were manually
setting `g.current_user` with a factory instance and not cleaning it up
properly, which could break later tests. 
						
						
					 
					
						2019-05-28 15:04:03 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						227feab972 
					 
					
						
						
							
							Merge pull request  #846  from dod-ccpo/fix-seed-sample-script  
						
						... 
						
						
						
						Just clean out tables for seed sample reset 
						
						
					 
					
						2019-05-28 14:08:37 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						0a8868ca37 
					 
					
						
						
							
							Just clean out tables for seed sample reset  
						
						
						
						
					 
					
						2019-05-28 13:31:55 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						96ae1bba9d 
					 
					
						
						
							
							Merge pull request  #845  from dod-ccpo/app-settings-role-id  
						
						... 
						
						
						
						Use role ID for app settings table 
						
						
					 
					
						2019-05-28 11:43:56 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						a56d9c9ca8 
					 
					
						
						
							
							Fix migration path  
						
						
						
						
					 
					
						2019-05-28 10:50:38 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						d2392cb3d0 
					 
					
						
						
							
							Fix test  
						
						
						
						
					 
					
						2019-05-28 10:45:36 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						8fae9d0956 
					 
					
						
						
							
							Tests for session_limiter  
						
						
						
						
					 
					
						2019-05-28 10:45:36 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						5fe895e109 
					 
					
						
						
							
							Id() column type is for primary keys  
						
						
						
						
					 
					
						2019-05-28 10:45:36 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						7aa238c59f 
					 
					
						
						
							
							Remove last_session_id server_default  
						
						
						
						
					 
					
						2019-05-28 10:45:36 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						888d41f484 
					 
					
						
						
							
							Formatting  
						
						
						
						
					 
					
						2019-05-28 10:45:36 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						9291ea497c 
					 
					
						
						
							
							Fix migration path  
						
						
						
						
					 
					
						2019-05-28 10:45:12 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						5dcbee333a 
					 
					
						
						
							
							Make session limiter configurable  
						
						
						
						
					 
					
						2019-05-28 10:45:12 -04:00 
						 
				 
			
				
					
						
							
							
								richard-dds 
							
						 
					 
					
						
						
							
						
						e037c81338 
					 
					
						
						
							
							Only allow one session  
						
						
						
						
					 
					
						2019-05-28 10:44:40 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						43ea922218 
					 
					
						
						
							
							Simplify environment role updates in app settings.  
						
						... 
						
						
						
						Use ApplicationRole.id instead of User.id in forms. This eliminates the
need for the function that checks whether a user is in a given
application, because looking up the application role will raise an error
if the user is not. 
						
						
					 
					
						2019-05-24 13:35:00 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						129f5e3031 
					 
					
						
						
							
							Rewrite function that builds form data for app environment roles form.  
						
						... 
						
						
						
						- Adds a property to ApplicationRole model so that it knows its related
  EnvironmentRole models.
- Rewrite the form data builder in the routes file so that it loops the
  application members and their environment roles to build the data
  structure. 
						
						
					 
					
						2019-05-24 13:34:53 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						48fbc1c997 
					 
					
						
						
							
							Merge pull request  #840  from dod-ccpo/update-team-members-count  
						
						... 
						
						
						
						Update team members number on app index page 
						
						
					 
					
						2019-05-24 10:15:28 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						7f745302ec 
					 
					
						
						
							
							Merge pull request  #843  from dod-ccpo/app-team-role-id  
						
						... 
						
						
						
						Use application_role.id to reference users in team page forms. 
						
						
					 
					
						2019-05-23 11:14:33 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						8980b04f7e 
					 
					
						
						
							
							Filter the roles relationship on applications to remove deleted roles  
						
						
						
						
					 
					
						2019-05-23 11:07:54 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						a332d1432e 
					 
					
						
						
							
							Use application_role.id to reference users in team page forms.  
						
						... 
						
						
						
						Membership in a resource should be decoupled from the users table. 
						
						
					 
					
						2019-05-23 10:13:57 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						4c4796ecc3 
					 
					
						
						
							
							Merge pull request  #841  from dod-ccpo/ppoc-role-id  
						
						... 
						
						
						
						Use portfolio_role.id for updating primary point of contact. 
						
						
					 
					
						2019-05-23 10:11:33 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						86e315e56f 
					 
					
						
						
							
							Use members in application.users instead of roles  
						
						
						
						
					 
					
						2019-05-23 09:51:32 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						422f9b5298 
					 
					
						
						
							
							Merge pull request  #842  from dod-ccpo/fix-remove-sample-script  
						
						... 
						
						
						
						Fix remove sample script 
						
						
					 
					
						2019-05-23 09:37:49 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						9412ccffea 
					 
					
						
						
							
							Reorder items to delete so that join models are deleted before the models they join  
						
						... 
						
						
						
						Add application invitations to list of items to be deleted
Clean up reference to workspace 
						
						
					 
					
						2019-05-22 19:41:30 -04:00 
						 
				 
			
				
					
						
							
							
								dandds 
							
						 
					 
					
						
						
							
						
						e3ace36466 
					 
					
						
						
							
							Use portfolio_role.id for updating primary point of contact.  
						
						... 
						
						
						
						Our forms should rely on role IDs for displaying user information on the
portfolio page. This way they are decoupled from user table data and can
eventually rely on invitation user data where an invitation has been
sent but a user does not exist yet. 
						
						
					 
					
						2019-05-22 15:59:04 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						da6ac57812 
					 
					
						
						
							
							Merge pull request  #836  from dod-ccpo/sidebar  
						
						... 
						
						
						
						Applications users were invited to were not showing in the portfolios sidebar 
						
						
					 
					
						2019-05-22 15:22:05 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						41e2d14e7d 
					 
					
						
						
							
							Use sqlalchemy or_  
						
						
						
						
					 
					
						2019-05-22 15:17:31 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						4df975acf9 
					 
					
						
						
							
							Merge pull request  #832  from dod-ccpo/add-app-audit-log  
						
						... 
						
						
						
						Add app audit log 
						
						
					 
					
						2019-05-22 15:07:47 -04:00 
						 
				 
			
				
					
						
							
							
								montana-mil 
							
						 
					 
					
						
						
							
						
						2de4d1477a 
					 
					
						
						
							
							Merge pull request  #837  from dod-ccpo/default-env-roles-for-app-users  
						
						... 
						
						
						
						Use No Access as default role value for app users 
						
						
					 
					
						2019-05-22 15:07:27 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						bb4b52c6ac 
					 
					
						
						
							
							Add in missing route  
						
						
						
						
					 
					
						2019-05-22 13:46:49 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						b61f304bad 
					 
					
						
						
							
							Make one query  
						
						
						
						
					 
					
						2019-05-22 13:32:13 -04:00 
						 
				 
			
				
					
						
							
							
								George Drummond 
							
						 
					 
					
						
						
							
						
						9098bc7c0b 
					 
					
						
						
							
							Reduce number of queries performed during the lookup  
						
						
						
						
					 
					
						2019-05-22 13:24:57 -04:00 
						 
				 
			
				
					
						
							
							
								leigh-mil 
							
						 
					 
					
						
						
							
						
						7756ab8c28 
					 
					
						
						
							
							Notes about unused methods that need more research  
						
						
						
						
					 
					
						2019-05-22 13:12:48 -04:00