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

10878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Chris Meyers
d071b64f12 Merge pull request #4703 from chrismeyersfsu/4508 
fix overflow on error modal for all things
 2017-01-13 08:52:55 -05:00
Shane McDonald
6b0573da71 Uncomment line that requests UI l10n files. 2017-01-12 21:09:18 -05:00
Shane McDonald
cbf0c2704d Separate API and UI l10n make targets. 
A couple reasons for this:

- The command for generating the API l10n files is currently broken, and I want to get the translation folks looking at the UI ASAP.
- These things require different environments:
  - Generating the UI files requires Grunt, which is only available *before* packaging. We generate the static files before invoking mock or pbuilder.
  - Generating the API files requires Django, which is only available inside the virtual environment. This will likely need to be invoked somewhere inside of the install playbooks.
 2017-01-12 21:09:18 -05:00
Shane McDonald
894577c89a Add Japanese and French po files for the UI. 2017-01-12 21:09:18 -05:00
Michael Abashian
57d2046a12 Merge pull request #4705 from mabashian/4523-search-key 
Updated the search key to be a little more relevant
 2017-01-12 20:29:08 -05:00
Michael Abashian
28ac03f291 Fixed wrapping bug on the search key 2017-01-12 20:20:22 -05:00
Jared Tabor
b24193d0c1 Merge pull request #4704 from jaredevantabor/copy-move-group 
Copy move group
 2017-01-12 17:00:05 -08:00
Jake McDermott
d5ce044e8d add optional template-type attribute to smart status icon directive for linking to workflow jobs (#4695) 
The recent_jobs summary fields of the endpoints driving the status icon controller do not provide the necessary information to build a url for the correct job details endpoint in all cases.

This adds an optional template-type attribute to the smart status directive to override the default url building behavior.
 2017-01-12 19:40:28 -05:00
Michael Abashian
306da7b793 Updated the search key to be a little more relevant 2017-01-12 19:39:32 -05:00
jaredevantabor
abb2e93bb6 fixing copy/move hosts, and the search for that route 2017-01-12 16:29:51 -08:00
jaredevantabor
2f440a037b fixing copy/move routes, as well as the search on those routes 2017-01-12 16:22:25 -08:00
AlanCoding
2146777cc6 reorder terms to avoid pulling full UJT list 2017-01-12 17:32:13 -05:00
Chris Meyers
c6cae2e273 Merge pull request #4689 from chrismeyersfsu/fix-4620 
correctly cancel/delete on job details
 2017-01-12 16:54:51 -05:00
Chris Meyers
a9926a6451 fix overflow on error modal for all things 
related to #4508

* Removed one-off fix for callback url long host config key
 2017-01-12 16:27:23 -05:00
Bill Nottingham
ef27d771fb Set CSRF_COOKIE_AGE to 'None'. 
This causes them to be sent as session cookies, not 1-year cookies.
 2017-01-12 16:25:56 -05:00
Bill Nottingham
4f168e0989 Merge pull request #4697 from wenottingham/moooOOOOOOOOOOOOOooooooooooOOOOOOOOOOO 
Fix AnsiMcBullface.
 2017-01-12 16:16:02 -05:00
Chris Meyers
8798809f6e Merge pull request #4683 from chrismeyersfsu/fix-3313 
add view more/less logic to credential owners
 2017-01-12 16:15:47 -05:00
jlmitch5
2c3e05cbaa Merge pull request #4644 from jlmitch5/jobResultsPerf 
Job results performance updates
 2017-01-12 16:15:16 -05:00
jlmitch5
7c8c42bfc1 Merge branch 'release_3.1.0' into jobResultsPerf 2017-01-12 16:15:09 -05:00
John Mitchell
5ba0e1383b update line cap display 2017-01-12 16:06:36 -05:00
Michael Abashian
3be2da061a Merge pull request #4699 from mabashian/4175-fix-it 
Fixed bug where organization with a & in it was causing failed api requests
 2017-01-12 15:46:29 -05:00
Alan Rominger
7567966bc6 Merge pull request #4691 from AlanCoding/wfjt_warnings 
WFJT warnings refactor
 2017-01-12 15:41:14 -05:00
Matthew Jones
0d4d872a76 Import translation files 2017-01-12 15:15:13 -05:00
Chris Meyers
2215f8561b better spacing 2017-01-12 15:05:01 -05:00
Michael Abashian
4b16d12d48 Fixed bug where organization with a & in it was causing failed api requests 2017-01-12 14:41:29 -05:00
Bill Nottingham
7c095b0088 Fix AnsiMcBullface. 2017-01-12 14:27:44 -05:00
Michael Abashian
b1f3cd48c1 Merge pull request #4669 from mabashian/smart-search-default-behavior 
Smart search default behavior
 2017-01-12 14:17:37 -05:00
AlanCoding
dfd0885ec3 new WFJT launch schema and cleanup 2017-01-12 12:24:49 -05:00
Chris Meyers
c67989bc90 correctly cancel/delete on job details 
related to #4620

* Changed cancel prompt buttons from "Cancel" "Cancel" to "Cancel"
"Proceed", talk about some confusing shit.
* Removed copy and pasted code that would call a delete upon canceling a
job
* Don't expect job_status to be an object in the view, just
`job_status`, not `job_status.status`
 2017-01-12 11:32:56 -05:00
Chris Meyers
ee0295a378 css mods 2017-01-12 10:55:54 -05:00
Michael Abashian
18fcfee96d Fixed a few search related bugs based on PR review feedback 2017-01-12 10:39:07 -05:00
Michael Abashian
2192bad05a Merge pull request #4685 from mabashian/4676-workflow-borders 
Workflow node border tweaks and a small change to the workflow root in the details view
 2017-01-12 09:55:01 -05:00
Michael Abashian
265a829203 Merge pull request #4684 from mabashian/4577-relaunch-workflow-job 
Relaunch workflow bug fixes
 2017-01-12 09:54:36 -05:00
Michael Abashian
531bf15330 Workflow node border tweaks and a small change to the workflow root in the details view. 2017-01-11 21:13:05 -05:00
Michael Abashian
83a6b8ba53 Fixed bug where relaunching a workflow job from the details view was throwing a 404. Also fixed bug where relaunching a workflow from the details view was not redirecting the user to the new details view. 2017-01-11 20:43:43 -05:00
John Mitchell
f446705767 update escaped parse standard out unit test 2017-01-11 18:52:06 -05:00
John Mitchell
dc47bacc61 deal with capped lines 2017-01-11 18:51:37 -05:00
Chris Meyers
1cf3a259ee add view more/less logic to credential owners 
related to #3313
 2017-01-11 18:04:47 -05:00
Jared Tabor
258405aefe Merge pull request #4670 from jaredevantabor/lookup-modal-search-tags 
Hiding default search param as a search tag
 2017-01-11 15:01:54 -08:00
Chris Meyers
945d5a68f5 Merge pull request #4679 from chrismeyersfsu/fix-4675 
wire up teams into the rbac list directive
 2017-01-11 17:27:18 -05:00
jaredevantabor
82f16f0551 small change based on PR feedback 2017-01-11 14:25:08 -08:00
Chris Meyers
a9f78af3d2 wire up teams into the rbac list directive 
related to #4675
 2017-01-11 16:52:31 -05:00
Chris Meyers
3b766cb3e3 Merge pull request #4628 from chrismeyersfsu/fix-4437 
word wrap large callback key in alert modal
 2017-01-11 16:05:32 -05:00
Michael Abashian
4c6ec808ee Merge pull request #4671 from mabashian/add-permissions-bug-fix 
Fixed bug where clicking add permission when editing an org would do nothing
 2017-01-11 16:05:06 -05:00
Michael Abashian
46491a59e6 Removed the use of startsWith from encodeParam. PhantomJS didn't recognize that when the unit tests ran in jenkins. Rather than try to figure out why that might be the case I just changed the line. 2017-01-11 15:46:52 -05:00
Bill Nottingham
946a5bde9a Merge pull request #4635 from wenottingham/time-after-time 
Don't hardcode a timezone
 2017-01-11 15:20:44 -05:00
Michael Abashian
50fd3d38cb Treat any search string that doesn't start with a matching attribute as a string 2017-01-11 15:00:50 -05:00
Alan Rominger
584ef35c76 Merge pull request #4653 from AlanCoding/copy_sp 
Refactor of /copy/ GET schema
 2017-01-11 14:57:50 -05:00