4567 Commits

Author SHA1 Message Date
Montana
48d7918b66 Use translate function directly 2019-04-05 11:47:58 -04:00
rachel-dtr
5401fd4769 Updating translation file 2019-04-05 11:22:06 -04:00
rachel-dtr
53a66fdfab Adding language to translations file 2019-04-05 09:43:46 -04:00
rachel-dtr
d34e90a76c Updating language for deleting portfolio members 2019-04-04 14:32:51 -04:00
rachel-dtr
aecb4fc583 Merge branch 'master' of github-DDS:dod-ccpo/atst into delete-user-update 2019-04-04 14:05:32 -04:00
rachel-dtr
265612c339 Updating some more capitalization and word choice 2019-04-04 13:56:41 -04:00
rachel-dtr
5b77d6c0d0 Updating some more capitalization 2019-04-04 13:26:40 -04:00
leigh-mil
f1c6717a1e
Merge pull request #733 from dod-ccpo/add-last-login-timestamp
Add last login timestamp
2019-04-03 13:10:52 -04:00
George Drummond
48d9506f96
Merge pull request #730 from dod-ccpo/archive-portfolio-member
Remove Portfolio User
2019-04-03 13:06:41 -04:00
montana-mil
df3ae13b87
Merge pull request #741 from dod-ccpo/bug-resend-invite-button-render
Render Resend Invite Button Bug
2019-04-03 13:04:10 -04:00
leigh-mil
cc11123eba Simplify get_last_login() 2019-04-03 13:03:17 -04:00
leigh-mil
215c2b4cbc Updates from PR feedback 2019-04-03 12:24:02 -04:00
leigh-mil
2feb10ea98 Add timestamp to footer 2019-04-03 12:24:02 -04:00
leigh-mil
610aef428d Add user's last login to the session data 2019-04-03 12:24:02 -04:00
leigh-mil
dec3a0eb48 Migration for last_login column 2019-04-03 12:24:02 -04:00
Montana
27e2f81ba0 Only test resend invite link for one officer 2019-04-03 11:33:20 -04:00
George Drummond
83b071bf20
Get changes working with merged PRs 2019-04-03 10:32:03 -04:00
George Drummond
bcfc8ee8e1
Remove double import 2019-04-03 09:48:30 -04:00
George Drummond
270b8d0db6
We aren't using this import 2019-04-03 09:43:40 -04:00
George Drummond
933d90b203
Save PR and don't do an extra lookup 2019-04-03 09:43:40 -04:00
George Drummond
dee14b98be
Remove portfolio permissions when role is disabled 2019-04-03 09:43:40 -04:00
George Drummond
358b00a6e2
Import on one line 2019-04-03 09:43:40 -04:00
George Drummond
5cc8c05dbd
Return correct error code 2019-04-03 09:43:40 -04:00
George Drummond
a22b416c6a
Open correct form id 2019-04-03 09:43:39 -04:00
George Drummond
bb5b8e2122
Fix incorrect modal id 2019-04-03 09:43:39 -04:00
George Drummond
6d7400b7d2
Add in correct modal close call 2019-04-03 09:43:39 -04:00
George Drummond
6f1eb43de4
Remove Portfolio User 2019-04-03 09:43:39 -04:00
Montana
dd4231760f Test that resend links show properly 2019-04-03 09:43:34 -04:00
Montana
92302b2a22 If user is MO and an officer of the TO, do not render resend invite link 2019-04-03 09:43:34 -04:00
rachel-dtr
575cfce5e4
Merge pull request #737 from dod-ccpo/to-view-content
Updates TO view page content
2019-04-02 16:47:56 -04:00
rachel-dtr
56f0b19b1f
Merge pull request #736 from dod-ccpo/user-profile
Updating the AT-AT user profile content
2019-04-02 16:47:46 -04:00
dandds
9a4dee63ba
Merge pull request #739 from dod-ccpo/uwsgi-logfile-plugin
add uwsgi logfile plugin for additional loggers
2019-04-02 16:47:29 -04:00
dandds
3f5b2abcd5 add uwsgi logfile plugin for additional loggers 2019-04-02 16:38:34 -04:00
rachel-dtr
73cd907d49 Updates TO view page content 2019-04-02 15:03:04 -04:00
rachel-dtr
fe4f0e63ac Updating the AT-AT user profile content 2019-04-02 14:39:30 -04:00
rachel-dtr
300199202a
Merge pull request #735 from dod-ccpo/move-scope
Moving scope examples with rest of scope description
2019-04-02 11:25:20 -04:00
rachel-dtr
3d8cea71f4
Merge branch 'master' into move-scope 2019-04-02 11:19:27 -04:00
montana-mil
91c3cc665f
Merge pull request #728 from dod-ccpo/edit-perms-pf-members
Edit Portfolio Members Access Levels
2019-04-02 11:14:02 -04:00
dandds
22ebe214fe
Merge pull request #732 from dod-ccpo/json-logging
ATST Json logging
2019-04-02 11:10:07 -04:00
rachel-dtr
fe799a5d38
Merge pull request #734 from dod-ccpo/capitalization-update
Continuing to clean up capitalization
2019-04-02 11:01:25 -04:00
rachel-dtr
1f5763cb6a Moving scope examples with rest of scope description 2019-04-02 10:56:10 -04:00
Montana
3cfac9e95e Validate the form 2019-04-02 10:38:18 -04:00
Montana
c46746d43d No need to manually check for update or flash 2019-04-02 10:37:50 -04:00
rachel-dtr
7109860553 Continuing to clean up capitalization 2019-04-02 10:34:13 -04:00
dandds
ba2a63bffc Update test to use get_many
Co-Authored-By: montana-mil <42577527+montana-mil@users.noreply.github.com>
2019-04-02 10:17:16 -04:00
Montana
d84eccbc83 Only update when permissions are different 2019-04-02 10:17:16 -04:00
Montana
25563cf06a Add helper function 2019-04-02 10:17:16 -04:00
Montana
d70332836b Only flash when permissions change 2019-04-02 10:17:16 -04:00
Montana
2d7e17e522 Success banner 2019-04-02 10:17:16 -04:00
Montana
bfff2a94b8 Add tests 2019-04-02 10:17:16 -04:00