3783 Commits

Author SHA1 Message Date
Joe Fiorini
7d5fccb85b Fix after socket.io upgrade 2015-02-23 14:16:03 -05:00
Chris Meyers
47541afca1 Merge pull request #86 from chrismeyersfsu/fix-scm_delete_on_next_update
bandaid for scm_delete_on_next_update save issue
2015-02-23 13:32:32 -05:00
Chris Meyers
3ad9229ea9 bandaid for scm_delete_on_next_update save issue 2015-02-23 13:23:12 -05:00
Joe Fiorini
c99ea2ccfa Build fix for bower updates 2015-02-23 12:02:54 -05:00
Jared Tabor
727c2fcaf7 Changed JT form survey error message 2015-02-20 18:00:48 -05:00
Jared Tabor
614fe8e3fd fixing jshint warning
unused params don't need to be included `
2015-02-20 18:00:19 -05:00
Chris Meyers
41b4a66640 Merge pull request #84 from chrismeyersfsu/feature-survey_password_redact
don't try and decode extra_vars if there are no extra_vars. Further, if ...
2015-02-20 15:38:49 -05:00
Chris Meyers
71318e5d9a don't try and decode extra_vars if there are no extra_vars. Further, if extra_vars isn't a json, then don't try to redact. 2015-02-20 15:37:53 -05:00
jlmitch5
d26bec0aed Merge pull request #83 from ansible/fix_range_check
fixing range bug with awMax directive
2015-02-20 14:23:50 -05:00
John Mitchell
9b2470a9d3 fixing range bug with awMax directive 2015-02-20 14:21:40 -05:00
Jared Tabor
2f00783f8c Changed the error message on JT for surveys
On the job template form page we would display an error modal if the user had enabled a survey but not created one yet. Now we will use an error message on the form like we do in most other places.
2015-02-20 14:03:20 -05:00
Jared Tabor
db8eed2ae5 Job submission for optional survey questions
Make sure optional multiselect and multiplechoice answers are ignored if not answered
2015-02-19 12:59:09 -05:00
Jared Tabor
0286800ead Survey password field initialization 2015-02-19 12:58:41 -05:00
Jared Tabor
ea8a537906 Job Submission extra vars
When submitting a job to launch, the UI will collect extra_vars from the the JT. However with a recent change to make extra_vars include comments, the UI no longer receives the JT extra vars as a JSON obj, but rather as a yaml-unparsed string. So I am changing the way we parse these JT-extra_vars from 'json' to 'yaml' since we no longer expect to recieve a json-ified extra var object.
2015-02-19 12:58:41 -05:00
Chris Meyers
71e0469fab Merge pull request #81 from chrismeyersfsu/feature-survey_password_redact
redact survey password fields in job detail extra_vars
2015-02-19 11:47:17 -05:00
Chris Church
8db3bdb947 Merge pull request #78 from wenottingham/readme-fix
This fixes a couple of the package names in README to match their names in pip.
2015-02-19 09:53:02 -05:00
Chris Meyers
78e1698333 redact survey password fields in job detail extra_vars 2015-02-19 09:20:05 -05:00
jlmitch5
c9d527ee77 Merge pull request #80 from ansible/teams_error
fix of the teams list console errors
2015-02-18 16:28:56 -05:00
John Mitchell
9698b79f3f fix of the teams list console errors 2015-02-18 16:14:47 -05:00
Jared Tabor
a0ffd50207 Adjust error messages for survey
per Chris' request to make them more accurate.
2015-02-18 16:00:47 -05:00
Chris Meyers
ea49c78bde Merge pull request #79 from chrismeyersfsu/feature-survey_password_redact
Feature survey password redact
2015-02-18 15:32:59 -05:00
Chris Meyers
4f907c6645 make flake8 happy 2015-02-18 15:30:51 -05:00
Bill Nottingham
4204a479f3 Fix some pip package names. 2015-02-18 15:08:19 -05:00
Chris Meyers
81205d37dc removed extra redudant import 2015-02-18 14:52:48 -05:00
Chris Meyers
6f2016f9c0 Merge pull request #77 from chrismeyersfsu/feature-survey_password_redact
break up tests.jobs and fix awx.api.tests
2015-02-18 14:51:32 -05:00
Chris Meyers
9f9fc3f8b3 break up tests.jobs and fix awx.api.tests 2015-02-18 14:50:54 -05:00
jlmitch5
1de3077bdc Merge pull request #75 from jlmitch5/popover_bug_fix
fixing popover bug
2015-02-18 14:40:29 -05:00
Jared Tabor
a67b2e29b6 JSHint
removed trailing whitespace
2015-02-18 14:32:34 -05:00
Luke Sneeringer
bf8b593f36 Revert "Added feature flags and license types to licenses."
This reverts commit 3b459d2445ccfc5ad9c29f835a611ef1d817a7ec.
2015-02-18 13:27:11 -06:00
Luke Sneeringer
6abb08f4f1 Revert "Show feature flags and license type in /api/v1/config/"
This reverts commit 40552da5ad19bab3103e6438821383953f48149e.
2015-02-18 13:26:56 -06:00
Luke Sneeringer
4b107c2b5e Merge branch 'master' into licenses-unstable 2015-02-18 13:21:45 -06:00
Luke Sneeringer
e9ee27a709 Show feature flags and license type in /api/v1/config/ 2015-02-18 12:58:18 -06:00
Luke Sneeringer
395571e1ae Added feature flags and license types to licenses. 2015-02-18 12:58:18 -06:00
Luke Sneeringer
28a39839c2 Show feature flags and license type in /api/v1/config/ 2015-02-18 12:53:51 -06:00
James Laska
40fdbc01e3 Pyflakes and pep8 are replaced by flake8 2015-02-18 13:00:49 -05:00
Matthew Jones
3c61006455 Fix up some flake warnings 2015-02-18 12:55:07 -05:00
John Mitchell
eddaf1e97b fixing popover bug 2015-02-18 11:49:35 -05:00
Chris Meyers
7da54263b6 Merge pull request #74 from chrismeyersfsu/feature-survey_password_redact
redact survey password type values w/ tests
2015-02-18 11:40:30 -05:00
Chris Meyers
1e871f8d7c redact survey password type values w/ tests 2015-02-18 11:37:50 -05:00
Jared Tabor
6e18c6d3c0 fixed spelling error on websocket configs
spelling changed from 'max reconneciton attemps' to 'max reconnection attempts'
2015-02-18 11:23:50 -05:00
Matthew Jones
52385f7346 Process Token from query string instead of cookie header on the api side
for the socket.io service
2015-02-18 11:04:18 -05:00
Jared Tabor
203de5221e Adding query string for websockets
to pass the auth token instead of in the cookie
2015-02-18 10:39:10 -05:00
Jared Tabor
50e174ea43 Remove stale error messages on survey
when adding another question any stale errors messages need to be cleared.
2015-02-17 18:25:04 -05:00
Jared Tabor
a2121b7288 More accurate survey errors
For the survey question form validation, some errors messages were being thrown for errors that hadn't occured.
2015-02-17 17:52:54 -05:00
Joe Fiorini
397d107380 Include sourcemaps in build 2015-02-17 17:11:16 -05:00
Jared Tabor
dda00e98f5 Fixing job submission for textarea
if textarea min is set to 0 and the question is optional, then the UI will pass the API and empty string to the job launch endpoint
2015-02-17 16:09:14 -05:00
Luke Sneeringer
c5869db5c4 Added feature flags and license types to licenses. 2015-02-16 15:09:58 -06:00
Matthew Jones
c8682b7820 Take out this stupid sync_ui thing from the 'make server' and 'make
servercc' targets
2015-02-16 13:56:46 -05:00
Jared Tabor
9fbd64805f Job Detail checks to prevent error messages
If the job run completes before the JS can complete running, error messages are output to the js console. Ajusting checks to prevent errors happening.
2015-02-16 13:42:38 -05:00
Jared Tabor
e849dff386 Changed wording on survey error message
Chris Wang found a wording issue with the survey error messages
2015-02-16 12:13:40 -05:00