1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Commit Graph

14763 Commits

Author SHA1 Message Date
crepe
bb0e968704 Add mattermost notifications 2017-09-09 22:00:31 -07:00
Matthew Jones
2fb9b6cf25 Merge pull request #14 from AlanCoding/rel_obj_conservation
Pass existing object references within access methods
2017-09-08 15:22:40 -07:00
Matthew Jones
c6ae6b84d5 Merge pull request #13 from AlanCoding/exceptions
use exceptions for job cancel and failure
2017-09-08 15:19:41 -07:00
Matthew Jones
2620da1f4e Merge pull request #85 from sebthebert/sebthebert-patch-1
Add the 'installer' directory to 'inventory' and 'install.yml' files
2017-09-08 15:11:24 -07:00
Sebastien Thebert
f4770d065e Add the 'installer' directory to 'inventory' and 'install.yml' files
Add the 'installer' directory to 'inventory' and 'install.yml' files in the 'Docker' Section
2017-09-08 23:43:00 +02:00
Matthew Jones
c5c926f29c Merge pull request #82 from Zokormazo/fix-typo-local_docker
Fix typo in local_docker task
2017-09-08 13:35:09 -07:00
Julen Landa Alustiza
98c7f1181e Fix typo in local_docker task
Signed-off-by: Julen Landa Alustiza <julen@zokormazo.info>
2017-09-08 22:21:23 +02:00
Matthew Jones
1098f7d9f4 Merge pull request #81 from ansible/revert-61-devel
Revert "Ensure Docker is running fixes #59"
2017-09-08 13:10:35 -07:00
Matthew Jones
493094dc18 Revert "Ensure Docker is running fixes #59" 2017-09-08 16:10:01 -04:00
Matthew Jones
4067cf639b Merge pull request #77 from martinbydefault/patch-1
typo fix
2017-09-08 12:52:40 -07:00
Greg Considine
ccbf7af7f2 Merge pull request #49 from gconsidine/ui/clean-build
Update UI build system
2017-09-08 15:49:02 -04:00
martinbydefault
133e9fed4a typo fix 2017-09-08 16:26:13 -03:00
gconsidine
fba8a48d91
Update dependencies, template file, and docs
* Use git+https prefix in git-based npm dependencies
* Use ejs template for index to fix extraneous slash in path
* Remove outdated documentation
* Remove unused service
* Regenerate shrinkwrap
2017-09-08 15:17:01 -04:00
Greg DeKoenigsberg
75699f82e9 update code of conduct url 2017-09-08 14:33:48 -04:00
Greg DeKoenigsberg
05ce5e6e2f Fixing code of conduct url
never swapped out the old url, fixing
2017-09-08 13:41:48 -04:00
Wayne Witzel III
0da416b141 Merge pull request #46 from swills/install-req-gmake-git
add missing build deps
2017-09-08 10:36:29 -04:00
Wayne Witzel III
a825c84521 Merge pull request #61 from Numblesix/devel
Ensure Docker is running fixes #59
2017-09-08 09:34:18 -04:00
Wayne Witzel III
a8841e2e2b Merge pull request #60 from FooBarQuaxx/patch-1
Fixed typo in supervisor autorestart option
2017-09-08 09:22:22 -04:00
Sandro Emma
21ae187d02 Ensure Docker is running fixes #59
Signed-off-by: Sandro Emma <feeds.sandro@gmail.com>
2017-09-08 14:52:06 +02:00
MAA
6915c21092 Fixed typo in supervisor autorestart option 2017-09-08 13:38:30 +02:00
Ryan Petrello
37bbb0758c Merge pull request #51 from puiterwijk/fixbackport
Use distutils find_executable instead of which
2017-09-07 20:06:42 -07:00
Patrick Uiterwijk
3816791aa4 Use distutils find_executable instead of which
Fixes: #44

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2017-09-08 01:49:50 +00:00
Matthew Jones
534fefd82f Merge pull request #42 from geerlingguy/installer-whitespace-cleanup
Whitespace cleanup for installer.
2017-09-07 17:23:42 -07:00
gconsidine
c57c17546e
Update UI build system
* Faster build times
* Smaller bundle sizes
* Adjust paths
* Cleanup npm dependencies
* Remove unneded Grunt tasks
2017-09-07 18:09:14 -04:00
Matthew Jones
33c0f8c721 Merge pull request #39 from puiterwijk/fix-nameid
Fix using SAML NameID
2017-09-07 14:28:13 -07:00
Steve Wills
dfaca1c42b add missing build deps 2017-09-07 17:22:59 -04:00
Jeff Geerling
6abffcb1df Whitespace cleanup for installer. 2017-09-07 14:21:28 -07:00
Bill Nottingham
0489d945fb Merge pull request #36 from Zokormazo/fix-typo
Fix typo in contributing guide
2017-09-07 14:11:18 -07:00
Patrick Uiterwijk
830012e2f4 Fix using SAML NameID
Without this patch, SAML backend will only use the first letter of the NameID as attribute value.

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
2017-09-07 20:54:27 +00:00
Julen Landa Alustiza
81ef293361 Fix typo in contributing guide
Signed-off-by: Julen Landa Alustiza <julen@zokormazo.info>
2017-09-07 21:48:55 +02:00
Bill Nottingham
b565fd2ec1 Merge pull request #29 from bjoernfan/doc-install-fixes
Documentation fixes in INSTALL.md
2017-09-07 09:33:57 -07:00
Bill Nottingham
8cb55107d0 Merge pull request #32 from wenottingham/devel
Nuke old license file.
2017-09-07 07:46:02 -07:00
Bill Nottingham
9524a5c860
Nuke old license file.
Signed-off-by: Bill Nottingham <notting@splat.cc>
2017-09-07 07:19:03 -07:00
Aaron Tan
42bbd7d47a Merge pull request #18 from jangsutsr/wrap_up_ctint_unit_tests
Wrap up Tower configuration unit tests
2017-09-07 09:49:14 -04:00
Björn Pettersson
b833451257 doc: Add missing bracket to anchor link
Signed-off-by: Björn Pettersson <bjorn@undef.io>
2017-09-07 13:15:50 +02:00
Björn Pettersson
ea61aa1e1c doc: Fix docker anchor links
Signed-off-by: Björn Pettersson <bjorn@undef.io>
2017-09-07 13:15:49 +02:00
Björn Pettersson
8f4bb3f19c doc: Remove trailing whitespace
Signed-off-by: Björn Pettersson <bjorn@undef.io>
2017-09-07 13:15:47 +02:00
Björn Pettersson
4704800ce3 doc: intalling -> installing
Signed-off-by: Björn Pettersson <bjorn@undef.io>
2017-09-07 13:15:40 +02:00
Ryan Petrello
2f915c2182 Merge pull request #25 from ryanpetrello/devel
add a badge for shippable build status
2017-09-06 21:29:55 -07:00
Ryan Petrello
77f07ca0e3
add a badge for shippable build status 2017-09-06 21:15:49 -07:00
AlanCoding
41940687f1
Pass existing object references within access methods
This avoids re-loading objects from the database in our
chain of permission checking, wherever possible.
access.py is equiped to handle object references instead
of pk ints, and permissions.py is changed to pass those refs.
2017-09-06 16:34:00 -07:00
Ryan Petrello
bfea00f6dc Merge pull request #24 from ryanpetrello/devel
fix broken shippable test suite
2017-09-06 19:32:51 -04:00
Ryan Petrello
44702c5cfd
fix broken shippable test suite 2017-09-06 16:12:43 -07:00
jlmitch5
37c2d01260 Merge pull request #16 from jlmitch5/newNav
new navigation in UI
2017-09-06 17:54:21 -04:00
John Mitchell
ea91fabba0
implement componenitized navigation and remove old nav and layout code 2017-09-06 17:32:32 -04:00
Jared Tabor
a8d882dcc5 Merge pull request #22 from jaredevantabor/spud-logo-placement
adjusting placement of spud on login screen
2017-09-06 14:08:28 -07:00
Jared Tabor
35b44af030 adjusting placement of spud on login screen 2017-09-06 13:37:41 -07:00
Matthew Jones
4127aad3d4
Merge branch 'awx_installer' into devel
* awx_installer:
  Adds docker installation steps (#15)
  Call out eval for setting up the minishift environment
  Support official image builds with awx logos
  Add support for standalone docker install
  First iteration on INSTALL
  Adds edge terminated route
  Ignore Pycharm droppings
  Force reauth docker registry login in installer
  Reduce the size of the production container image
  Initial awx installer
2017-09-06 16:25:55 -04:00
Matthew Jones
67d1a86d81
Merge branch 'release_3.2.0' into devel
* release_3.2.0: (138 commits)
  Pull Dutch and Spanish translations
  Increase verbosity of CTiT Logging test error handling
  fix to console error of conditional toggle showing
  Fix error message when calling remove on undefined DOM element
  fix ctit logging toggle from being showed for log types other than https
  Remove delete and edit buttons from smart inventory host list.  Only option should be view.
  feedback from PR
  Enhance query string in ad hoc command event save to consider smart inventory
  Fixed host filter clearall
  fuller validation for host_filter
  On JT form, Show credential tags from summary_fields if user doesn't have view permission on the credential
  Align key toggle button to role dropdown in user team permissions modal
  Removed rogue console.logs
  Removed extra refresh call
  Enhace query string in job event save to consider smart inventory
  Fix typo in scan_packages plugin
  Switch running_jobs and capacity table columns
  Disable insights cred when user doesn't have edit permissions
  Disallow changing credential_type of an existing credential
  fix bug with host_filter RBAC check
  ...
2017-09-06 16:10:08 -04:00
Shane McDonald
df8ab0d9a9 Pull Dutch and Spanish translations 2017-09-06 14:46:06 -04:00