1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00
Commit Graph

4107 Commits

Author SHA1 Message Date
Joe Fiorini
7c80efc0d5 Use template for rendering smart status 2015-03-10 16:27:17 -04:00
Joe Fiorini
a2f4aaff27 Refactor controller 2015-03-10 16:27:15 -04:00
John Mitchell
931cc0468b Only show the websockets indicator if it is *not* green: 2015-03-10 14:45:03 -04:00
John Mitchell
143c42aae5 Merge branch 'jaredevantabor-smart-status' 2015-03-10 13:59:57 -04:00
John Mitchell
3037bcb96a Merge branch 'smart-status' of https://github.com/jaredevantabor/ansible-tower into jaredevantabor-smart-status
Conflicts:
	awx/ui/static/js/controllers/Jobs.js
	awx/ui/static/js/shared/Socket.js
	awx/ui/static/less/ansible-ui.less
2015-03-10 13:59:08 -04:00
Jared Tabor
de3b1ecbc7 removing unnecessary files 2015-03-10 12:53:38 -04:00
James Laska
8e31e88972 [jenkins] Don't install npm deps globally 2015-03-10 12:36:54 -04:00
Joe Fiorini
00838e1bbd Replace enabled checkbox with disabled tag display 2015-03-10 12:36:10 -04:00
Joe Fiorini
0dc04cd057 Use columnNgClass instead of ngClass for columns
ngClass gets placed on both the td and the link (if an ngClick is
    provided); this is not good, therefore splitting them out into
ngClass for the link class (for backwards compatibility) and
columnNgClass for the class on the td.
2015-03-10 12:31:04 -04:00
Jared Tabor
7c9b6f5269 Making the status even smarter
Incorporating the true status for each bar
2015-03-10 12:04:14 -04:00
Jared Tabor
9295ac78fd Updated status checks for smart status 2015-03-10 11:28:48 -04:00
Jared Tabor
23254beb6c More styling on the tooltip for smart status 2015-03-10 10:57:35 -04:00
jlmitch5
e1aa3bf6b3 Merge pull request #97 from jlmitch5/form
showing ASK when ask for password is selected
2015-03-09 20:56:52 -04:00
John Mitchell
26e2c7b8dc showing ASK when ask for password is selected 2015-03-09 20:52:09 -04:00
jlmitch5
c560ff2107 Merge pull request #96 from jlmitch5/form
password field changes and configuration fixes
2015-03-09 16:59:25 -04:00
Jared Tabor
ec39c5c864 Updated tooltip for sparklines 2015-03-09 16:55:17 -04:00
John Mitchell
dada789f8b fixing errors 2015-03-09 16:41:39 -04:00
John Mitchell
fb5db213cd password field changes and configuration fixes
* create a new sensitive input type to replace password
* added a new input configuration for the sensitive type called hasShowInputButton (this shows a button to the left of the field that toggles the display of plain text)
* updated the credentials form configuration
    * removed confirm password boxes for *entering* sensitve information
    * updated the Keyphrase label
* fixed a bug in the credentials controller's ask function, which did not check to see if a confirmation input was defined or not
2015-03-09 16:20:47 -04:00
Joe Fiorini
a4b4c92a31 Merge pull request #91 from joefiorini/fix-dashboard-live
Fix dashboard live events and tooltips
2015-03-09 14:20:00 -04:00
Jared Tabor
1e68785264 adding click event for spark lines 2015-03-09 13:48:08 -04:00
Joe Fiorini
c5bfe218bd Merge pull request #92 from joefiorini/breakpoint-fix
Fix for debugger breakpoints with sourcemaps
2015-03-09 13:43:38 -04:00
Joe Fiorini
af9aca9806 Allow app load to be suspended to let sourcemaps load 2015-03-09 13:44:24 -04:00
Joe Fiorini
106fa53e6d Remove incorrect schedule socket listener 2015-03-09 13:39:29 -04:00
Joe Fiorini
0507e89709 Revert "Fix live events with scheduled jobs on dashboard"
This reverts commit c9b4882012357db8d4effb5b38a22049599468b6.
2015-03-09 13:38:36 -04:00
Matthew Jones
19c20c2616 Merge pull request #90 from matburt/scan_jobs_in_tower
Scan jobs in tower
2015-03-09 10:49:45 -04:00
jaredevantabor
b7ea9edc52 Merge pull request #93 from jaredevantabor/new-row-styling
changed the styling on the rows
2015-03-06 17:11:54 -05:00
Jared Tabor
df5f384916 Removing comment 2015-03-06 16:54:56 -05:00
Jared Tabor
c3f5909600 removing comments from ansible-ui.less 2015-03-06 16:52:57 -05:00
Jared Tabor
a8095e870e smart status sparkline tooltips 2015-03-06 16:32:58 -05:00
Joe Fiorini
78a4252e7b Fix live events with scheduled jobs on dashboard 2015-03-06 16:27:56 -05:00
Joe Fiorini
9a20b15d5a Fix infinite reload on dashboard jobs 2015-03-06 16:27:30 -05:00
Jared Tabor
13bc0a7b78 changed the styling on the rows 2015-03-06 12:25:07 -05:00
Matthew Jones
c4afaad96c Provide access to scan job templates from the inventory related fields 2015-03-06 11:13:36 -05:00
Matthew Jones
3d46a4ce37 Some testing and bug fixes for scan job templates 2015-03-06 11:00:28 -05:00
Joe Fiorini
3b01d6ea69 Turn off broken growOnHover feature in nv 2015-03-05 17:05:42 -05:00
Matthew Jones
987a898380 Small adjustment for flake8 passage 2015-03-05 15:44:50 -05:00
Matthew Jones
cca8c3fac1 Updated rbac for scan job and job template types 2015-03-05 12:40:28 -05:00
Matthew Jones
6034e6108a Fix socket reconnect logic when browser is refreshed after token has expired 2015-03-05 11:40:29 -05:00
Joe Fiorini
f84659d2bf Force add nvd3 2015-03-04 17:03:19 -05:00
Joe Fiorini
f7cc17eaf1 Upgrade nvd3 to fix tooltips 2015-03-04 16:35:07 -05:00
Joe Fiorini
92e643d60d Fix filtering job status graph 2015-03-04 14:16:58 -05:00
Joe Fiorini
f8c3fd11da Fix live events on dashboard 2015-03-04 14:16:29 -05:00
Jared Tabor
e653e9561a changed reconnect limit to a greater length 2015-03-03 16:56:09 -05:00
Matthew Jones
c4e320bf76 rbac tweaks for scan jobs templates 2015-03-03 15:08:18 -05:00
Jared Tabor
6087326bef socket disconnect on session timeout
the UI was trying to reconnect to the socket server using the previous session's auth token. I'm forcing a disconnect now when the session times out and i added 'force new conection' to true in the socket configuration so that when a new session starts it doesn't use the old auth token.
2015-03-03 15:01:02 -05:00
Matthew Jones
4d271bef35 Initial Scan Job Template type implementation 2015-03-03 14:48:22 -05:00
Matthew Jones
f6faff5b14 Merge branch 'upstream_master'
* upstream_master: (70 commits)
  Automate cleanup of old dist directory
  Don't import modules that don't export anything
  Include ui template in manifest
  Lock dependency version until tests are fixed
  Add script to lookup locations based on a sourcemap
  Allow all static files to be loaded from dist
  Remove stray console log
  [beautify] disable requiretty for root
  Keep git URLs in SCP format for project updates. Fixes https://trello.com/c/xUL2FZyu
  Adding a --noinput flag.
  "source" for apt
  Update license writer for Matt's comments.
  Update package fact format after discussions with core team
  Move code under lib/ansible to js/shared
  forgot to call super
  Remove docs for scheme parameter.
  Replace ansi2html (GPL) with ansiconv (MIT).
  Final socket fix
  Update source location of socket.io-client
  Revert accidental socket.io upgrade
  ...
2015-03-03 14:45:44 -05:00
Luke Sneeringer
9138b7c8ae Merge pull request #76 from ansible/licenses-unstable
Licenses
2015-03-03 09:29:07 -05:00
Joe Fiorini
581f27f8b6 Automate cleanup of old dist directory 2015-03-02 16:58:34 -05:00
Joe Fiorini
893d93990c Merge pull request #89 from joefiorini/packaging-cleanup
Packaging cleanup
2015-03-02 16:49:21 -05:00