3342 Commits

Author SHA1 Message Date
dandds
c5580733ba fields for the new task order 2018-12-18 09:44:02 -05:00
dandds
6d92755a7f new workspace and task order routes 2018-12-18 09:44:02 -05:00
George Drummond
3ca9d51b04
Merge pull request #491 from dod-ccpo/default-headers
Suggestions from http://flask.pocoo.org/docs/1.0/security/
2018-12-17 12:00:09 -05:00
dandds
dec14eee2d
Merge pull request #498 from dod-ccpo/lock-pytest
lock pytest for now
2018-12-17 11:47:34 -05:00
George Drummond
15a32a1dc5
Exclude set_default_headers from coverage report 2018-12-17 11:42:27 -05:00
dandds
d3fd32d7a0 lock pytest for now 2018-12-14 16:06:13 -05:00
montana-mil
eb873d0fda
Merge pull request #486 from dod-ccpo/table-loading
Members List Showing Markup
2018-12-14 13:21:15 -05:00
leigh-mil
81f648c15e
Merge pull request #496 from dod-ccpo/workspace-num-of-users-#162648520
Update Workspace user_count exclude disabled users
2018-12-14 13:16:37 -05:00
leigh-mil
7c5a9df4bb Update Workspace user_count exclude disabled users 2018-12-14 11:28:23 -05:00
patricksmithdds
090d6470f8
Merge pull request #494 from dod-ccpo/fix-pipenv-deps
Fix conflicting pipenv dependencies
2018-12-14 11:06:54 -05:00
Patrick Smith
88339e9d36 Use updated pip when building on CircleCI 2018-12-14 10:39:15 -05:00
Patrick Smith
9370029058 Update pipfile.lock 2018-12-13 16:27:29 -05:00
patricksmithdds
27b2e61c65
Merge pull request #493 from dod-ccpo/run-js-tests-in-script
Run JS tests in "script/test"
2018-12-13 16:14:37 -05:00
Patrick Smith
41f98cf726 Pin rq-scheduler dependency to resolve dependency conflict
The latest version of `flask-rq2` depends on:

* rq-scheduler>=0.8.3
* rq>=0.12,<0.13

Previously, `rq-scheduler` (0.8.3) requires:

* rq>=0.8

A recent release of `rq-scheduler`, 0.9 requires:

* rq>=0.13

`rq-scheduler`'s requirement conflicts directly with `flask-rq2`'s
version requirement of `rq`.

Manully pinning `rq-scheduler` to `>=0.8.3,<0.9` causes `0.8.3` to be
installed, so both dependencies can be satisfied.
2018-12-13 16:07:27 -05:00
Patrick Smith
98d08cb255 Run JS tests in "script/test" 2018-12-13 15:52:24 -05:00
dandds
76c3bb2bd5
Merge pull request #489 from dod-ccpo/legacy-task-orders
change current task order name
2018-12-13 15:50:39 -05:00
dandds
e7ee2b3f43
Merge pull request #488 from dod-ccpo/workspace-role-change-bug-#162345640
Workspace role change bug #162345640
2018-12-13 14:29:46 -05:00
George Drummond
3bff2fcb23
Format code 2018-12-13 13:59:54 -05:00
George Drummond
ec09c27a38
On fix unsafe-eval header and websockets on development 2018-12-13 13:54:19 -05:00
leigh-mil
c8bdf57ecd
Merge pull request #492 from dod-ccpo/confirmation-for-workspace-revokation-#162348648
Change copy when workspace access is revoked
2018-12-13 13:42:29 -05:00
dandds
c90550b647 resolve migration chain 2018-12-13 11:38:12 -05:00
dandds
15d0db01b6 change task orders domain class name 2018-12-13 11:36:45 -05:00
dandds
e509c34cdd change name of request relationship to legacy task order 2018-12-13 11:36:45 -05:00
dandds
2f515d7b47 change current task order table name
rename existing task order factory

fix legacy task order repr
2018-12-13 11:36:44 -05:00
dandds
d0dba9e4a6
Merge pull request #490 from dod-ccpo/migration-cleanup
Migration cleanup
2018-12-13 11:31:37 -05:00
Montana
5e718c3cfc V-cloak the entire table 2018-12-13 11:09:48 -05:00
leigh-mil
a4bd15a1b8 Change copy when workspace access is revoked 2018-12-13 11:00:19 -05:00
dandds
d0ed04377c hard-code status in invitation status migration 2018-12-13 09:45:01 -05:00
dandds
156ea02c90 remove migration that adds role permissions
script/seed_roles.py is idempotent, updates roles and perms, and we
should rely on that instead
2018-12-13 09:40:12 -05:00
George Drummond
5da374bbc9
Suggestions from http://flask.pocoo.org/docs/1.0/security/ 2018-12-13 09:31:31 -05:00
dandds
03337b3a6d
Merge pull request #487 from dod-ccpo/lock-dod-id
Lock dod id
2018-12-12 14:18:21 -05:00
dandds
a5009ec130 do not commit environment role updates unless an update happened 2018-12-12 13:09:48 -05:00
dandds
8754a74613 environment role deletion method should also return a bool 2018-12-12 13:01:26 -05:00
dandds
a75c19188f display message for successfully updating environment role / access 2018-12-12 11:39:58 -05:00
dandds
38f553b9c3 add database trigger to ensure dod id is never updated 2018-12-12 10:48:25 -05:00
dandds
2218b180a5 do not show workspace role update alert when only environment role has changed 2018-12-12 10:47:57 -05:00
Montana
c8dd9eb6a8 Try using v-cloak 2018-12-12 10:25:34 -05:00
Montana
313422f52a Change members list table to fixed to prevent code from showing when the table loads 2018-12-11 11:04:47 -05:00
dandds
809ab9547a
Merge pull request #480 from dod-ccpo/flash-refactor
Flash refactor
2018-12-10 14:27:09 -05:00
dandds
03d7d0fac0 filter and display login notifications by type 2018-12-10 13:25:47 -05:00
dandds
eeb8e5f328 rename a notification 2018-12-10 13:00:55 -05:00
dandds
16064be468 flash form error message from our base form class 2018-12-10 12:50:01 -05:00
dandds
1dd2cdd48b add test, simpler kwargs for flash function signature 2018-12-10 12:31:41 -05:00
dandds
a2d6d59ca4 use flask flash for notifications 2018-12-10 12:31:41 -05:00
dandds
6509c5a249
Merge pull request #485 from dod-ccpo/sample-data-fix
Sample data fix
2018-12-10 12:12:49 -05:00
dandds
e6d267a568 fix sample data scripts 2018-12-10 10:21:32 -05:00
dandds
d01910cc6f set default workspace role status when creating a new one 2018-12-10 10:21:05 -05:00
Jay R. Newlin (PromptWorks)
96c35ed3c7
Merge pull request #483 from dod-ccpo/add_exceptions_to_coveragerc
Update .coveragerc to handle exceptions (including the replacement for reverted PR 479)
2018-12-07 15:00:19 -05:00
Jay R. Newlin (PromptWorks)
2e1cc65604
Merge pull request #484 from dod-ccpo/revert-479-tests-ignore-object-representation
Revert "Tests ignore object representation" (to be replaced by better method in PR 483)
2018-12-07 14:58:19 -05:00
Jay R. Newlin (PromptWorks)
49d77c4f96
Revert "Tests ignore object representation" 2018-12-07 14:36:05 -05:00