Jared Tabor
e23be23a83
Merge pull request #203 from jaredevantabor/i18n-initialization
...
initializing i18nInit module
2017-09-19 13:29:01 -07: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
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
Marliana Lara
5c108bfa1b
Add side nav panel tooltips
2017-09-18 13:53:21 -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
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
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
f7312691e1
resubscribe to last group if readyState is 0, aka connection isn't open yet
2017-09-15 15:56:32 -07: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
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
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
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
Michael Abashian
80e692656c
Merge pull request #406 from mabashian/7578-jt-admin-edit-v2
...
Fixed jt admin edit bug
2017-09-15 14:13:04 -04:00
Jared Tabor
6374be15fd
Merge pull request #418 from jaredevantabor/socket-fix
...
another potential socket fix
2017-09-15 10:58:43 -07:00
mabashian
9765623d03
Fixed search key styling with wider text
...
Signed-off-by: mabashian <mabashia@redhat.com >
2017-09-15 13:55:44 -04:00
Jared Tabor
325e7f3cce
checking socket.readyState before emitting socket message
2017-09-15 10:37:35 -07:00
mabashian
8b7639fd3a
Removed extra GET call for extra creds when user cannot edit JT
...
Signed-off-by: mabashian <mabashia@redhat.com >
2017-09-15 11:54:42 -04:00
Matthew Jones
713e368557
Merge pull request #413 from ansible/invscript_endpoint_performance
...
Improve script endpoint performance by removing forced ordering
2017-09-15 08:16:02 -07:00
Matthew Jones
47c976ee91
Add a setting for vmware inventory cert validation
...
This uses the environment var expected by the vmware inventory script.
Defaults to off but can be turned on
2017-09-15 11:14:10 -04:00
Matthew Jones
645d2d852f
Update scan job migration to public project to use the correct URL
2017-09-15 10:19:33 -04:00
Ryan Petrello
7a958a1af1
more result_stdout_text defer optimization for inventory updates
...
see: https://github.com/ansible/ansible-tower/issues/7568
2017-09-15 09:51:53 -04:00
Ryan Petrello
1bb6c17fe2
trick django-polymorphic into allowing defer() on polymorphic objects
...
django-polymorphic itself generates queries for polymorphic object
lookups, and these queries for UnifiedJob are *not* properly defering the
`result_stdout_text` column, resulting in more very slow queries. This
solution is _very_ hacky, and very specific to this specific
version of Django and django-polymorphic, but it works until we can
solve this problem the proper way in 3.3 (by removing large stdout blobs
from the database).
see: https://github.com/ansible/ansible-tower/issues/7568
2017-09-15 09:51:43 -04:00
Matthew Jones
4657f29df9
Merge pull request #103 from ragingpastry/add-mattermost-notification
...
Add mattermost notification
2017-09-15 06:42:37 -07:00
Nicholas O. Wilburn
68d240b77b
Add "Disable SSL Verification" button to mattermost notification
...
This commit will add a button which will disable SSL notifications
for the mattermost webhook. This is required when using self-signed
certificates.
2017-09-14 18:25:04 -07:00
Nicholas O. Wilburn
bdcd3f9dc2
Remove unnecessary fields from mattermost notification UI files
2017-09-14 18:24:57 -07:00
Nicholas O. Wilburn
69122a5454
Remove trailing whitespace
2017-09-14 18:24:54 -07:00
Nicholas O. Wilburn
e8e06f2b71
Revert unintended changes to ui/index.html
2017-09-14 18:24:51 -07:00
Nicholas O. Wilburn
684c637ac0
Remove package-lock.json
2017-09-14 18:24:47 -07:00
Nicholas O. Wilburn
03832c9065
Add mattermost import to reencrypt
2017-09-14 18:24:44 -07:00
Nicholas O. Wilburn
f347caf825
Remove debugging line
2017-09-14 18:24:29 -07:00
Jared Tabor
436df168f0
Merge pull request #415 from jaredevantabor/socket-fix
...
deleting socket on logout
2017-09-14 15:51:15 -07:00
