13665 Commits

Author SHA1 Message Date
Aaron Tan
3856431da1 Merge pull request #7084 from jangsutsr/ux_improve_logger_ctint_label_text
[UX]Improve `LOG_AGGREGATOR_LOGGERS` label text
2017-07-14 15:30:07 -04:00
Ryan Petrello
cb929ea4d8 Merge pull request #7077 from ryanpetrello/fix-7040
wrap instance and queue registration in postgres advisory locks
2017-07-14 15:05:14 -04:00
Ryan Petrello
d8da1dddf5 wrap instance and queue registration in postgres advisory locks
see: #7040
2017-07-14 14:56:14 -04:00
Jared Tabor
a141523878 Merge pull request #7065 from jaredevantabor/tower-string-audit
Tower string audit
2017-07-14 11:47:11 -07:00
Aaron Tan
e7b37c6627 [UX]Improve LOG_AGGREGATOR_LOGGERS label text 2017-07-14 14:35:19 -04:00
Jared Tabor
4548801726 adding json loader to karma.conf.js 2017-07-14 11:27:57 -07:00
Bill Nottingham
5d57d59953 Merge pull request #7060 from wenottingham/deprecations-again
Fix deprecation warning.
2017-07-14 14:23:38 -04:00
Michael Abashian
96ae6d996d Adjusted search key top margin 2017-07-14 14:14:39 -04:00
Michael Abashian
d0250fe197 Merge pull request #7079 from mabashian/disable-logging
Fixed disable logging bug
2017-07-14 14:13:19 -04:00
Marliana Lara
9e08243888 Merge pull request #7073 from marshmalien/fix/styleWideSurveyModal
Add responsive styles to survey maker modal
2017-07-14 14:12:13 -04:00
Matthew Jones
450baf2e8d Fix a dictionary reference when getting the license type on import 2017-07-14 14:08:51 -04:00
Chris Meyers
ff14c5bafb more explicit docs
Explicitly detail the behavior of `use_fact_cache=False`
2017-07-14 13:58:08 -04:00
Michael Abashian
3126877918 Merge pull request #7074 from mabashian/search-ux
Search ux styling fixes
2017-07-14 13:56:44 -04:00
Michael Abashian
9bd21caac7 Fixed disable logging bug 2017-07-14 13:54:55 -04:00
John Mitchell
47232d732f fix of revert all on jobs tab and then nav to auth tab and codemirrors weren't inited 2017-07-14 13:30:34 -04:00
jlmitch5
70eeca1a38 Merge pull request #7056 from jlmitch5/fixCTITLdapForm
fix ctit ldap search form fields in ui
2017-07-14 13:15:16 -04:00
Marliana Lara
5637980a34 Merge pull request #7070 from marshmalien/fix/removeModalTitleUnderscores
Replace stray underscore in inventory insights credential modal
2017-07-14 13:14:05 -04:00
John Mitchell
5955691f41 handle revert of ldap user and group search fields 2017-07-14 13:07:24 -04:00
Michael Abashian
ac2357399a Search ux styling fixes 2017-07-14 13:02:07 -04:00
Marliana Lara
f2f3151414 Add responsive styles to survey maker modal 2017-07-14 12:57:19 -04:00
Marliana Lara
d5d8d2f3a7 Replace modal title underscore with a space 2017-07-14 12:51:46 -04:00
Shane McDonald
3450937329 Install tower-license in debs 2017-07-14 11:35:24 -04:00
Shane McDonald
d273272d9a Add tower-license as a source to the RPM 2017-07-14 11:35:24 -04:00
Matthew Jones
1b02809f9e Fixing missing import for licenseforbids
This was improperly removed during the license refactor
2017-07-14 10:54:21 -04:00
Wayne Witzel III
2f82b3742d Merge pull request #7071 from wwitzel3/devel
Update inventory_refresh acceptance docs
2017-07-14 10:44:11 -04:00
Wayne Witzel III
fe03181d4e update acceptance for /host/:id/smart_inventories 2017-07-14 10:43:25 -04:00
Wayne Witzel III
96cc714489 Update smart inventory acceptance 2017-07-14 10:41:06 -04:00
Matthew Jones
891f26c850 Fix an issue where an unlicensed system would throw errors
In the case where the license was entirely not present but the tower
license module was present
2017-07-14 10:21:26 -04:00
Christian Adams
f5bbccf0cd Merge pull request #6979 from rooftopcellist/IntegrityError
Fix IntegrityError on Source Update
2017-07-14 06:45:31 -07:00
adamscmRH
d065d5176e Removes redundant atomic transactions 2017-07-14 06:41:53 -07:00
Marliana Lara
a8ad5cc2f7 Merge pull request #7036 from marshmalien/fix/styleWideSurveyModal
Shrink modal size based on user permissions
2017-07-14 09:24:16 -04:00
Alan Rominger
9f277e8acd Merge pull request #7068 from AlanCoding/nesting_err
fix double nesting of error message in dictionary
2017-07-14 08:52:12 -04:00
AlanCoding
f1acb6b79d fix double nesting of error message in dictionary 2017-07-14 08:01:57 -04:00
Jared Tabor
d2a914a040 removing some old portal mode code that's unused
while auditing Tower strings
2017-07-13 18:32:13 -07:00
Jared Tabor
2c6e229e71 Tower String Audit 2017-07-13 18:32:05 -07:00
Michael Abashian
ba3c1d3424 Merge pull request #7035 from mabashian/5092-team-permissions
Filter credentials based on org when adding team permissions.
2017-07-13 18:38:40 -04:00
Michael Abashian
e8510e2a4d Merge pull request #7049 from mabashian/6227-logging
Disable log enable toggle when required fields not present
2017-07-13 18:38:06 -04:00
Michael Abashian
a574d8b645 Merge pull request #7051 from mabashian/7034-disable-save-no-filter
Smart inventory validation bug fix
2017-07-13 18:36:21 -04:00
Michael Abashian
635561390b Merge pull request #7057 from mabashian/6823-smart-inv-per-page
Hide view per page on smart inventory modal
2017-07-13 18:35:51 -04:00
Aaron Tan
e053d2c33a Merge pull request #7059 from jangsutsr/6624_stablize_summary_field_display_for_host_serializer
Stablize summary field display for host serializer
2017-07-13 16:48:17 -04:00
Ryan Petrello
fdbf21a13a Merge pull request #7063 from ryanpetrello/celery-hang-6534
pin celery to a known version that works
2017-07-13 16:35:56 -04:00
Aaron Tan
636147f7f0 Stablize summary field display for host serializer. 2017-07-13 16:30:47 -04:00
Matthew Jones
9cf2343570 Remove fact cache log setup from openshift configmap
fact cache receiver doesn't appear to exist anymore
2017-07-13 16:30:24 -04:00
Ryan Petrello
0239cd37fe pin celery to a known version that works
newer celery 3.x seems to a bug which causes forked celery worker
interprocess communication to hang (see: #6534)
2017-07-13 16:24:30 -04:00
Ryan Petrello
d03cacbb57 Merge pull request #7062 from ryanpetrello/fix-7050
properly copy parent roles when migrating v1 SSH creds to SSH + Vault
2017-07-13 16:20:16 -04:00
Ryan Petrello
58abfc3fde properly copy parent roles when migrating v1 SSH creds to SSH + Vault
see: #7050
2017-07-13 15:02:55 -04:00
Wayne Witzel III
8cf3bb3134 Merge pull request #7058 from wwitzel3/host-smart_inventories
Update how we repopulate the /host/:id/smart_inventories data
2017-07-13 14:54:30 -04:00
Michael Abashian
484b01c14f Hide view per page on smart inventory modal 2017-07-13 14:05:12 -04:00
Wayne Witzel III
6f1ef7fe0b Update how we repopulate the /host/:id/smart_inventories data 2017-07-13 14:04:33 -04:00
adamscmRH
0d0c75c318 Change to update if already exists 2017-07-13 13:55:42 -04:00