mirror of https://github.com/ansible/awx.git synced 2026-01-13 02:50:02 -03:30

Go to file

Matthew Jones 82b692be9c Merge remote-tracking branch 'origin/master' into celery-refactor

* origin/master: (28 commits)
  AC-995 fixed typo and added extra error handling in case we actually cannot parse inventory variables. If that does happen, we now alert the user and keep the application stable and running.
  Use supervisorctl when restarting celeryd on Ubuntu
  Revert custom supervisor initscript
  fix for the small viewport issue (https://www.dropbox.com/s/dmf4aixfv7k67cm/Screenshot%202014-01-29%2015.19.52.png) where group name div gets pushed to a new line.
  Fixed AS widget breadcrumb links
  AC-977 Fixed raw html showing up in Action field on detail dialog. Added a subtitle on the AS widget. On inventory groups/host page the subtitle explains what activities are being displayed, and only activities realted to the selected group (on the inventory page) are displayed. If All Hosts selected, then all activities for all groups related to the current inventory are displayed. Also, brought back activity stream button for inventory hosts.
  During AMI boot, use custom initscript name
  Update tower-setup filename used in AMI build
  AC-578 - Add custom supervisor initscript on ubuntu
  Remove 'awx-' prefix when reporting version
  Explicitly include the egg-info in rpm packaging
  Fixing store references to point to http://www.ansible.com/ansible-pricing
  Update make develop command, version check after package rename.
  AC-992 Fix inventory import tests.
  AC-967 Fixed job name in the host status fly-out. Text now wraps rather than extending beyond boundaries of pop-over. Removed status label- just show red/green dot. Clicking on ID or red/green dot shows the status dialog. When dialog closes the window.resize() watcher is restored.
  AC-976 now using custom javascript to apply ellipsis to long group and host names. Fixed indes.html title.
  Fix ansible-tower deb build
  Rename package awx to ansible-tower
  AC-976 add job template name to activity stream
  AC-979 using activity stream object arrays correctly. AC-980 fixed Action label on detail dialog.
  ...

Conflicts:
	awx/ui/static/js/controllers/Inventories.js
	awx/ui/static/js/lists/InventoryHosts.js
	awx/ui/static/js/widgets/Stream.js

2014-01-30 01:00:00 -05:00

awx

Merge remote-tracking branch 'origin/master' into celery-refactor

2014-01-30 01:00:00 -05:00

config

Initial task status to file implementation

2013-11-21 13:53:59 -05:00

docs

Rename package awx to ansible-tower

2014-01-29 14:23:56 -05:00

requirements

Fix for failing unit tests.