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

7814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akita Noek
76fc0f7c95 Fix monkey-punching XSS 
Because damn, punching monkeys

  #2162
 2016-06-03 16:29:08 -04:00
Akita Noek
b999206ffd Merge pull request #2146 from anoek/stdout-styling 
Stdout styling updates
 2016-06-03 14:24:21 -04:00
Akita Noek
76d9c2d192 Merge pull request #2157 from anoek/object_roles 
Disambiguate usage of `/roles` in various endpoints
 2016-06-03 14:17:53 -04:00
Akita Noek
6609732edd Updated UI to account for object_roles changes 2016-06-03 12:26:23 -04:00
Akita Noek
cedecb97e4 Refactored thing/n/roles -> thing/n/object_roles 2016-06-03 12:17:52 -04:00
Michael Abashian
e4d08e7cb1 Merge pull request #2145 from mabashian/standard-out-log 
Remove job details/stdout event socket listeners when $scope is destroyed
 2016-06-03 11:38:21 -04:00
Akita Noek
1bcb80b621 Made stdout window size nicely to fill the remaining height in the browser 
Resolves PR feedback and takes care of #1575 along the way
 2016-06-03 11:33:45 -04:00
Michael Abashian
b7b853055c Need to remove listeners from $rootScope.adhoc_event_socket 2016-06-03 11:11:59 -04:00
Leigh
c74749c508 fix organization card pagination & display count, resolves #1576 & #1466 (#2150) 2016-06-03 10:43:01 -04:00
Matthew Jones
260a06d711 Merge pull request #2147 from matburt/expose_external_accounts 
Expose any external account as a user property
 2016-06-03 09:42:07 -05:00
Akita Noek
fe56b11243 Merge pull request #2139 from anoek/2107 
Fixed job template verbosity select2 syncing
 2016-06-02 22:01:30 -04:00
Matthew Jones
26b31fedbc Expose any external account as a user property 
This adds a field to the user object to denote whether and what kind of
user account it is.

For normal accounts this field will be null.
For social auth accounts it will be "social"
for radius accounts it will be "radius"

This change also prevents a radius user from changing their local
password thus bypassing the password caching feature of django-radius
 2016-06-02 16:58:19 -04:00
Akita Noek
93ccbdc872 Code organization 2016-06-02 16:57:11 -04:00
Chris Meyers
05b3920837 Merge pull request #2144 from chrismeyersfsu/feature-setup_ci3 
more install playbook tests
 2016-06-02 16:51:40 -04:00
Akita Noek
a9426aaeb9 stdout sytle updates 
* Fixed column width to 50% for both job stdout view and inventory update
script output view
* Fixed scrolling behavior so we don't have two elements doing scrolling
(inner was doing width, outter was doing height)
* Reduced max height for stdout jt output view to 900px down from
1600px
* Flexified inner output window on inventory script output view so the
gray output area always fills the height of the panel

 #2127 @2028
 2016-06-02 16:42:06 -04:00
Michael Abashian
68365effb8 Remove event socket listeners when the scope that created them is destroyed. This should fix #2121 where an existing jobs standard out was erroneously being updated after a new job launch. 2016-06-02 16:21:15 -04:00
Matthew Jones
1881af8e77 Fix passively creation of notification templates 
Passively creating notification templates on m2m endpoints was failing
serializer validation due to a bug trying to look up the related
object.  In reality that check should only happen when the view is the
NotificationTemplateDetail view.
 2016-06-02 15:04:51 -04:00
Matthew Jones
0591647333 Implement a flag that allows simulteanous job launches on job templates 2016-06-02 15:04:51 -04:00
Akita Noek
d565faff98 typo fix 2016-06-02 14:33:24 -04:00
Akita Noek
e0a00a8705 Fixed verbosity select2 syncing 
#2107
 2016-06-02 14:01:28 -04:00
Akita Noek
cfe450b7be Fixed missed refactor of function name 2016-06-02 14:01:02 -04:00
Akita Noek
a6e06588b4 Merge pull request #2138 from anoek/migration 
Fixed up multi-org project migrations
 2016-06-02 13:43:14 -04:00
Akita Noek
c15db1eef6 Fixed up multi-org project migrations 2016-06-02 13:34:10 -04:00
Michael Abashian
aa80e841dc Merge pull request #2128 from mabashian/azure-resource-manager 
Azure Resource Manager credential required fields tweak
 2016-06-02 10:10:28 -04:00
Alan Rominger
ffd1f6c787 Merge pull request #2131 from AlanCoding/1351_survey_del 
Fixing of survey-related bugs
 2016-06-02 09:58:49 -04:00
Michael Abashian
c4c91bcba9 Merge pull request #2119 from mabashian/remove-dashboard-button 
Removed dashboard icon from inventory manage breadcrumb area
 2016-06-02 09:49:56 -04:00
Michael Abashian
854b613bb7 Merge pull request #2110 from mabashian/1928-organizations-action-buttons-v2 
Organization lists bug fixes
 2016-06-02 09:34:58 -04:00
AlanCoding
53327dea2b Bug fixes related to survey corner cases and survey test refactor 2016-06-02 08:58:59 -04:00
Akita Noek
d813a8a680 Merge pull request #2122 from anoek/jshint 
JShint fixes and tests
 2016-06-02 08:42:07 -04:00
Akita Noek
3247fe42c0 Merge branch 'release_3.0.0' of github.com:ansible/ansible-tower into jshint 2016-06-01 22:56:31 -04:00
Michael Abashian
beb6be189c Made username/password/tenant_id/client_id/client_secret all optional when creating an Azure Resource Manager credential. 2016-06-01 17:07:33 -04:00
Akita Noek
e93969fb10 jshint fix 2016-06-01 16:09:21 -04:00
Akita Noek
4f4724d1c5 Merge pull request #2097 from leigh-johnson/JobDetailHostEvents 
Host event/events/summary UX work items & bug fixes
 2016-06-01 15:52:32 -04:00
John Mitchell
8c7b4b9a0a Merge branch 'searchUpdates' into release_3.0.0 2016-06-01 15:51:24 -04:00
Michael Abashian
cc36385a75 Removed dashboard icon from inventory manage breadcrumb area. We aren't showing the dashboad icon here anymore for any routes. 2016-06-01 15:23:34 -04:00
John Mitchell
2e9aa3bb8f update list column sizes 2016-06-01 15:07:49 -04:00
John Mitchell
2915b86650 fix limit for summary_fields of labels 2016-06-01 15:07:49 -04:00
John Mitchell
308fc5ef2c support more than label limit on edit and list views 2016-06-01 15:07:49 -04:00
Akita Noek
3b1639da4f Merge branch 'release_3.0.0' of github.com:ansible/ansible-tower into JobDetailHostEvents 2016-06-01 15:06:11 -04:00
Michael Abashian
5fd216f786 Merge pull request #2118 from mabashian/notifications 
Fix for empty notification status
 2016-06-01 15:06:06 -04:00
Matthew Jones
8708fcf8ce Handle corner case when a job spawns notifications 
If a dependent task fails a job might not have a started or finished
time when emitting the notification
 2016-06-01 15:04:29 -04:00
John Mitchell
e041fe8316 fix of tag search type dropdown border and empty tags 2016-06-01 15:01:09 -04:00
John Mitchell
857f873f4d fix external source and sync failure queries on inv groups/invs 2016-06-01 15:01:09 -04:00
John Mitchell
c5c65adc09 fix layout of search dropdowns 2016-06-01 15:01:09 -04:00
John Mitchell
763416725c update search widgets across ui 2016-06-01 15:01:09 -04:00
Michael Abashian
564a02c92a Merge pull request #2112 from mabashian/prompt-button-swap 
Swapped cancel/action buttons on our prompts
 2016-06-01 14:58:59 -04:00
Michael Abashian
2196b03330 Fixed empty notification status as well as an issue with the form which prevented you from creating a notification due to a rogue required field. 2016-06-01 14:45:19 -04:00
Akita Noek
37a7e0a862 Bump to trigger jenkins 2016-06-01 14:41:49 -04:00
Matthew Jones
79cbd68a13 Rev boto and add ap-northeast-2 to ec2 regions 2016-06-01 14:22:08 -04:00
Akita Noek
7f9174f4ea Merge branch 'release_3.0.0' of github.com:ansible/ansible-tower into JobDetailHostEvents 2016-06-01 14:09:51 -04:00