External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-03 02:28:12 -03:30
Code Issues Packages Projects Releases Wiki Activity
22,562 Commits 56 Branches 102 Tags
ba4e79fd3a84d0effa7f281130d07c7d9f8757bb
Commit Graph

22562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keith Grant
9d66b583b7 158 paginated data list (#180) 
* working: rename OrganizationTeamsList to PaginatedDataList

* convert org notifications list fully to PaginatedDataList

* update NotificationList tests

* refactor org access to use PaginatedDataList

* update tests for org access refactor; fix pagination & sorting

* restore Add Role functionality to Org roles

* fix displayed text when list of items is empty

* preserve query params when navigating through pagination

* fix bugs after RBAC rebase

* fix lint errors, fix add org access button
 2019-04-29 10:08:50 -04:00
softwarefactory-project-zuul[bot]
aaeb2d6fb9 Merge pull request #3740 from wenottingham/lets-re-compose-ourselves 
Sync docker-compose dockerfile with the actual production image build.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-26 19:05:43 +00:00
softwarefactory-project-zuul[bot]
c707e60bde Merge pull request #3664 from vismay-golwala/pagination_cap_api 
Cap page_size in pagination urls

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-26 17:55:51 +00:00
mabashian
b7e26b3507 Fix linting error 2019-04-26 13:15:37 -04:00
softwarefactory-project-zuul[bot]
44fcf2e0e4 Merge pull request #3766 from ryanpetrello/devel 
merge in downstream changes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-26 17:09:48 +00:00
Michael Abashian
3c06c97c32 Merge pull request #173 from mabashian/151-org-rbac 
Add RBAC to org views (now with tests!)
 2019-04-26 12:01:33 -04:00
mabashian
3cd8d4f7e6 Adds more sort options to lists 2019-04-26 11:52:07 -04:00
softwarefactory-project-zuul[bot]
ddde669083 Merge pull request #3767 from ryanpetrello/cors-lite 
document CORS middleware

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-26 15:32:35 +00:00
Jake McDermott
36e384e8ab hide dashboard tips on graph teardown event 2019-04-26 11:18:39 -04:00
mabashian
8cfe74a854 Code cleanup, renaming functions, use .all() on config promises 2019-04-26 11:02:16 -04:00
Ryan Petrello
586c3e4583 document CORS middleware 2019-04-26 11:00:33 -04:00
Jake McDermott
14045c1017 fix undefined prop in template credential prompt initialization 
The prompt initialization code had a reference to an undefined
prop. This updates the code to use the expected prop.
 2019-04-26 10:34:00 -04:00
Ryan Petrello
d11dfd0a2b Merge branch 'downstream' into devel 2019-04-26 08:02:04 -04:00
beeankha
cb7914dfa4 Make edits per first round of reviews. 2019-04-25 17:16:39 -04:00
beeankha
639e01e884 Remove unnecessary line 2019-04-25 16:26:58 -04:00
beeankha
e4d6d51cf5 Add further details/overview of AWX and Tower tasks into documentation 2019-04-25 16:14:49 -04:00
mabashian
7f452ee8d1 Add more sort options to new lists 2019-04-25 15:32:25 -04:00
Ryan Petrello
27d74528c0 Merge pull request #3494 from rooftopcellist/analytics_csv 
analytics table copies formatted as csv now
 2019-04-25 14:48:59 -04:00
Ryan Petrello
0ada1e965f Merge pull request #3508 from ryanpetrello/runner-134 
pin runner 1.3.4
 2019-04-25 10:16:05 -04:00
Ryan Petrello
2808a852eb pin runner 1.3.4 2019-04-25 09:49:03 -04:00
Ryan Petrello
80393e9194 Merge pull request #3504 from wenottingham/im-not-going-to-be-ignored-dan 
Kill the rabbitmq sos collection from our plugin.
 2019-04-24 14:51:01 -04:00
Bill Nottingham
aa52e41c02 Kill the rabbitmq sos collection from our plugin. 
It exists in upstream sosreport, and this can cause conflicts.
 2019-04-24 14:15:17 -04:00
Ryan Petrello
d7cdec37f2 Merge pull request #3502 from ryanpetrello/metrics-license-counts 
fix a few issues with license counts in /api/v2/metrics/
 2019-04-24 12:37:03 -04:00
softwarefactory-project-zuul[bot]
f60857013e Merge pull request #3754 from AlanCoding/gce_env_var 
Simplify gce inventory plugin injector

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 16:25:09 +00:00
Ryan Petrello
c9424f9af8 fix a few issues with license counts in /api/v2/metrics/ 
- switched these to gauges so people can track them over time
- fixed a typo that caused `free_instances` to always be zero
 2019-04-24 12:23:07 -04:00
Ryan Petrello
66f883befe Merge pull request #3485 from wenottingham/aaaaaaaaaaaaaaaaaaaaaaazure 
Update Azure requirements for Ansible stable-2.8 branch.
 2019-04-24 12:05:58 -04:00
softwarefactory-project-zuul[bot]
fad0274373 Merge pull request #3686 from vismay-golwala/instance_group_delete 
[WIP] Disallow deleting controller or isolated instance groups

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 15:19:19 +00:00
mabashian
e5dda696d7 Add new tests for rbac on some of the org pages 2019-04-24 10:10:14 -04:00
Michael Abashian
8c715fc6e1 Merge pull request #3497 from dsesami/e2e_backport_3.5.0 
E2E testing: compatibility edit to work with diff versions of node
 2019-04-24 10:03:53 -04:00
Daniel Sami
870ebb4b43 fix to work with diff versions of node 2019-04-24 09:44:41 -04:00
softwarefactory-project-zuul[bot]
e78ef82385 Merge pull request #3758 from ryanpetrello/dot-files 
clean up some old dotfiles

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 13:06:20 +00:00
Matthew Jones
1eb565543c Merge pull request #3495 from ansible/markerfiletest 
Adding a markerfile for e2e runs
 2019-04-24 09:06:03 -04:00
John Hill
082a819160 removing hyphen 2019-04-24 08:22:07 -04:00
Ryan Petrello
519d2eebcb remove unnecessary dotfiles 2019-04-23 17:23:15 -04:00
Michael Abashian
f2ea9003a3 Merge pull request #3493 from dsesami/e2e_backport_3.5.0 
E2E backport 3.5.0
 2019-04-23 16:51:34 -04:00
Christian Adams
64ae7a6e45 analytics table copies formatted as csv now 2019-04-23 16:26:14 -04:00
softwarefactory-project-zuul[bot]
b47be3c8c7 Merge pull request #3749 from AlanCoding/simple_openstack 
Use common method for openstack OS_CLIENT_CONFIG_FILE injection

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-23 20:23:05 +00:00
John Hill
2f7ec6ff13 adding a markerfile for e2e runs 2019-04-23 16:01:45 -04:00
Daniel Sami
75065b6407 e2e stability backport for 3.5 2019-04-23 15:45:27 -04:00
mabashian
82db7df6b3 Remove errant comment 2019-04-23 15:19:46 -04:00
mabashian
f57876b6d9 Fix existing test failures 2019-04-23 14:55:06 -04:00
softwarefactory-project-zuul[bot]
2cb6104fe4 Merge pull request #3696 from AlanCoding/django2_warnings 
Fix Django 2.0 deprecation warnings

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-23 18:09:58 +00:00
softwarefactory-project-zuul[bot]
f90f8ba9a8 Merge pull request #3755 from ansible/noretry 
Adding an option to run all the tests without a retry statement

Reviewed-by: awxbot
             https://github.com/awxbot
 2019-04-23 17:48:52 +00:00
mabashian
38bb4f3f3c Fix merge conflicts 2019-04-23 13:27:00 -04:00
mabashian
5ae7cbb43a Add RBAC to org views 2019-04-23 13:19:34 -04:00
John Hill
9733fde560 Adding an option to run all the tests without a retry statement 2019-04-23 13:18:34 -04:00
Michael Abashian
1509ef3e80 Merge pull request #143 from mabashian/wizard-access-list 
Add roles modal to org access list
 2019-04-23 13:12:31 -04:00
mabashian
df87681e6d Fix linting errors 2019-04-23 12:20:08 -04:00
Ryan Petrello
231c76c9cb Merge pull request #3490 from jakemcdermott/fix-3487 
handle insights credential lookups for projects
 2019-04-23 12:08:43 -04:00
mabashian
621cc3f839 Fix rebase errors 2019-04-23 11:52:49 -04:00