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

6931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Jones
ba7f48abf1 Updating tests around data preload 2016-04-18 11:27:39 -04:00
Matthew Jones
d1801bdf9f Demo data flake8 cleanup 2016-04-15 15:14:10 -04:00
Matthew Jones
8c4e4f4c0d Creating pre-loaded demo data 
* Bootstrap some initial data if there is no default org
* Renamed default org script appropriately
 2016-04-15 14:42:51 -04:00
Matthew Jones
6f79ec8830 Revert "Merge pull request #1534 from chrismeyersfsu/fix-config_performance" 
This reverts commit 7cc144fa59f157a5e1789a913e0d9a31720141ec, reversing
changes made to 86af9950e754b06f40cb293a36ab365f589273db.
 2016-04-14 11:40:07 -04:00
Chris Meyers
ae1e6943f4 Merge pull request #1528 from chrismeyersfsu/feature-migration_enforcement 
fail early if not on 2.4.x
 2016-04-14 10:27:45 -04:00
Chris Meyers
27a710c508 Merge pull request #1534 from chrismeyersfsu/fix-config_performance 
fixes config endpoint performance issue
 2016-04-14 10:25:19 -04:00
Chris Meyers
de1681663d fix flake8 and spelling 2016-04-14 08:55:56 -04:00
Jared Tabor
d5f032acb8 updated org-add form controller with form obj 2016-04-13 17:54:38 -07:00
Chris Meyers
043f97fe35 fixes config endpoint performance issue 2016-04-13 17:28:38 -04:00
Michael Abashian
d7f75ce130 Merge pull request #1524 from mabashian/jt-form-save-refactor 
Refactor of job template formSave
 2016-04-13 16:33:04 -04:00
Chris Meyers
f0a761e889 Merge pull request #1517 from chrismeyersfsu/fix-scan_job_time 
fix scan job timestamp
 2016-04-13 15:49:13 -04:00
Michael Abashian
946cec2b7a Refactored formSave to remove old survey logic as well as remove unnecessary event emit. 2016-04-13 14:52:56 -04:00
Wayne Witzel III
90f9e5185a Merge pull request #1514 from wwitzel3/rbac-bug-1477 
RBAC JobTemplate / Job Access Updates
 2016-04-13 14:50:17 -04:00
Leigh
fe3f01a6fc Merge pull request #1518 from leigh-johnson/UserTeamsEdit 
Populate fields in users.edit & teams.edit, fix Organization lookup in team.edit
 2016-04-13 13:57:51 -04:00
Wayne Witzel III
ee9b876959 Merge pull request #1479 from wwitzel3/rbac-bug-1432 
read-only view /organization/<id>/projects
 2016-04-13 13:07:27 -04:00
Wayne Witzel III
c2e9237b14 adjusting access based on PR feedback 2016-04-13 13:06:08 -04:00
Wayne Witzel III
e53c2bdfa5 Fixes #1477 2016-04-13 12:40:22 -04:00
Wayne Witzel III
4950db8ac9 remove tests that are no longer valid 2016-04-13 11:41:15 -04:00
Wayne Witzel III
c0b5fafafe read-only view /organization/<id>/projects 2016-04-13 11:39:14 -04:00
Matthew Jones
6150addc2e Updates to makefile to coerce pip install and usage for dependencies 2016-04-13 11:18:52 -04:00
Chris Meyers
c8010fc0ce use new timestamp logic in tests 2016-04-13 09:41:28 -04:00
Michael Abashian
3e479d5602 Merge pull request #1449 from mabashian/survey-rework 
Create/edit survey re-work
 2016-04-13 07:44:12 -04:00
Jared Tabor
eee91eea86 Merge pull request #1451 from jaredevantabor/notifications 
Adding notifications into the UI
 2016-04-12 16:11:13 -07:00
Leigh Johnson
30439a85b0 populate fields in users.edit and teams.edit $states resolves #1403 
users edit done

finish fixes to UsersTeamsEdit

fix logging issue
 2016-04-12 17:37:16 -04:00
Chris Meyers
e7d68409f7 fix scan job timestamp 2016-04-12 17:07:11 -04:00
Matthew Jones
28ffa57258 Implement rbac and related unit tests for notifications 2016-04-12 17:00:38 -04:00
Akita Noek
40731f6fc8 Merge pull request #1513 from anoek/1499 
Fix erronous singleton role created for users
 2016-04-12 16:54:19 -04:00
Akita Noek
3f0ea18e10 Merge pull request #1516 from anoek/devel 
Fix bad migration from #1496
 2016-04-12 16:52:38 -04:00
Akita Noek
1d27ddc7d2 Fix bad migration from #1496 2016-04-12 16:50:54 -04:00
Akita Noek
2ccd46de11 Merge pull request #1511 from anoek/explicit-implicit-parents 
Switch to explicitly stored implicit role parents
 2016-04-12 16:34:10 -04:00
Akita Noek
d6d8390f8c Merge pull request #1480 from anoek/migration 
Migration fixes
 2016-04-12 16:33:54 -04:00
Akita Noek
caab5b7e20 Merge branch 'migration' into explicit-implicit-parents 2016-04-12 16:31:51 -04:00
Akita Noek
ad89491a07 Fixed bad merge 2016-04-12 16:31:11 -04:00
Akita Noek
ea3a7ef227 Merge branch 'devel' of github.com:ansible/ansible-tower into migration 2016-04-12 16:30:09 -04:00
Wayne Witzel III
6bc765d1b5 Merge pull request #1507 from wwitzel3/rbac-bug-1422 
RBAC Job Fixes
 2016-04-12 16:22:47 -04:00
Akita Noek
a0356afbac Improved code clarity and UI naming for user owner role creation 
#1499
 2016-04-12 16:11:45 -04:00
jlmitch5
e3ebbab17d fix list label of status 2016-04-12 15:58:17 -04:00
Jared Tabor
62ecefb716 removing unncessary line 2016-04-12 12:55:01 -07:00
Jared Tabor
462eb19087 Changing ngToast success color 2016-04-12 12:55:01 -07:00
Jared Tabor
de56747d1c Cleaning up code from PR feedback 2016-04-12 12:55:00 -07:00
Jared Tabor
72ae8f46c9 Adding notifications into the UI 2016-04-12 12:55:00 -07:00
Akita Noek
c984b33f1e Fix erronous singleton role created for users 
Needed to be just a normal role, ie with `name` assigned instead of
`singleton_name`

 Addresses #1499
 2016-04-12 15:43:27 -04:00
Akita Noek
563917a217 Merge pull request #1509 from anoek/devel 
Fix faulty activitystream test
 2016-04-12 15:41:25 -04:00
Akita Noek
1369be8f17 Merge branch 'devel' into explicit-implicit-parents 2016-04-12 15:13:37 -04:00
Akita Noek
29c7ecf6a8 Merge branch 'devel' into migration 2016-04-12 15:12:43 -04:00
Akita Noek
8c917de24d Fix faulty activitystream test 
Test assumed that the only entry in activitystream would be related to
the creation of the organization, which in this case was not true, the
most recent being something related to the user object being created or
modified.
 2016-04-12 15:03:24 -04:00
Akita Noek
6039ad92e9 Merge branch 'devel' of github.com:ansible/ansible-tower into explicit-implicit-parents 2016-04-12 14:51:30 -04:00
Akita Noek
7b4e7ec5b3 Switch to explicitly stored implicit role parents 
Completes #1496
 2016-04-12 14:50:52 -04:00
Akita Noek
7e0bfc9831 Use --nomigrations for py.test 
This is for two reasons, 1) it's a lot faster when starting from a new
database, and 2) since we do database work within our migrations, it
doesn't actually work within py.test, which is either a bug in
pytest-djano, or a horrible behavior of pytest-django.
 2016-04-12 14:32:10 -04:00
Wayne Witzel III
7cd4fb7b7a Merge pull request #1502 from wwitzel3/rbac-feature-1324 
Update docs, driveby test fix.
 2016-04-12 13:32:56 -04:00