13212 Commits

Author SHA1 Message Date
Ryan Petrello
65ace1f446 fix a bug in AES -> fernet encryption migration
see: #6747
2017-06-27 15:07:44 -04:00
Michael Abashian
78ba96b541 Merge pull request #6730 from mabashian/6663-multiselect-dropdown
Fixed multi-select survey questions on launch
2017-06-27 10:09:29 -04:00
Michael Abashian
e107bc6cc9 Merge pull request #6739 from mabashian/4556-delete-last-item-page
Fixed deleting last resource on a page 404 error
2017-06-27 10:08:59 -04:00
Michael Abashian
b3643f85db Merge pull request #6716 from mabashian/inventory-credential-modal
Fixed inventory credential_type lookup search tag
2017-06-27 10:08:05 -04:00
Michael Abashian
4616de363e Merge pull request #6715 from mabashian/remove-clearscope
Removed ClearScope service in favor of logic in stateChangeStart
2017-06-27 10:07:40 -04:00
Ryan Petrello
2d9df199c6 Merge pull request #6736 from ryanpetrello/fix-6659
make isolated rampart settings API-configurable
2017-06-26 16:55:10 -04:00
Greg Considine
8d39cee5f5 Merge pull request #6731 from gconsidine/ui/component-hardening
Ui/component hardening
2017-06-26 16:32:08 -04:00
Michael Abashian
da0dfdbe13 Fixed deleting last resource on a page 404 error 2017-06-26 16:23:34 -04:00
gconsidine
fd0c67be0c Remove unused components 2017-06-26 16:23:05 -04:00
Ryan Petrello
bfb7ad15ae make isolated rampart settings API-configurable
see: #6659
2017-06-26 15:47:14 -04:00
Marliana Lara
6ef7b88675 Merge pull request #6704 from marshmalien/fix/pendingInvDeleteState
Add Pending Delete flag to Inventories during pending_deletion state
2017-06-26 14:06:47 -04:00
Marliana Lara
5e5aae04c0 Hide status icons during pending deletion 2017-06-26 13:18:21 -04:00
Marliana Lara
b8d6a39bac Remove unnecessary CSS selector 2017-06-26 13:18:21 -04:00
Marliana Lara
af76d7899a Add Pending Delete flag to Inventories during pending_deletion state
* See #5788 and #6279
2017-06-26 13:18:21 -04:00
Aaron Tan
fbb1912e98 Merge pull request #6723 from jangsutsr/6208_add_tacacsplus_configuration_validation
Add Tower configuration category validation for TACACS+
2017-06-26 13:10:44 -04:00
gconsidine
523170491c Add role_level to org lookup query string 2017-06-26 12:50:47 -04:00
Michael Abashian
098e369e71 Fixed multi-select survey questions on launch 2017-06-26 12:25:57 -04:00
Ryan Petrello
28a1e1df53 Merge pull request #6725 from ryanpetrello/fix-isolated-heartbeat
properly update the heartbeat timestamp for isolated nodes
2017-06-26 12:00:28 -04:00
Alan Rominger
7699e26336 Merge pull request #6722 from AlanCoding/atomic_inv_del
use atomic transaction to delete inventory in task
2017-06-26 11:07:21 -04:00
Ryan Petrello
5adc1c603a properly update the heartbeat timestamp for isolated nodes 2017-06-26 11:03:56 -04:00
Aaron Tan
5e398e4a25 Add Tower configuration category validation for TACACS+ 2017-06-26 10:58:05 -04:00
gconsidine
d63ab2811a Add implementation for credential_type lookup 2017-06-26 10:53:57 -04:00
gconsidine
2fa4b3db5b Add org Lookup implementation and WIP credential_type 2017-06-26 10:53:57 -04:00
gconsidine
b7982bf202 Add more generalized legacy Lookup integration 2017-06-26 10:53:57 -04:00
gconsidine
dc1bff9048 Convert organization Select to Lookup 2017-06-26 10:53:57 -04:00
gconsidine
d7e78a5884 Add WIP implementation of Lookup 2017-06-26 10:53:57 -04:00
gconsidine
f11aef01ef Add contextual variables and update references 2017-06-26 10:53:57 -04:00
AlanCoding
cf751568b5 use atomic transaction to delete inventory in task 2017-06-26 10:46:58 -04:00
Aaron Tan
2c98294035 Merge pull request #6575 from jangsutsr/6220_add_docs_for_tower_configuration
Add docs to Tower configuration
2017-06-26 09:46:09 -04:00
Aaron Tan
f1869a2f70 Merge pull request #6220 from jangsutsr/6188_enable_ctint_category_specific_validation
Enable Tower configuration category-specific validation
2017-06-26 09:45:12 -04:00
Michael Abashian
48a46049f9 Fixed inventory credential_type lookup search tag 2017-06-24 22:07:45 -04:00
Michael Abashian
26af4adb61 Removed ClearScope service in favor of logic in stateChangeStart 2017-06-24 21:50:31 -04:00
Aaron Tan
68ee601359 Merge pull request #6595 from jangsutsr/6234_set_priority_rules_for_find_matching_hosts
Set priority rules for find_matching_hosts
2017-06-23 14:04:18 -04:00
Michael Abashian
d770156640 Merge pull request #6700 from mabashian/6699-credential_type-tag
Added credential_type as a default search param to projects credential
2017-06-23 12:54:39 -04:00
Michael Abashian
e401bb8986 Removed quotes around attribute 2017-06-23 10:28:24 -04:00
Michael Abashian
937c85e89e Added credential_type as a default search param to project.credential. Removed leftover console.log 2017-06-23 10:25:59 -04:00
Michael Abashian
badb7441ae Merge pull request #6655 from mabashian/remove-copy-move
Removed copy/move group/host in favor of associate and disassociate.
2017-06-23 09:39:10 -04:00
Michael Abashian
112011b813 Merge pull request #6696 from mabashian/5554-license
Fixed license delete navigation bug
2017-06-23 09:25:58 -04:00
Michael Abashian
af31c7972c Hide smart inv button when no hosts exist. Updated disassociate tooltip. Filtered out the target group when associating existing groups 2017-06-23 09:14:09 -04:00
Michael Abashian
6143d275d6 Fixed broken template paths 2017-06-23 08:41:13 -04:00
Michael Abashian
92c9b786f4 Removed copy/move in favor of associate and disassociate. Re-organized the inventories directory. 2017-06-23 08:41:13 -04:00
Michael Abashian
f32906287d Fixed license unit tests 2017-06-23 08:37:29 -04:00
Michael Abashian
e88b6e6e48 Merge pull request #6666 from mabashian/6443-typeahead-single-select-survey
Added the ability to pass in minimumResultsForSearch when calling CreateSelect2
2017-06-23 08:14:57 -04:00
Michael Abashian
214e7a0cfe Merge pull request #6694 from mabashian/5717-insights-cred-project
Auto populate insights credential when creating insights project
2017-06-23 08:14:08 -04:00
Alan Rominger
30ec070357 Merge pull request #6692 from AlanCoding/manual_locations
Tag jobs started via special cases with node & group
2017-06-22 16:42:17 -04:00
AlanCoding
9e07b3f777 Tag jobs started via special cases with node & group 2017-06-22 16:24:12 -04:00
Michael Abashian
2319c249c3 Fixed license delete navigation bug 2017-06-22 16:14:50 -04:00
Ryan Petrello
65b1e58d23 Merge pull request #6693 from ryanpetrello/async-inventory-deletion
block job template launches when an inventory is being deleted
2017-06-22 15:46:03 -04:00
Michael Abashian
9947a59bcc Auto populate insights credential when creating insights project 2017-06-22 15:34:41 -04:00
Ryan Petrello
97562fc4df block job template launches when an inventory is being deleted
see: #4382
2017-06-22 15:33:55 -04:00