richard-dds
5480654db9
Fix seed_sample
2018-11-05 14:20:07 -05:00
richard-dds
3765a73dc1
Consolidate WorkspaceUser into WorkspaceRole
2018-11-05 14:20:07 -05:00
dandds
d78c6de386
Merge pull request #426 from dod-ccpo/invite-errors-#161347944
...
display error alert for users who had DOD ID conflict when accepting …
2018-11-05 14:03:01 -05:00
patricksmithdds
a5617a86e3
Merge pull request #421 from dod-ccpo/update-uat-env
...
Update UAT environment
2018-11-05 09:56:25 -05:00
dandds
5fc9dbd177
display error alert for users who had DOD ID conflict when accepting workspace invitation
2018-11-05 09:42:13 -05:00
richard-dds
0c7fb4ca9b
Merge pull request #423 from dod-ccpo/sort-members
...
Sort workspace members list
2018-11-02 16:14:55 -04:00
dandds
1d6de8e0ee
Merge pull request #422 from dod-ccpo/invite-expiration
...
Invite and Workspace Member Status
2018-11-02 11:57:36 -04:00
richard-dds
63da76b4a3
Show caret for sorted column
2018-11-01 16:26:47 -04:00
richard-dds
bfc6766caa
Sort workspace members list
2018-11-01 16:26:47 -04:00
richard-dds
6575afc1a0
Refactor search and filter
2018-11-01 16:26:47 -04:00
richard-dds
64f6393678
Merge pull request #424 from dod-ccpo/bugfix-workspace-link
...
Fix a bug that was crashing the requests index
2018-11-01 16:12:59 -04:00
richard-dds
ff0c4ffb69
Fix a bug that was crashing the requests index
2018-11-01 15:51:21 -04:00
richard-dds
9c22a57780
Merge pull request #416 from dod-ccpo/request-filters
...
Searching, filtering and sorting for requests page
2018-11-01 15:04:34 -04:00
richard-dds
1baac6ede9
Disable form submission
2018-11-01 14:29:42 -04:00
dandds
6ecd011808
update seed script to activate stock workspace users
2018-11-01 13:52:03 -04:00
dandds
e4bad109db
more granular invitation status and a display status for workspace members
2018-11-01 13:52:03 -04:00
richard-dds
97475ee64f
WIP tests
2018-11-01 13:52:03 -04:00
richard-dds
f8e16a96d2
Determine member status based on invitations
2018-11-01 13:52:03 -04:00
richard-dds
05b09e7961
Template fixes
2018-11-01 10:47:38 -04:00
richard-dds
bb903ece9f
No sorting for non-ccpo users
2018-11-01 10:25:52 -04:00
richard-dds
63d5f3d25c
Formatting
2018-11-01 10:25:52 -04:00
richard-dds
d540b2ae74
Sort requests
2018-11-01 10:25:52 -04:00
richard-dds
5477076fe1
Formatting
2018-11-01 10:25:52 -04:00
richard-dds
d069897062
Allow filtering by all possible statuses
2018-11-01 10:25:52 -04:00
richard-dds
0494382d00
boolean filter is unnecessary. tojson works
2018-11-01 10:25:52 -04:00
richard-dds
ceab98c3cc
Formatting
2018-11-01 10:25:52 -04:00
richard-dds
af014cae03
Filter by status
2018-11-01 10:25:52 -04:00
richard-dds
18c3354519
Format dollar amount
2018-11-01 10:25:52 -04:00
richard-dds
588584ccee
Use local-datetime components
2018-11-01 10:25:52 -04:00
richard-dds
c5800a8c98
Vue-ify requests listing page
2018-11-01 10:25:52 -04:00
richard-dds
401a9e93a7
Merge pull request #412 from dod-ccpo/status-change-emails
...
Notify PSO or MO of request status change
2018-11-01 10:13:39 -04:00
Patrick Smith
2a48a78561
Add worker envvars for UAT env
2018-10-31 16:42:10 -04:00
Patrick Smith
6f10ef4a19
Update UAT image
2018-10-31 16:41:59 -04:00
Patrick Smith
eaf9807e66
Revert "Force CicleCI to build & push an image for this branch"
...
This reverts commit a9fc2bd2029df29af03b74a5f5f099afc1478f37.
2018-10-31 16:41:26 -04:00
Patrick Smith
a9fc2bd202
Force CicleCI to build & push an image for this branch
2018-10-31 16:20:26 -04:00
Patrick Smith
67b14921d6
Update UAT deployment with RQ worker and latest code
...
Specify a different RQ_QUEUE so that the worker does not attempt to run
jobs for the staging environment (since they share the same redis
connection).
2018-10-31 16:12:00 -04:00
Patrick Smith
4bbb55a06e
Add RQ_QUEUES to default config
...
We can use string interpolation in the file rather than building it when
making the config. Adding the value to the config allows us to override
it with an environment variable, if we want to (as we do for the UAT
environment).
2018-10-31 16:12:00 -04:00
dandds
49992e58df
Merge pull request #419 from dod-ccpo/no-travis
...
no more travis
2018-10-31 16:08:00 -04:00
dandds
3a01b36d70
Merge pull request #418 from dod-ccpo/invited-user-#160301892
...
Invited user #160301892
2018-10-31 15:33:08 -04:00
richard-dds
39b70b7057
Add tests for /requests/edit
2018-10-31 15:32:26 -04:00
dandds
c4b9ce6052
Merge pull request #420 from dod-ccpo/stock-user-updates
...
update dev users
2018-10-31 15:17:40 -04:00
dandds
0aecae1d9a
more post-travis tweaks
2018-10-31 15:14:56 -04:00
dandds
a5d34043d7
workaround for user profile check in invitations test
2018-10-31 15:11:43 -04:00
leigh-mil
72f7a67cfc
Merge pull request #417 from dod-ccpo/fix-manual-fin-ver-#161560975
...
Fix manual fin ver #161560975
2018-10-31 14:55:44 -04:00
dandds
43eeba2f96
remove TODO for checking user against invitation
2018-10-31 14:53:52 -04:00
dandds
cb25dcdd32
invitation cannot be reused if wrong user accepts it
2018-10-31 14:53:52 -04:00
dandds
0a176239b7
add home link to error page and catch missing template exception in glob route
2018-10-31 14:53:52 -04:00
dandds
87baa1f873
more fine-grained errors for invalid invitations
2018-10-31 14:53:52 -04:00
dandds
cdef2d8803
additional invitation test for new user
2018-10-31 14:53:51 -04:00
dandds
b3cd08a64f
invitation can only be accepted by user with matching DOD ID
2018-10-31 14:53:51 -04:00
