| 
							
							
								 richard-dds | 62c794e7b8 | Merge pull request #885 from dod-ccpo/fix-member-remove Fix error when removing application member | 2019-06-10 17:03:04 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 6481b2ee3e | Remove unused import | 2019-06-10 16:55:20 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 8bef203bf2 | We can get the user's name from their invitation | 2019-06-10 16:49:09 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 30ef2a67ef | Fix bug in application member deletion | 2019-06-10 16:43:47 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 0bd9d4bbb6 | Merge pull request #884 from dod-ccpo/to-funding-statuses Funding page Task Order statuses | 2019-06-10 15:40:25 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | ee46fb2320 | Formatting | 2019-06-10 15:34:01 -04:00 |  | 
			
				
					| 
							
							
								 George Drummond | c03fcb40b3 | Merge pull request #878 from dod-ccpo/logout-expire Logout message on session expiration visiting /logout | 2019-06-10 15:33:35 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 40b599d1d0 | Fix rebase conflicts | 2019-06-10 15:33:30 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 5339fd34d5 | Remove another unused import | 2019-06-10 15:16:26 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 48d4b466b1 | Formatting | 2019-06-10 15:16:26 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | c4d02bb026 | Remove unused imports | 2019-06-10 15:16:26 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | a2d201e43b | Use UTC tz for determining TO status | 2019-06-10 15:16:26 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 6eb64d4aae | Add test for TaskOrders.sort | 2019-06-10 15:16:26 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 373e802b46 | Formatting | 2019-06-10 15:16:02 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 1cb673af53 | Proper colors for TO statuses | 2019-06-10 15:16:02 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 7f4f857424 | Sort task orders by status and time_created | 2019-06-10 15:16:02 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | e84e61bbad | Update seed script with TOs of various statuses | 2019-06-10 15:15:39 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | fd159a2d80 | Remove start_time assertion | 2019-06-10 15:15:39 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 0f4d17a94a | Implemen TaskOrder.is_completed | 2019-06-10 15:15:39 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 8ecf112c48 | Implement new CLIN-based TO statuses | 2019-06-10 15:15:08 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 7b8ccbf145 | Implement TO start_date and end_date | 2019-06-10 15:15:08 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 898f63a2f5 | Fix CLINFactory | 2019-06-10 15:15:08 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | ad385b9de9 | Merge pull request #863 from dod-ccpo/add-clin-to-form Add CLIN fields to Task Order Form | 2019-06-10 15:11:38 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | f85af06297 | Use number instead of array to add new CLIN fields | 2019-06-10 14:34:10 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | 00f323f9f5 | Only call commit() once and use translations in template | 2019-06-10 14:09:31 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | 46cd8f3762 | Fix tests and formatting | 2019-06-10 12:36:57 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | 42970ded6f | Render pdf in existing TO | 2019-06-10 12:29:54 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | 732830a500 | Fix form so TO saves properly | 2019-06-10 12:29:54 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | 454643c3c9 | Post rebase fixes | 2019-06-10 12:29:54 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | 61d7bc92d8 | Update new CLIN fields so they post data properly | 2019-06-10 12:29:54 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | e017cd12af | Vue for adding multiple CLINs | 2019-06-10 12:29:54 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | cca101b50c | Add CLINs to Task Order | 2019-06-10 12:29:54 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | 36200e01ad | Create CLINs when creating a TO | 2019-06-10 12:29:54 -04:00 |  | 
			
				
					| 
							
							
								 leigh-mil | 633e1b6a37 | Update TO Form to include CLINs and LOAs | 2019-06-10 12:29:54 -04:00 |  | 
			
				
					| 
							
							
								 montana-mil | 9fa4292736 | Merge pull request #875 from dod-ccpo/sticky-header-to-review Add Sticky Header to Task Order Review Page | 2019-06-10 11:57:35 -04:00 |  | 
			
				
					| 
							
							
								 Montana | 9df1905385 | Fix issues with elements overlapping sticky header | 2019-06-10 11:32:43 -04:00 |  | 
			
				
					| 
							
							
								 Montana | 4e005ad98c | Fix totals box background height | 2019-06-10 11:32:43 -04:00 |  | 
			
				
					| 
							
							
								 Montana | 80c6942c3b | Sticky header button styling | 2019-06-10 11:32:43 -04:00 |  | 
			
				
					| 
							
							
								 Montana | 2870d551ee | Move semi collapsible text to a template component | 2019-06-10 11:32:43 -04:00 |  | 
			
				
					| 
							
							
								 Montana | 88efd0071b | Show Funding in navigation as blue when user is on TO flow | 2019-06-10 11:32:43 -04:00 |  | 
			
				
					| 
							
							
								 Montana | f89424b217 | Sticky styling | 2019-06-10 11:32:43 -04:00 |  | 
			
				
					| 
							
							
								 George Drummond | f3821f8d61 | Merge pull request #881 from dod-ccpo/ci-config-test Remove CircleCI cache for now | 2019-06-10 11:31:32 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 99abf011d7 | Remove CircleCI cache for now | 2019-06-10 11:25:00 -04:00 |  | 
			
				
					| 
							
							
								 George Drummond | 5226736de4 | Logout message on session expiration visiting /logout | 2019-06-10 11:18:42 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 1626ee745e | Merge pull request #879 from dod-ccpo/ci-config-test Ci config update | 2019-06-10 11:15:02 -04:00 |  | 
			
				
					| 
							
							
								 dandds | b7b07ce89c | Simpler CircleCI config for CI. This relies on a CircleCI-supplied base image and removes CD for now. | 2019-06-10 10:48:59 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 632920219d | Merge pull request #876 from dod-ccpo/home-page Home page | 2019-06-10 08:52:34 -04:00 |  | 
			
				
					| 
							
							
								 dandds | d0c8d0e519 | Merge pull request #874 from dod-ccpo/to-uploader Task order uploader | 2019-06-07 10:32:30 -04:00 |  | 
			
				
					| 
							
							
								 dandds | a80d1f8e86 | Portfolio home page. Makes some minor, necessary adjustments to the stylesheet. | 2019-06-06 17:11:42 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 89b798b54a | Only show portfolio sidebar nav if the user has portfolios | 2019-06-06 14:34:43 -04:00 |  |