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

10932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Nottingham
bfe17f3bfc Merge pull request #4764 from wenottingham/ansible-1.8-omg 
Remove some cruft for pre-1.8 ansible
 2017-01-17 14:50:02 -05:00
Chris Meyers
4fdc8f6d35 Merge pull request #4738 from chrismeyersfsu/fix-4185 
activity stream, display name of resource as title
 2017-01-17 14:47:12 -05:00
Alan Rominger
c5ae2ddb5d Merge pull request #4732 from AlanCoding/null_job_fd 
Graceful handling of null project and inventory in workflow
 2017-01-17 14:38:25 -05:00
AlanCoding
5bfb0f229c graceful handling of null project and inventory in workflow 2017-01-17 14:19:46 -05:00
Jared Tabor
044df78e11 Merge pull request #4735 from jaredevantabor/ssl-tls-radios 
Notification Templates -> email "Use TLS/Use SSL" should be radio buttons
 2017-01-17 11:16:40 -08:00
jlmitch5
223827e104 Merge pull request #4750 from jlmitch5/readonlyWorkflowsExtraVars 
make workflow extra vars look disabled
 2017-01-17 13:56:46 -05:00
jaredevantabor
176a3cc399 send empty string for email username/password if no user input 2017-01-17 10:44:00 -08:00
Ryan Petrello
e5792157c3 Merge pull request #4755 from ryanpetrello/release_3.1.0 
Properly parse subversion revision info.
 2017-01-17 13:10:22 -05:00
Alan Rominger
e3ee82ce64 Merge pull request #4733 from ansible/AlanCoding-patch-3 
workflow doc RBAC rules audit
 2017-01-17 10:12:28 -05:00
Ryan Petrello
9e09fd38a7 Properly parse subversion revision info. 
The ansible subversion module returns revision info in an unanticipated format:

https://github.com/ansible/ansible/blob/devel/lib/ansible/modules/source_control/subversion.py#L194-L199

Parse out the revision number we actually care about.

Resolves #4654
 2017-01-17 10:04:30 -05:00
kensible
a8802f38aa Merge pull request #4687 from kensible/4673-alert-modal-spacing 
Updated spacing in modal elements
 2017-01-17 09:56:02 -05:00
AlanCoding
ad3ca9acf8 Incorporate more feedback about RBAC logic regarding node deletion 2017-01-17 09:40:31 -05:00
kensible
c1a6f7b008 Merge branch 'release_3.1.0' into 4673-alert-modal-spacing 2017-01-17 09:32:44 -05:00
kensible
b046f66cd1 Added back alert padding and removed comments 2017-01-17 09:26:52 -05:00
Wayne Witzel III
8625d670ac Merge pull request #4745 from wwitzel3/release_3.1.0 
remove extra censoring code from tower, not needed since Ansible 2.1+
 2017-01-16 20:29:44 -05:00
John Mitchell
d8e94f3f15 make workflow extra vars look disabled 2017-01-16 16:36:06 -05:00
Wayne Witzel III
9592c67c31 fixing flake8 errors 2017-01-16 14:16:24 -05:00
Wayne Witzel III
cd5eed9828 remove extra censoring code from tower, not needed since Ansible 2.1+ 2017-01-16 13:54:07 -05:00
Chris Meyers
2088b1fcfe omit search-tags dynamically 2017-01-16 11:07:38 -05:00
Chris Meyers
a58433ed9b activity stream, display name of resource as title 
related to #4185

* When activity stream is gone to from a resource edit view, it should:
  * only show activity for the particular object
  * display the name of the resource as a title

This commit patch half-ass does those two things. So what's missing?
That questions is best answered by looking at how the feature behaves in
tower 3.0.3. You'll notice that you are "locked" on the resource you are
viewing the activity stream for. With this commit:
* You aren't locked
* The removal of the resource-id filter (smart-search) is borked.

So what do we need to do?:
* Lock the view to the resource being viewed

How do we need to do it?:
* router params.activity_search.values is a "static" thing. It is used
to tell smart-search to not generate search tags. This is what we want
to do. However, this is a contructor-only parameter. Further, the value
"value" gets passed around to all sorts of other UI contructors that are
hard to get access to when they are needed to try and dynamically set
smart-search ignore search-tags.
 2017-01-16 08:57:37 -05:00
AlanCoding
d88fa05009 workflow RBAC docs feedback 2017-01-14 11:09:52 -05:00
Michael Abashian
67b9960d5a Merge pull request #4728 from mabashian/4027-inventory-groups-pagination 
Generate the correct base path for groups and hosts so that paginate works properly
 2017-01-14 08:33:51 -05:00
James Laska
0b1a4110c4 Merge pull request #4716 from ryanpetrello/release_3.1.0 
Include getting started instructions for installing the gcloud CLI tool.
 2017-01-14 07:39:11 -05:00
Jared Tabor
223c1d5110 Merge pull request #4734 from jaredevantabor/encodeParams 
adding extra check for string in encodeParams
 2017-01-13 17:04:24 -08:00
jaredevantabor
2217594f27 Changing "Use TLS/Use SSL" radio buttons on the notification template form (for email) 2017-01-13 16:56:57 -08:00
Michael Abashian
66e5cf88ad Fixed basePath at the root level of the inventory manage (thanks @jared) 2017-01-13 18:49:42 -05:00
Michael Abashian
839db07d9a Merge pull request #4729 from mabashian/4690-delete-wfjt-survey 
Fixed bug that was preventing wfjt survey deletion
 2017-01-13 18:15:28 -05:00
jaredevantabor
2af4a2d558 adding extra check for string in encodeParams 2017-01-13 15:05:33 -08:00
Alan Rominger
46941dab5d Merge pull request #4726 from ansible/AlanCoding-patch-1 
put the word granularity in double quotes
 2017-01-13 17:16:58 -05:00
Alan Rominger
912033f223 workflow doc RBAC rules audit 2017-01-13 17:11:08 -05:00
Michael Abashian
05c3f5fbea Fixed bug that was preventing wfjt survey deletion 2017-01-13 16:10:21 -05:00
Michael Abashian
4d66c6dd0a Generate the correct base path for groups and hosts so that paginate works properly 2017-01-13 15:55:11 -05:00
Bill Nottingham
696d00320f Merge pull request #4720 from wenottingham/2017-branch 
Bump copyright date in overall headers/footers
 2017-01-13 15:49:20 -05:00
Alan Rominger
f5173a9d27 put the word granularity in double quotes 2017-01-13 15:37:23 -05:00
Alan Rominger
6e0752c6de Merge pull request #4615 from AlanCoding/cancel_403 
Remove can_cancel check (unrelated to permissions) from access method
 2017-01-13 15:24:03 -05:00
Graham Mainwaring
9885bcf4f2 Merge pull request #4723 from ghjm/bundle_fix 
Add jlaska-rabbitmq COPR repo and key to bundled installer
 2017-01-13 15:05:38 -05:00
Bill Nottingham
d0067109c1 Merge pull request #4547 from wenottingham/sending-out-an-sos 
Update sosreport config.
 2017-01-13 14:59:57 -05:00
Alan Rominger
481514dea4 Merge pull request #4709 from AlanCoding/workflow_code_tweaks 
Minor workflow code cleanup & performance
 2017-01-13 14:55:58 -05:00
Shane McDonald
8b7435ccd3 Manually add .mo files (for now) to get API l10 working. 2017-01-13 14:49:40 -05:00
Shane McDonald
e0cd4bc7ae Get Japanese API l10 working 
Worked with matburt on this. There were some inconsistencies between our code and the po files.
 2017-01-13 14:49:40 -05:00
AlanCoding
a93ad270f2 update workflow serializer fixture to use serializer instance 2017-01-13 14:44:58 -05:00
Michael Abashian
824996d3a1 Merge pull request #4721 from mabashian/4710-job-details-busted 
Only try to regex replace quotes in strings (smart search)
 2017-01-13 14:32:52 -05:00
Michael Abashian
088ebdfd5c Merge pull request #4719 from mabashian/4659-workflow-inv 
Corrected the inventory list endpoint in the workflow maker form
 2017-01-13 14:32:10 -05:00
Jared Tabor
ebdbf94faf Merge pull request #4706 from jaredevantabor/copy-move-group 
fixing selection on the copy/move groups & hosts lists
 2017-01-13 11:27:53 -08:00
AlanCoding
b6493cacd5 small tweaks to make workflow endpoints load better 2017-01-13 13:50:53 -05:00
Alan Rominger
0f72e32d8f Merge pull request #4708 from AlanCoding/browser_big_load 
Avoiding pulling full list from DB in metadata
 2017-01-13 13:46:20 -05:00
Michael Abashian
3879760430 Only try to regex replace quotes in strings 2017-01-13 13:30:17 -05:00
Michael Abashian
1f40569a32 Changed backend mock to /static regex to catch all static requests and return 200 2017-01-13 13:07:36 -05:00
Bill Nottingham
fb6d3ad547 Merge pull request #4702 from wenottingham/csrf-fu 
Set CSRF_COOKIE_AGE to 'None'.
 2017-01-13 12:47:26 -05:00
Bill Nottingham
5f4dcfe8b4 say goodbye to 2016 2017-01-13 12:44:07 -05:00