Commit Graph

14953 Commits

Author SHA1 Message Date
jlmitch5 e4fa0e8a39 Merge pull request #215 from Zokormazo/license-info-from-config
Move license checking logic to /api/v2/config
2017-09-19 16:39:50 -04:00
Jared Tabor e23be23a83 Merge pull request #203 from jaredevantabor/i18n-initialization
initializing i18nInit module
2017-09-19 13:29:01 -07:00
Julen Landa Alustiza 9c2cf6b7ca Move license checking logic to /api/v2/config
Use license_info.features.ldap & license_info.feature.enterprise_auth from /api/v2/config for
auth providers button enabling instead of using info from /api/v2/settings/all

Signed-off-by: Julen Landa Alustiza <julen@zokormazo.info>
2017-09-19 21:24:07 +02:00
Matthew Jones 6b7126ab6b Updating contributing for What should I work on? 2017-09-19 13:46:45 -04:00
Marliana Lara bb6fab08a3 Merge pull request #141 from marshmalien/side-nav-tooltips
Side navigation panel tooltips
2017-09-19 13:45:10 -04:00
Aaron Tan ee762d4bbd Merge pull request #211 from jangsutsr/fix_114
Add Tower Configuration setting AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR
2017-09-19 13:28:30 -04:00
Aaron Tan d271757eba Fix issue #114
Add Tower Configuration setting AUTH_LDAP_GROUP_TYPE_MEMBER_ATTR.

Signed-off-by: Aaron Tan <jangsutsr@gmail.com>
2017-09-19 11:15:45 -04:00
Marliana Lara 9b7eb52772 Replace translate filter and retrieve tooltip text from strings file 2017-09-19 10:27:23 -04:00
Matthew Jones b46c6e4aad Merge pull request #207 from matburt/add_krb_support
Add krb package dependencies to support windows connections
2017-09-19 06:55:47 -07:00
Matthew Jones 52aa38e742 Merge pull request #197 from ansible/fix_secret_key
Fix an issue where we ignored the secret key during install
2017-09-19 06:36:54 -07:00
Matthew Jones 476dae5418 Add krb package dependencies to support windows connections 2017-09-19 09:23:27 -04:00
Alan Rominger bc4b622e6b Merge pull request #199 from AlanCoding/inv_no_yaml
Inventory file suggestion adjustments from user feedback
2017-09-19 08:40:20 -04:00
Jared Tabor 3b83d6639a initializing i18nInit module 2017-09-18 16:29:49 -07:00
AlanCoding f455f1b257 Inventory file suggestion adjustments from user feedback
- ditch yaml files as suggestions
 - automatically greenlight any hosts or inventory titled file
2017-09-18 15:29:03 -04:00
Matthew Jones f5ccb51ef2 Fix an issue where we ignored the secret key during install 2017-09-18 15:11:04 -04:00
Marliana Lara 5c108bfa1b Add side nav panel tooltips 2017-09-18 13:53:21 -04:00
Bill Nottingham 710aaaa2c8 Merge pull request #195 from JeLuF/patch-1
Fix typo ("directory" misspelled)
2017-09-18 13:47:40 -04:00
JeLuF 1925a439d7 Fix typo ("directory" misspelled) 2017-09-18 19:34:56 +02:00
Matthew Jones 87b58e6bc2 Apply ephemeral cache for some memoize tasks recently merged 2017-09-18 12:31:33 -04:00
Matthew Jones 64415872a0 Merge branch 'release_3.2.0' into devel 2017-09-18 10:55:45 -04:00
Alan Rominger 4c28e04e5e Merge pull request #191 from AlanCoding/step_parent
do not use parent_model with GenericAPIView
2017-09-18 10:36:59 -04:00
Wayne Witzel III 540bda1d09 Merge pull request #420 from wwitzel3/release_3.2.0
Merge pull request #161 from wwitzel3/devel
2017-09-18 09:54:54 -04:00
Ryan Petrello 97609746c0 Merge pull request #423 from ryanpetrello/stdout_defer
more 3.1.5 result_stdout_text optimizations -> 3.2 so we don't regress
2017-09-18 09:53:17 -04:00
Ryan Petrello 68b924efe5 flake8 fixup 2017-09-18 09:44:39 -04:00
jlmitch5 37487b2427 Merge pull request #412 from jlmitch5/fixFormSaveEnterpriseDisabling
fix config forms from having save button disabled when no license is …
2017-09-18 09:37:30 -04:00
Ryan Petrello 6a4b4edea3 properly detect deferred ORM objects 2017-09-18 09:08:53 -04:00
Matthew Jones ebbd42322d Fix an issue with hasattr call 2017-09-18 09:08:44 -04:00
Matthew Jones c07a4ff93d Catch any unhandled exceptions grabbing notification templates 2017-09-18 09:08:40 -04:00
Matthew Jones 8091b84344 Fixing up some activity stream deferreds 2017-09-18 09:08:30 -04:00
Matthew Jones cba8914aae Merge pull request #183 from matburt/latest_greatest_ansible
Include ansible centos repo link and install the latest ansible
2017-09-17 05:16:32 -07:00
Matthew Jones 663257a690 Merge pull request #182 from matburt/installer_updates
Rework installer to support local minishift environment
2017-09-17 05:15:43 -07:00
Jared Tabor 6a9bfa74c4 Merge pull request #422 from jaredevantabor/socket-fix
Socket fix
2017-09-16 09:20:59 -07:00
Jared Tabor 4bbd486389 removing code that puts the UI in an infinite loop 2017-09-16 09:12:32 -07:00
Matthew Jones 27d5eb4ef9 Rework installer to support local minishift environment
This also adds an option to *not* use the local container for building
the software distribution which is required for a local minishift
environment based install
2017-09-16 10:09:41 -04:00
Matthew Jones f1a9c4ef0e Include ansible centos repo link and install the latest ansible
Instead of sourcing ansible from epel or extras, we'll now use the
official Ansible repo
2017-09-15 23:31:10 -04:00
Matthew Jones a2f4134ee0 Merge pull request #417 from ansible/vmware_cert_validation
Add a setting for vmware inventory cert validation
2017-09-15 17:57:59 -07:00
Jared Tabor 2c7abc8bca Merge pull request #421 from jaredevantabor/socket-fix
Socket Fix
2017-09-15 15:58:58 -07:00
Jared Tabor f7312691e1 resubscribe to last group if readyState is 0, aka connection isn't open yet 2017-09-15 15:56:32 -07:00
Jake McDermott 9cbe2faed6 Merge pull request #26 from jakemcdermott/test-e2e
add e2e tests
2017-09-15 17:35:30 -04:00
Wayne Witzel III dafd6acf1a Merge pull request #161 from wwitzel3/devel
update social auth strategy to have fixes from social-app-django
2017-09-15 17:22:32 -04:00
Jake McDermott 2a9c97f96d remove unused config 2017-09-15 17:22:23 -04:00
Jake McDermott 573d35feff use dataset name as naming prefix 2017-09-15 17:22:13 -04:00
Jake McDermott ab87f81ad8 add data generator preset 2017-09-15 17:22:03 -04:00
Jake McDermott 19f96b1f6f add e2e tests 2017-09-15 17:21:55 -04:00
Jake McDermott 05b4b875e2 move unit tests 2017-09-15 17:21:43 -04:00
Bill Nottingham ece93c45c9 Merge pull request #178 from Numblesix/devel
Fixed Typo in Install.md
2017-09-15 15:11:51 -04:00
Michael Abashian ca72722b39 Merge pull request #419 from mabashian/7647-i18n-search-key
Fixed search key styling with wider text
2017-09-15 15:03:44 -04:00
AlanCoding 1b48b99ba7 do not use parent_model with GenericAPIView 2017-09-15 14:41:12 -04:00
Sandro Emma 52c0a37174 Fixed Typo in Install.md
Signed-off-by: Sandro Emma <feeds.sandro@gmail.com>
2017-09-15 20:31:12 +02:00
Ryan Petrello ff385ddf17 Merge pull request #416 from ryanpetrello/stdout_defer
Add 3.1.5 result_stdout_text optimizations into 3.2 so we don't regress
2017-09-15 14:24:47 -04:00