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
9,397 Commits 54 Branches 19 Tags
Commit Graph

9397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Mitchell
03204f8dc0 fixed merge conflict 2016-07-22 15:01:58 -04:00
John Mitchell
22a96240a3 fix wrapping of name columns 2016-07-22 14:37:16 -04:00
Chris Meyers
37ddf2a4d9 fix unit test on travis 2016-07-22 14:00:28 -04:00
James Laska
2a791b8e90 Merge pull request #3099 from jlaska/tox 
Add travis-ci integration using tox
 2016-07-22 13:56:26 -04:00
James Laska
1f9df1fdf3 Default to not running old tests 2016-07-22 13:19:57 -04:00
James Laska
77202ec696 Only run unit and function tests 2016-07-22 13:19:57 -04:00
James Laska
29778538c3 Be sure to install ansible 
Enable the mongodb travis service too
 2016-07-22 13:19:57 -04:00
James Laska
6140c8c500 Additional travis/tox tweaks 
* Enable travis caching
* Disable coverage after_build
* Call setup.py develop first
* Include pytest config and enable skipsdist
 2016-07-22 13:19:57 -04:00
Shane McDonald
5c516b60b3 ¯\_(ツ)_/¯ 
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯  ¯\_(ツ)_/¯
 2016-07-22 13:19:57 -04:00
James Laska
f3c186310b First pass at getting tox and travis working 2016-07-22 13:19:57 -04:00
Chris Meyers
a1b29d8f4b Merge pull request #3087 from chrismeyersfsu/fix-migration_log 
log migration to standard tower log dir
 2016-07-22 13:10:42 -04:00
Chris Meyers
e5b031e533 use existing logging infrastructure 2016-07-22 12:52:25 -04:00
AlanCoding
6fee46fb66 Reorganize activity stream around org admin/auditors 2016-07-22 12:50:14 -04:00
Chris Meyers
b6ff1d8c21 Merge pull request #3092 from chrismeyersfsu/remove-label_cleanup_job 
forgot to remove label cleanup periodic task
 2016-07-22 12:20:27 -04:00
Chris Meyers
6ea24dea34 Merge pull request #3091 from chrismeyersfsu/fix-#2847 
Always create fact cleanup job
 2016-07-22 12:14:20 -04:00
Chris Meyers
32229e1af8 Merge pull request #3080 from chrismeyersfsu/fix-superuser_license_host_add 
check license permission on host create
 2016-07-22 11:47:41 -04:00
Michael Abashian
6da3ac0cc1 Improvements to awlookup directive to prevent making rest calls every time a character is added/removed 2016-07-22 11:39:21 -04:00
Akita Noek
50ada022b5 Merge pull request #3082 from anoek/3077 
Fixed the need for elevated permissions to make changes to job templates under some scenarios
 2016-07-22 10:55:51 -04:00
Chris Meyers
c42af3c61a forgot to remove label cleanup periodic task 2016-07-22 10:33:30 -04:00
Akita Noek
64d653bc61 Equate '' to None for foreign key references when PUTing to a job template 
The UI will sometimes send an empty string instead of null, we already
handle this in our serializer and treat it as null, so this change
brings our access system in line with the expectation that those two
things should be equal.

 Possibly related to #3077
 2016-07-22 10:11:33 -04:00
Chris Meyers
eb89cf98cc Always create fact cleanup job 2016-07-22 10:05:00 -04:00
Chris Meyers
811d6dfe3d add missed log and fix dev env 2016-07-22 10:04:02 -04:00
Michael Abashian
fde13c6a46 Prevent the page from reloading when an alert modal is open but not focused and the user hits enter 2016-07-22 09:55:14 -04:00
Akita Noek
2934cbbbae Allow users to post some ignored read only fields to job templates without elevated permissions 
Previously, posting these fields would cause us to check and see if the
user has not only admin access to the job template but use access on
anything used by the job template (because the fields wern't white
listed as being ok to modify without comprehensive use access). It's
convenient for the QA team to be allowed include these fields in PUT's,
and since they're ignored, this patch is fairly benign and shouldn't
alter any behavior.

 #3076
 2016-07-22 09:51:00 -04:00
Chris Meyers
fd098e64dc log migration to standard tower log dir 2016-07-22 09:29:07 -04:00
Michael Abashian
180ec67d33 Added tooltip to group schedule action button 2016-07-22 08:54:50 -04:00
Michael Abashian
c910efdfa0 Updated inventories permissions basepath 2016-07-22 08:36:20 -04:00
kensible
6fa95322f5 Merge pull request #3071 from kensible/2860-label-deletion-pagination 
Deleting label passes current page number for pagination
 2016-07-22 08:05:06 -04:00
Akita Noek
5bce9ee215 If you have use_role on an inventory, make it so you can use it in scan jobs 
#3077
 2016-07-21 17:22:11 -04:00
Michael Abashian
2115150b2c Merge pull request #3079 from mabashian/remove-tooltips-on-state-change 
Remove tooltips if state changes while hovering over a tool tipped element
 2016-07-21 17:00:47 -04:00
Chris Meyers
4cf7344dc4 check license permission on host create 2016-07-21 16:53:25 -04:00
Michael Abashian
6e27ec06f0 Merge pull request #3053 from mabashian/active-edit-paging 
Fix for active row/edit icon bug when paging
 2016-07-21 16:35:05 -04:00
Alan Rominger
49b8fc4003 Merge pull request #3070 from AlanCoding/3063_ui 
Show "new" jobs in UI Jobs tab (UI 3.0.1)
 2016-07-21 16:24:41 -04:00
Michael Abashian
265e334dd3 Remove tooltips if state changes while hovering over a tool tipped element 2016-07-21 16:20:55 -04:00
Chris Meyers
46998cdcfe Merge pull request #3075 from chrismeyersfsu/fix-fact_migration_performance 
do not cache mongo records
 2016-07-21 15:12:00 -04:00
Chris Meyers
d886d07364 do not cache mongo read data on migration 2016-07-21 15:11:16 -04:00
Alan Rominger
03a24da2e1 Merge pull request #3061 from AlanCoding/3038_UJT_301 
Pass context into unified Job, Job Template, and Job List serializers (API 3.0.1)
 2016-07-21 11:58:26 -04:00
Alan Rominger
07a1f4bee2 Merge pull request #3062 from AlanCoding/3037_orphan_proj 
orphan project protection in job delete access (API 3.0.1)
 2016-07-21 11:57:58 -04:00
Alan Rominger
9513a14ac6 Merge pull request #3068 from AlanCoding/3063_cancel_flag 
Allow instant cancel for new jobs (API 3.0.1)
 2016-07-21 11:57:40 -04:00
Akita Noek
203279bef1 Merge pull request #3069 from anoek/3067 
Fix migration problems with inventoryless job templates
 2016-07-21 11:43:15 -04:00
Ken Hoes
fbed0ac03b Deleting label passes current page number for pagination 2016-07-21 11:37:16 -04:00
AlanCoding
efff0d68b5 Show new jobs in UI Jobs tab 2016-07-21 11:37:10 -04:00
John Mitchell
f7bfeed0ca renaming dir again 2016-07-21 11:31:11 -04:00
John Mitchell
d6bb405ebd renaming dir 2016-07-21 11:30:33 -04:00
Matthew Jones
495115af6a Bump version number for 3.0.1 release 2016-07-21 10:51:44 -04:00
Matthew Jones
1208450f59 Merge branch 'stable' into devel 
* stable:
  Update 3.0 changelogs
  Spacing in sh script on merge conflict
  Update setup for bundled ansible-2 dependencies
  fix ansible2.0 bundle deps bootstrap
  Use yum's compare_providers() function instead of just pulling the latest alphabetically.
 2016-07-21 10:49:50 -04:00
Akita Noek
de9ae86ecc Fix migration problems with inventoryless job templates 
#3067
 2016-07-21 10:35:43 -04:00
AlanCoding
7e49a428e6 Allow instant cancel for new jobs 2016-07-21 09:05:32 -04:00
Michael Abashian
9f75635ea7 Merge pull request #3059 from mabashian/jobs-related-schedule-search 
Maintain job schedule search query params after adding/removing search tags
 2016-07-21 08:33:39 -04:00
Michael Abashian
cadd54112b Merge pull request #3056 from mabashian/table-sort-home-host 
Make home/host columns sortable
 2016-07-21 08:33:13 -04:00