| 
							
							
								 Andrew Croce | f7e2a71f3d | add line break | 2018-10-02 12:46:29 -04:00 |  | 
			
				
					| 
							
							
								 patricksmithdds | f47255ee91 | Merge pull request #365 from dod-ccpo/reduce-alerts-on-financial-form Reduce alerts on financial form | 2018-10-02 12:38:43 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | 8561ec0c55 | typo | 2018-10-02 12:06:10 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | 64187a4db3 | typo | 2018-10-02 11:48:26 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | 25e19c0f52 | Hide DEV login button for demo | 2018-10-02 11:37:51 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | 943be0707d | Add USA header to base templates | 2018-10-02 11:14:39 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | ad49d3f71f | Merge pull request #359 from dod-ccpo/task-order-expiration Fix report display for task order with no expiration date | 2018-10-02 10:11:28 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | 0ce2960a0e | add help link to manual TO alert | 2018-10-02 08:37:07 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | 358e66f7f3 | only show the error alert if TO isn't the only error | 2018-10-02 08:32:32 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | d4ae9763ed | Update the alert content when viewing the extended financial form | 2018-10-02 08:32:06 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | d4b0941622 | Only display info alert if there arent errors or extended form info to show | 2018-10-02 08:31:37 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 21222cd0f6 | Merge pull request #360 from dod-ccpo/redirect-after-login-#160851186 Redirect after login #160851186 | 2018-10-01 16:35:44 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 8db53f5985 | Merge pull request #357 from dod-ccpo/audit-log-extra-info Display user name and workspace name in audit log | 2018-10-01 16:18:58 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | fc754250dd | Check that remaining_days is not None | 2018-10-01 16:17:38 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 9f4b284d6c | add login redirect query param to login button | 2018-10-01 16:16:30 -04:00 |  | 
			
				
					| 
							
							
								 andrewdds | fdedab817b | Merge pull request #361 from dod-ccpo/ui/activity-log-icon Replace icon for activity history | 2018-10-01 15:44:34 -04:00 |  | 
			
				
					| 
							
							
								 patricksmithdds | 4b98c4c7db | Merge pull request #356 from dod-ccpo/show-acceptance-modal-on-requests-index Show acceptance modal on requests index | 2018-10-01 15:39:18 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | a0c1795e4e | Add missing icons to styleguide | 2018-10-01 15:27:07 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | bb6e90ef82 | Use time icon for activity history | 2018-10-01 15:26:54 -04:00 |  | 
			
				
					| 
							
							
								 andrewdds | df6a0527c3 | Merge pull request #355 from dod-ccpo/ui/ie-fixes IE fixes | 2018-10-01 14:56:38 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | d0f4e34263 | Display request id and displayname as well | 2018-10-01 14:39:33 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 1750c268f7 | Fix report display for task order with no expiration date | 2018-10-01 13:32:01 -04:00 |  | 
			
				
					| 
							
							
								 dandds | cbcd61c018 | Merge pull request #352 from dod-ccpo/hide-pdf-#160757166 hide PDF link when PDF download is not available | 2018-10-01 13:26:04 -04:00 |  | 
			
				
					| 
							
							
								 montana-mil | 388ff899a2 | Merge pull request #343 from dod-ccpo/more-tests-for-workspaces Add more tests for workspaces routes | 2018-10-01 13:23:47 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 3374d8b549 | Show workspace info, along with name, on second line | 2018-10-01 11:39:08 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | 82c5941ab5 | Add title to fin-ver alert modal | 2018-10-01 11:14:43 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | d823b923a2 | Show modal when submitted request is pending acceptance | 2018-10-01 11:14:43 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | 4577a37bad | Hide edit project link for users that cannot edit projects | 2018-09-30 22:23:52 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | aa42f5671c | Don't show workspace nav items the user doesn't have access to | 2018-09-30 22:19:26 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 6245ab3f5e | hide PDF link when PDF download is not available | 2018-09-28 14:21:12 -04:00 |  | 
			
				
					| 
							
							
								 Montana | 927741eb73 | Add a warning on edit project page | 2018-09-28 10:05:20 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | 6400e85664 | Merge branch 'master' into demo-fixes | 2018-09-28 09:55:43 -04:00 |  | 
			
				
					| 
							
							
								 patricksmithdds | 3f5790325b | Merge pull request #344 from dod-ccpo/ui/text-fixes Text fixes | 2018-09-28 09:50:48 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | 2d7d97a03c | Expand review form if there are errors | 2018-09-28 09:48:41 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | a859af9eea | Pass in request as jedi_requestin request detail templateFixes the user sessions/daily traffic fields not being shown when they
should be. | 2018-09-28 09:48:41 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | 7d7afebede | Update modal content for approval/acceptance | 2018-09-28 09:48:41 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | c88f2a1a56 | add missing fallback meter | 2018-09-27 11:46:42 -04:00 |  | 
			
				
					| 
							
							
								 Jason Garber - Ctr | 50dc4acfa5 | Grammar fix to 'no projects' message Just some capitalization and compound word fixes. | 2018-09-26 13:56:28 -04:00 |  | 
			
				
					| 
							
							
								 Luis Cielak | 4fc5ba7629 | Fix how the heading is displayed | 2018-09-26 11:34:25 -04:00 |  | 
			
				
					| 
							
							
								 richard-dds | 0a8c488f1e | Merge pull request #341 from dod-ccpo/ui/clean-up-audit-log Initial audit log UI cleanup | 2018-09-26 11:33:03 -04:00 |  | 
			
				
					| 
							
							
								 andrewdds | d594135fbe | Merge pull request #337 from dod-ccpo/user-profile-screen User profile screen | 2018-09-26 11:31:08 -04:00 |  | 
			
				
					| 
							
							
								 Luis Cielak | 363bb51749 | Rename sign in with CAC button | 2018-09-26 11:30:30 -04:00 |  | 
			
				
					| 
							
							
								 Patrick Smith | 648964dc1e | Hook up the "Add Environment Access" link when adding a member | 2018-09-25 16:44:40 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | d87f2b17ed | audit log markup | 2018-09-25 16:03:08 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 3eeacc41fb | Merge pull request #326 from dod-ccpo/new-project-validation-#160064518 New project validation #160064518 | 2018-09-25 15:11:01 -04:00 |  | 
			
				
					| 
							
							
								 patricksmithdds | 5869d5a5e4 | Merge pull request #334 from dod-ccpo/show-zero-dollars-on-financial-verification Always set initial text input value when field data is not None | 2018-09-25 14:51:28 -04:00 |  | 
			
				
					| 
							
							
								 dandds | 774df938c4 | cleanup, temp fix for PT bug #160768940 | 2018-09-25 14:34:55 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | 60445b9593 | add temporary alert | 2018-09-25 14:22:07 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | 9415f14451 | edit user url in public topbar | 2018-09-25 14:19:50 -04:00 |  | 
			
				
					| 
							
							
								 Andrew Croce | ca3be247e3 | edit user screen template | 2018-09-25 14:19:50 -04:00 |  |