17301 Commits

Author SHA1 Message Date
Graham Mainwaring
c144bb99cf Move data migration docs to root dir 2018-05-04 10:11:21 -04:00
Graham Mainwaring
6db32e5c3e
Merge pull request #1848 from rooftopcellist/data_migration_docs
Adds data migration docs for upgrades
2018-05-04 10:07:03 -04:00
adamscmRH
b281aaa0e5 Adds data migration docs for upgrades 2018-05-03 23:49:03 -04:00
Jake McDermott
f7effd82dc
Merge pull request #1828 from jakemcdermott/patch-tests
patch smoke test
2018-04-30 14:22:29 -04:00
Jake McDermott
b71a8af62d
patch smoke test 2018-04-30 13:51:43 -04:00
Shane McDonald
17b6051233
Merge pull request #1826 from shanemcd/update-install-docs
Update install docs
2018-04-30 12:05:11 -04:00
Shane McDonald
6f4ef29ae7 Update install docs
- Document openshift_skip_tls_verify
- Document openshift_pg_emptydir
- Add minimum minishift specs
- Move minishift section below variable reference
2018-04-30 12:02:57 -04:00
Ryan Petrello
1e4c2f6d4f
Merge pull request #1814 from jaredevantabor/1811-sockets
Adds liveUpdates flag for the UI back in
2018-04-27 16:24:16 -04:00
Jared Tabor
791cc06e27 Adds liveUpdates flag for the UI back in
This line was lost in the 3.2.4 merge
2018-04-27 12:33:57 -07:00
Ryan Petrello
327d3c3f5b
Merge pull request #1810 from ryanpetrello/devel
restore the celery hostname
2018-04-27 12:20:30 -04:00
Ryan Petrello
8bc8bb1bd6 restore the celery hostname 2018-04-27 12:16:16 -04:00
Ryan Petrello
732698440f
Merge pull request #1809 from shanemcd/devel
Merge branch 'release_3.3.0' into awx/devel
2018-04-27 11:33:52 -04:00
Shane McDonald
4fdf462b98 Merge branch 'release_3.3.0' into awx/devel
# Conflicts:
#	awx/ui/client/src/standard-out/standard-out-factories/main.js
#	awx/ui/package.json
2018-04-27 10:17:59 -04:00
Jared Tabor
1b013eb2e3
Merge pull request #1577 from jaredevantabor/network-dep-cleanup
Removes dupclicate Angular import
2018-04-26 14:36:42 -07:00
Jake McDermott
af44a12e7b
Merge pull request #1600 from wenottingham/and-the-years-start-coming-and-they-dont-stop-coming
Fix another stray 2017 in the UI.
2018-04-26 14:27:30 -04:00
Bill Nottingham
23a009f8bb Fix another stray 2017 in the UI. 2018-04-26 14:03:57 -04:00
Alan Rominger
22e763a44c
Merge pull request #1595 from AlanCoding/revert_team
Revert allowing org members to see teams
2018-04-26 14:02:27 -04:00
AlanCoding
c88303ca67
revert change to allow org members to see teams 2018-04-26 13:37:08 -04:00
Jared Tabor
41f0b2b703
Merge pull request #1801 from jaredevantabor/update-installmd
Updates README.md to include Node and NPM version req's
2018-04-26 10:34:49 -07:00
Jared Tabor
da79f1450c
Merge pull request #1576 from jaredevantabor/1021-system-job-cleanup
Cleanup the Cleanup
2018-04-26 10:18:34 -07:00
Jared Tabor
5f38b4fde4 removes code/references related to cleanup_facts mgmt jobs, and their schedules 2018-04-26 09:35:34 -07:00
Jared Tabor
b154949639 Removes dupclicate Angular import, and removes tower.app.js module from network UI 2018-04-26 09:22:25 -07:00
AlanCoding
dff0f2f9ed
Revert "update tests for org members seeing teams"
This reverts commit fe04f69e891078dd3e6eabd2171796c20ff08114.
2018-04-26 12:21:50 -04:00
Ryan Petrello
a009d21edc
Merge pull request #1592 from ryanpetrello/release_3.3.0
3.2.4 -> 3.3.0
2018-04-26 11:34:16 -04:00
Ryan Petrello
1eb5e98743 Merge branch 'release_3.2.4' into release_3.3.0 2018-04-26 11:10:28 -04:00
Alan Rominger
074302b573
Merge pull request #1588 from AlanCoding/notification_update_fields
Avoid unrelated errors saving notification
2018-04-26 10:19:40 -04:00
Alan Rominger
144e89f0a9
Merge pull request #1587 from AlanCoding/workflow_job_log
Add corresponding log for WorkflowJob submission
2018-04-26 09:50:05 -04:00
AlanCoding
52d8d851fe
avoid unrelated errors saving notification 2018-04-26 09:36:43 -04:00
AlanCoding
84d9273012
add corresponding log for WorkflowJob submission 2018-04-26 09:30:19 -04:00
Matthew Jones
ccada295ee
Merge pull request #1586 from ansible/fix_missing_instance_group
Fix an issue where missing instance group would cause an error
2018-04-26 09:21:37 -04:00
Matthew Jones
2f3d7b17f6
Fix an issue where missing instance group would cause an error
We'll now default to queue submission to the basic management queue
2018-04-26 09:11:08 -04:00
Jake McDermott
0046b25fa0
Merge pull request #1578 from jakemcdermott/fix-jobz-expanded-host-event
ensure host modal can be visible when details panel is collapsed
2018-04-26 00:31:43 -04:00
Jake McDermott
8fa224f846
ensure host modal can be visible when details panel is collapsed 2018-04-26 00:03:53 -04:00
Jared Tabor
b05becf302
Updates README.md to include Node and NPM version req's 2018-04-25 15:06:24 -07:00
Jake McDermott
9809ddb84c
Merge pull request #1575 from mabashian/1522-expand-results
Implemented expand/collapse job results
2018-04-25 17:56:53 -04:00
Michael Abashian
8f6bb15acf
Merge pull request #1564 from mabashian/1444-prompt-socket-v2
Hold off on refreshing lists when launch prompt modal is open
2018-04-25 17:00:02 -04:00
mabashian
fe7a0a63b9 Implemented expand/collapse job results 2018-04-25 16:56:11 -04:00
Ryan Petrello
6e3c35dba8
Merge pull request #1574 from ryanpetrello/select-poll
use select.poll() instead of select.select() for file descriptors
2018-04-25 16:49:41 -04:00
Ryan Petrello
f0d3713e99 use select.poll() instead of select.select() for file descriptors
see: https://github.com/ansible/tower/issues/861
see: https://github.com/pexpect/pexpect/pull/474
2018-04-25 16:29:55 -04:00
Christian Adams
5d82ee5a27
Merge pull request #1572 from rooftopcellist/radius_auth_fix
Radius auth fix
2018-04-25 16:17:31 -04:00
Ryan Petrello
69b10feecd
Merge pull request #1571 from ryanpetrello/remove-old-fact-cleanup
remove the legacy fact cleanup system template
2018-04-25 16:14:38 -04:00
Christian Adams
2476dc1a61
Merge pull request #1800 from rooftopcellist/auth-backends-fix
fixes sso auth backends
2018-04-25 15:20:25 -04:00
Bill Nottingham
523613c64c
Merge pull request #1554 from wenottingham/(don't)-use-the-force-rey
Only force role updates when we actually check out a new version.
2018-04-25 15:11:26 -04:00
adamscmRH
90308066af update radius backend for dr1.3.3 2018-04-25 15:04:46 -04:00
Ryan Petrello
0bc5665e92 remove the legacy fact cleanup system template
see: https://github.com/ansible/tower/issues/1021
2018-04-25 14:20:19 -04:00
Wayne Witzel III
9319bbce8d
Merge pull request #1565 from wwitzel3/fix-703
Allow real null to be searched in host_filter
2018-04-25 13:47:29 -04:00
Bill Nottingham
b3ca7acb41 Only pass --force if we have an scm_result (i.e., we ran an actual checkout/revision change.) 2018-04-25 13:46:46 -04:00
Marliana Lara
7f87cd9c47
Merge pull request #1570 from marshmalien/fix/1550-ig-readonly-org-admins
[UI] Org Admin permissions for Instance Groups
2018-04-25 13:41:40 -04:00
adamscmRH
db1072563f fixes sso auth backends 2018-04-25 13:15:01 -04:00
Michael Abashian
cb1f25393a
Merge pull request #1543 from mabashian/1447-prompt-strings
Mark prompt strings for translation
2018-04-25 13:02:01 -04:00