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

7924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Abashian
e8a39685fc Turned the activity stream button into a toggle and added a conditional tooltip for show/hide 2016-06-08 19:35:59 -04:00
Michael Abashian
d9dac237fa Merge branch 'mabashian-owners-credential-list' into release_3.0.0 2016-06-08 18:34:54 -04:00
Michael Abashian
277c3a62f0 Merge branch 'owners-credential-list' of https://github.com/mabashian/ansible-tower into mabashian-owners-credential-list 
# Conflicts:
#	awx/ui/client/src/app.js
 2016-06-08 18:34:30 -04:00
Michael Abashian
481859490d Merge pull request #2225 from mabashian/job-launch-optional-survey 
Fixed job launch bugs
 2016-06-08 18:31:03 -04:00
Jared Tabor
ceea7fd62a Merge pull request #2184 from jaredevantabor/stdout-actions 
Adding relaunch and cancel/delete buttons to the stdout page for
 2016-06-08 14:47:07 -07:00
Jared Tabor
945380c07a Redirecting non-playbook-jobs to correct stdout pages 2016-06-08 14:37:16 -07:00
Bill Nottingham
b24200245e Fix spelling 2016-06-08 17:08:35 -04:00
Bill Nottingham
2ab4fb3951 Merge pull request #2245 from wenottingham/foo-branch 
Fix org tooltip on credential.
 2016-06-08 16:29:32 -04:00
Michael Abashian
0bbd3013ab Merge pull request #2206 from mabashian/survey-button-tooltip 
Added the ability to set tooltips on form generator buttons.  Added t…
 2016-06-08 16:00:11 -04:00
Akita Noek
5dcf49f40e Merge pull request #2240 from anoek/2237 
Nuked obsolete multi-org project help tooltip on projects page
 2016-06-08 15:42:45 -04:00
Bill Nottingham
1b21734ff3 Fix org tooltip on credential. 2016-06-08 15:31:27 -04:00
James Laska
51f95e6908 Fix typo in survey_spec markdown 
Fixes #2101
 2016-06-08 15:29:09 -04:00
Akita Noek
a65dfde8dc Nuked obsolete multi-org project help tooltip on projects page 
#2237
 2016-06-08 15:03:46 -04:00
Akita Noek
f4df24647c Merge pull request #2194 from anoek/1742 
Behave better when deleting items you are currently editing
 2016-06-08 14:53:25 -04:00
Akita Noek
c1f40f9cbf Better "go to parent state" code 2016-06-08 14:33:18 -04:00
Jared Tabor
c5aee042ce fixing cancel button nghide when job is running 2016-06-08 11:30:02 -07:00
Jared Tabor
8602b66c47 adding delete/cancel for mgmt jobs stdout 2016-06-08 11:01:48 -07:00
Jared Tabor
1e44ea8f7f Adding Relaunch and cancel/delete buttons to the stdout page for 
SCM update, inv-sync, and adhoc
 2016-06-08 11:01:48 -07:00
Leigh
d4c4b9b961 fix scoping of scheduels form add/edit interval freq spinner, resolves #2165 (#2231) 2016-06-08 13:50:57 -04:00
Chris Meyers
1d928feda9 Merge pull request #2229 from chrismeyersfsu/fix-backup_custom_ui 
add restore tests
 2016-06-08 13:16:53 -04:00
Matthew Jones
908111f656 Remove mongo key from being installed on the dev container 2016-06-08 12:34:59 -04:00
Matthew Jones
20fe9e9614 Updating docker dev workflow 
* Moving to new docker compose file format
* Adding some things that will be needed for python dependencies
 2016-06-08 12:25:14 -04:00
Leigh
d29889a4bc Fix Inventory Manage > Inventory Sync schedules > add/edit (#2220) 
* fix Inventory Manage > Inventory Sync > add/edit, resolves #2164

* fix misassignment / jslint error
 2016-06-08 10:32:53 -04:00
Leigh
7506ee3509 fix Azure RM credential lookup in Inventory > Manage > Group Add/Edit, resolves #2188 (#2195) 2016-06-08 10:32:43 -04:00
Michael Abashian
27d6ccc2ea Merge pull request #2213 from mabashian/recent-jobs-status-tooltip 
Added tooltip/link to the dashboard recent jobs status icons
 2016-06-08 10:02:00 -04:00
Michael Abashian
5129a64004 Merge pull request #2215 from mabashian/job-details-date-format 
Format date strings using longDate filter in templates
 2016-06-08 10:01:34 -04:00
Michael Abashian
68bf0e57a6 Fixed job launch weirdness where having only a survey show on job launch resulted in an error. This should also fix the bug where relaunching where no passwords were needed was showing a halfway empty modal. 2016-06-08 09:56:54 -04:00
Chris Meyers
4601d2396e Merge pull request #2223 from chrismeyersfsu/imp-move_factory_fixture 
move factory fixture
 2016-06-08 09:37:47 -04:00
chris meyers
f9ffe6d52e move factory fixture 
* Move factory fixture back one directory so unit tests can now take
advantage of them; while still allowing functional tests to use them
 2016-06-08 09:24:49 -04:00
Wayne Witzel III
61fb16b8c1 Merge pull request #2222 from wwitzel3/release_3.0.0 
CredentialAccess should check for the owner_role earlier
 2016-06-08 06:11:07 -07:00
Wayne Witzel III
1fb4a68047 CredentialAccess should check for the owner_role earlier 2016-06-08 04:23:29 -04:00
Graham Mainwaring
8319877a43 Merge pull request #2217 from ghjm/vagrant_atlas 
Update web site Vagrant instructions
 2016-06-07 14:09:54 -07:00
Michael Abashian
ff18b82f10 Leverage longDate to format date strings where we were previously using a static format. This allows us to leverage the users locale when formatting and maintains consistency across Tower. 2016-06-07 16:58:53 -04:00
Matthew Jones
870175555f Remove pywinrm from tower venv 2016-06-07 16:51:43 -04:00
Matthew Jones
3b2a6eda4e Upgrade pywinrm per @nitzmahone's recommendation 2016-06-07 16:51:20 -04:00
Michael Abashian
9c047f3f3c Added tooltip/a href to the dashboard recent jobs status icons 2016-06-07 15:54:11 -04:00
Jared Tabor
dc4255def0 Merge pull request #2203 from jaredevantabor/job-template-ids 
Changing 'template_id' to 'id' for job templates
 2016-06-07 12:25:22 -07:00
kensible
0e9819a784 Merge pull request #2175 from kensible/2152-continuingAudit 
UI tweaks, fixes list #2151
 2016-06-07 15:08:08 -04:00
Matthew Jones
97e980a258 Merge pull request #2182 from wenottingham/no-more-munin 
munin is dead. Long live munin!
 2016-06-07 13:48:58 -05:00
Matthew Jones
f889113711 Granularize venv selection 
Not a good idea to select the virtualenv in the base class.  Force
selection to happen in the concrete classes by calling a helper method
to set up the proper virtualenv.   This should fix any issues where
tower is selecting the wrong virtualenv to run against.
 2016-06-07 14:47:20 -04:00
Michael Abashian
03dd11d292 Added the ability to set tooltips on form generator buttons. Added tooltip to the ADD SURVEY button on the job templates form. 2016-06-07 14:43:12 -04:00
Chris Meyers
1870ce345c Merge pull request #2179 from chrismeyersfsu/fix-backup_security2 
fix known path security problem
 2016-06-07 14:36:58 -04:00
Akita Noek
be014f012a Merge pull request #2178 from anoek/1445 
Added default values to the required job template survey questions
 2016-06-07 14:23:46 -04:00
Jared Tabor
f1f36f44b2 Changing 'template_id' to 'id' for job templates 
which was recently changed for bread crumb names
 2016-06-07 11:22:41 -07:00
Matthew Jones
8adcc4092c Use defaults when validating jt properties. 
Don't assume attrs will be populated.  Check the instance also
 2016-06-07 14:14:24 -04:00
Matthew Jones
bdf5ee1fea Import latest ec2.py and fix an issue 
Upgrading ec2.py to fix an issue where the module wasn't obeying
"replace_dash_in_groups" property.
 2016-06-07 14:01:00 -04:00
Akita Noek
5cb403dffd Made survey text fields min length default to 0 instead of 1 2016-06-07 13:54:21 -04:00
Akita Noek
68cfc71899 Fixed show/hide button being slightly too short on default password input field 2016-06-07 13:30:20 -04:00
Ken Hoes
bc618b5f83 Fixed activity stream icon hover states per PR feedback 2016-06-07 13:29:20 -04:00
Akita Noek
abcd2219fc Fixed 'show' button working the first click for the default password survey field 2016-06-07 13:21:21 -04:00