External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity
11,934 Commits 54 Branches 19 Tags
Commit Graph

11934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Abashian
4dfe85af7f Filters organization 2017-03-02 17:00:04 -05:00
Michael Abashian
a4e60b711f Merge pull request #5610 from mabashian/shared-appjs 
Import shared modules in shared/main.js rather than app.js
 2017-03-02 15:49:12 -05:00
Michael Abashian
956beba290 Import shared modules in shared/main.js rather than app.js 2017-03-02 10:51:15 -05:00
Michael Abashian
0d2f16d34d Merge branch 'mabashian-modularize-helpers-utilities' into devel 2017-03-02 10:23:32 -05:00
Michael Abashian
778c4ab557 Merge branch 'modularize-helpers-utilities' of https://github.com/mabashian/ansible-tower into mabashian-modularize-helpers-utilities 
# Conflicts:
#	awx/ui/client/src/activity-stream/main.js
#	awx/ui/client/src/app.js
#	awx/ui/client/src/helpers.js
#	awx/ui/client/src/helpers/Credentials.js
#	awx/ui/client/src/helpers/Groups.js
#	awx/ui/client/src/helpers/Hosts.js
#	awx/ui/client/src/helpers/teams.js
 2017-03-02 10:20:32 -05:00
Michael Abashian
f174afb6df Import variables, parse, loadconfig in the correct place 2017-03-01 16:43:28 -05:00
Jared Tabor
c839bb67d0 Merge pull request #5594 from jaredevantabor/decouple-jobDetails-jobResults 
RIP Old Job Details Page
 2017-03-01 13:14:21 -08:00
jaredevantabor
7f16036171 fixing merge conflicts 2017-03-01 12:56:30 -08:00
jaredevantabor
66352ce5c9 removing last reference to job detail of any kind 2017-03-01 12:54:30 -08:00
jaredevantabor
dc5716f0ea changing jobDetail to jobResults throughout the app 2017-03-01 12:54:30 -08:00
jaredevantabor
daa3746ef7 removing helpers/JobDetail.js 2017-03-01 12:54:30 -08:00
jaredevantabor
14d9eb9277 removing some old stale code from host event stdout after decoupling job-results from job-details 2017-03-01 12:53:20 -08:00
jaredevantabor
edaf3e1f25 removing old job-details folder 2017-03-01 12:53:20 -08:00
jaredevantabor
5c22cb1f69 moving some functions from JobDetailService to jobResultsService 
in order to decouple the old job details from the new job results so we can
remove the job detail files at some point
 2017-03-01 12:52:25 -08:00
Michael Abashian
6604a36bc9 Merge pull request #5599 from mabashian/cleanup-widgets 
Cleanup widgets
 2017-03-01 14:25:32 -05:00
jlmitch5
2b838a3978 Merge pull request #5592 from jlmitch5/removeOldSearchComments 
remove old search comments
 2017-03-01 14:03:16 -05:00
John Mitchell
45620f35a3 fix jshint error 2017-03-01 13:50:02 -05:00
John Mitchell
55b74ddd23 fix refresh and refreshJobs functions 2017-03-01 12:46:39 -05:00
Michael Abashian
ab0e20c976 Remove StreamWidget 2017-03-01 11:54:18 -05:00
Michael Abashian
239d3001d1 Widgets dir cleanup 2017-03-01 11:48:38 -05:00
Alan Rominger
9e109019fe Merge pull request #5574 from AlanCoding/req_test_dev 
In requirements test, skip -e entries from pip freeze
 2017-03-01 09:21:43 -05:00
AlanCoding
f90ba8e6a6 small refactor of python requirement test to work in dev env 2017-03-01 09:04:31 -05:00
Michael Abashian
0487b664ca Fixed unit tests 2017-02-28 16:30:57 -05:00
Michael Abashian
d6ba134234 Helpers directory cleanup 2017-02-28 15:54:04 -05:00
John Mitchell
cb30b47098 remove old search comments 2017-02-28 15:46:32 -05:00
Graham Mainwaring
4b68a2f208 Merge pull request #5582 from ghjm/devel 
Fix MD5 for CentOS 7.3 ISO
 2017-02-28 14:21:17 -05:00
Ryan Petrello
7b34b36e5e Merge pull request #5576 from ryanpetrello/fix-4756 
prohibit API payloads that represent something other than a JSON object
 2017-02-28 14:04:32 -05:00
Ryan Petrello
d97ff57cda prohibit API payloads that represent something other than a JSON object 
The JSON serializer for our API uses ``json.loads``, which permits *any*
valid JSON (including bare integers, boolean values, etc).  Lots of our
code, however, assumes that inbound JSON content will be a dict.

see: #4756
 2017-02-28 13:23:03 -05:00
Michael Abashian
e5cfa51410 Merge pull request #5584 from mabashian/controllers-audit 
Leftover cleanup from 3.1 back to devel
 2017-02-28 12:39:37 -05:00
Michael Abashian
bfcbd8a823 Leftover cleanup from 3.1 back to devel 2017-02-28 12:03:41 -05:00
Matthew Jones
1fefa4cfdd Merge branch 'stable' into devel 
* stable: (275 commits)
  Install correct rpm-sign package in RPM builder
  Updating changelog for 3.1 release
  Switch job_type to check from sync when detecting delete_on_update
  use Unicode apostrophes - not single quotes - for French i18n strings
  pin appdirs==1.4.2
  only cancel deps if we can cancel the inv update
  fixing module_name check and adding support for the debug module
  cancel jobs dependent on inv update
  update tests
  CSS tweaks to workflow results panels
  like inventory updates, check if project update deps already processed
  Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked"
  Add awx/ui/client/languages to .gitignore
  Delete awx/ui/client/languages/*.json
  refactor based on review
  Add missing permission check.
  Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement
  avoid duplicated related search fields
  Fix workflow audit items
  fixing module name, json blob, and stdout-for-yum-module on host event
  ...
 2017-02-28 11:37:05 -05:00
Matthew Jones
fc66bb1e42 Merge branch 'release_3.1.0' into stable 
* release_3.1.0: (2069 commits)
  Updating changelog for 3.1 release
  Switch job_type to check from sync when detecting delete_on_update
  use Unicode apostrophes - not single quotes - for French i18n strings
  pin appdirs==1.4.2
  only cancel deps if we can cancel the inv update
  fixing module_name check and adding support for the debug module
  cancel jobs dependent on inv update
  update tests
  CSS tweaks to workflow results panels
  like inventory updates, check if project update deps already processed
  Revert "Merge pull request #5553 from chrismeyersfsu/fix-waiting_blocked"
  Add awx/ui/client/languages to .gitignore
  Delete awx/ui/client/languages/*.json
  refactor based on review
  Add missing permission check.
  Make current_groups a set to easily avoid duplicates, update asgi-amqp requirement
  avoid duplicated related search fields
  Fix workflow audit items
  fixing module name, json blob, and stdout-for-yum-module on host event
  just like we fail running tasks fail waiting tasks
  ...
 2017-02-27 16:27:16 -05:00
Matthew Jones
98daaece73 Switch job_type to check from sync when detecting delete_on_update 2017-02-27 16:22:05 -05:00
Michael Abashian
a5e4074575 Merge pull request #5530 from mabashian/modularize-v1 
Modularized what was left in the controllers directory
 2017-02-27 12:55:01 -05:00
Ryan Petrello
242e1b543c Merge pull request #5552 from ryanpetrello/fix-5536 
use Unicode apostrophes - not single quotes - for French i18n strings
 2017-02-27 12:31:33 -05:00
Ryan Petrello
e8ecc4226b use Unicode apostrophes - not single quotes - for French i18n strings 
see: #5536
 2017-02-27 12:23:07 -05:00
Ryan Petrello
1878fbf973 Merge pull request #5573 from ryanpetrello/fix-appdirs-dep 
pin appdirs==1.4.2
 2017-02-27 12:21:54 -05:00
Chris Meyers
e6e636f247 Merge pull request #5571 from chrismeyersfsu/fix-5566 
cancel jobs dependent on inv update
 2017-02-27 12:08:09 -05:00
Ryan Petrello
30a3439aa9 pin appdirs==1.4.2 
setuptools requires appdirs >= 1.4.0
ff371f18f0 (diff-2eeaed663bd0d25b7e608891384b7298)
 2017-02-27 12:06:35 -05:00
Jared Tabor
d72c79fb26 Merge pull request #5572 from jaredevantabor/host-event-stdout 
fixing module_name check and adding support for the debug module
 2017-02-27 08:44:44 -08:00
Chris Meyers
c1bace87ab only cancel deps if we can cancel the inv update 2017-02-27 11:37:29 -05:00
jaredevantabor
683a1252c8 fixing module_name check and adding support for the debug module 2017-02-27 08:33:53 -08:00
Chris Meyers
f3e514246e cancel jobs dependent on inv update 2017-02-27 11:28:29 -05:00
Michael Abashian
a1840863da Merge pull request #5569 from mabashian/5563-footer 
CSS tweaks to workflow results panels
 2017-02-27 11:16:49 -05:00
Chris Meyers
fcbce13873 Merge pull request #5568 from chrismeyersfsu/fix-5562 
revert waiting task stuck fix
 2017-02-27 11:03:23 -05:00
Chris Meyers
9f8df08e1d update tests 2017-02-27 10:56:34 -05:00
Michael Abashian
5c5ab0936e CSS tweaks to workflow results panels 2017-02-27 10:53:41 -05:00
Chris Meyers
a1c76d3adc like inventory updates, check if project update deps already processed 2017-02-27 10:34:44 -05:00
Wayne Witzel III
c919f1ef30 Merge pull request #5487 from wwitzel3/issue-5341 
explicit ordering in workflow_nodes views
 2017-02-27 10:06:58 -05:00
Aaron Tan
fe3605ccdd Merge pull request #5534 from jangsutsr/3551_restore_original_behavior_of_group_children_unattach 
Restore original behavior of group children unattach
 2017-02-27 10:05:15 -05:00