Matthew Jones
718a9c2a97
Fix up some merge requirements conflicts
2016-02-22 10:21:34 -05:00
Matthew Jones
c3121211c3
Merge branch 'release_2.4.4' into devel
...
* release_2.4.4: (35 commits)
Update changelog for 2.4.4 release
Make pycompile non-fatal during deb build
Revert "Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools"
Roll back mock version due to packaging issues
Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools
change to warning behavior
Resolve bug when building with /bin/sh on Ubuntu
Attempt to workaround pip install issue
point at packages with source on pypi
Mock requires a newer setuptools when building requirements
requests needs openssl
Properly set the shell during directory migration
pyrax bumpb new python license
Typo's are bad and should be vanquished
Conditionally install 2.6 python requirements
separate pip requirements file for python2.6
Added missing 'skipped' field for no_log
Obey no_log even more when using ansible 2.0
bump shade from 0.5.0 to 1.4
RHEL5 compatibility and handling of error scenarios
...
2016-02-22 10:09:47 -05:00
Michael Abashian
5ee78d7fec
Merge pull request #1000 from mabashian/stdout-breadcrumbs
...
Added breadcrumbs to stdout pages
2016-02-22 08:44:14 -05:00
Michael Abashian
fa29608f50
Configured standard out breadcrumbs for adhoc, inventory sync, management jobs and scm updates.
2016-02-19 16:17:16 -05:00
Jared Tabor
30633cc82e
Merge pull request #998 from jaredevantabor/job-detail-results
...
Job detail results
2016-02-19 10:47:07 -08:00
Jared Tabor
93719094ea
Using aliases for colors instead of hard coded pigments
2016-02-19 10:39:17 -08:00
Jared Tabor
68f619e358
Job Detail Results panel tweaks after UX review
2016-02-19 10:23:18 -08:00
Michael Abashian
fffa590a82
Merge pull request #994 from mabashian/stdout-results
...
Added standard out details to inventory sync, management jobs and scm updates
2016-02-19 13:02:48 -05:00
Michael Abashian
81e044c97c
Added standard out details to inventory sync, management jobs and scm updates.
2016-02-19 10:41:17 -05:00
Jared Tabor
95467a6b97
Restyling of job detail results panel
2016-02-18 19:38:49 -08:00
Jared Tabor
8f1c88e35d
adding less file
2016-02-18 12:27:30 -08:00
Akita Noek
d3c620926a
Merge pull request #990 from anoek/devel
...
Updated API test fixtures
2016-02-18 13:37:04 -05:00
Akita Noek
0051464525
Added put,head,options,delete, & patch test fixtures for api related tests
2016-02-18 11:23:31 -05:00
Akita Noek
6aeaec2b76
Switch to resolve in api test fixtures to automatically resolve View's and their arguments
...
Also changed the signature of the post/get methods to better align with
libraries like `requests`
2016-02-18 11:19:27 -05:00
Michael Abashian
7dbb69dd6d
Accidentally included JobDetailController in app.js during my last merge. This is now pulled in via the job detail module.
2016-02-18 10:04:12 -05:00
Michael Abashian
ce8f40277c
Merge branch 'remove-standalone-stdout' into devel
2016-02-18 09:47:01 -05:00
Jared Tabor
673611b7bd
Merge pull request #985 from jaredevantabor/job-detail-results
...
Initial restructuring of Job Detail code
2016-02-17 14:25:55 -08:00
Jared Tabor
8ec19f9226
Initial restructuring of Job Detail code
...
To use our new modular approach to organizing code by feature
2016-02-17 13:53:18 -08:00
Michael Abashian
e9899c278f
Modularized Standard Out/Job details for all jobs that are not playbook runs. This is mostly scaffolding.
2016-02-17 15:54:53 -05:00
Chris Church
8b2e699ea7
Merge pull request #972 from AlanCoding/755_related_job_templates
...
Add job_template related list to inventory endpoint
2016-02-16 23:04:11 -05:00
Chris Meyers
6434171977
add -y to ansible ppa adding
2016-02-16 13:51:16 -05:00
AlanCoding
33e84d03ef
add job_template related list to inventory endpoint
2016-02-16 10:12:35 -05:00
Michael Abashian
67b5dcd817
Merge pull request #929 from jlmitch5/schedulerFormStylingFinal
...
Scheduler form styling fixes
2016-02-16 10:07:02 -05:00
John Mitchell
b3667ce56a
combine sleect2 creation into single class
2016-02-16 14:37:57 +00:00
John Mitchell
ffcb8ec65d
update less to improve color default
2016-02-16 14:30:11 +00:00
Leigh
bed6c666ae
Merge pull request #928 from leigh-johnson/OrgPaginate
...
#646 Handle case where page 2 of OrganizationList was being hidden
2016-02-15 15:01:27 -05:00
Leigh
f7ec61f452
Merge pull request #959 from leigh-johnson/ModalBackdrop
...
#875 add backdrop: static to modal.Constructor.DEFAULTS
2016-02-15 12:17:18 -05:00
Leigh Johnson
9278a50029
remove EDIT from edit org breadcrumb label, trim whitespace, add text-uppercase to .BreadCrumb-item
2016-02-15 11:36:46 -05:00
Michael Abashian
5e3e8862f3
Merge pull request #960 from mabashian/stream-awfeature
...
Hide Activity Stream button when the feature is turned off
2016-02-15 11:08:37 -05:00
Michael Abashian
f2f9dc4703
Removed jshint comment
2016-02-15 11:04:38 -05:00
Michael Abashian
e5f6373617
Added ProcessErrors declaration
2016-02-15 10:29:54 -05:00
Michael Abashian
5f7de996bd
Added logic to hide activity stream button when the feature is turned off. Also added logic to redirect the user to the dashboard when they try to navigate to the stream when the feature is not on.
2016-02-15 10:21:17 -05:00
Leigh Johnson
6bc99971b6
#875 add backdrop: static to modal.Constructor.DEFAULTS
2016-02-15 09:08:19 -05:00
John Mitchell
8ad62b6669
fixed layout issues with form scheduler
2016-02-12 12:00:26 -05:00
John Mitchell
f8550a478b
make saving a schedule send you back to the list route
2016-02-12 11:59:39 -05:00
John Mitchell
37c97c968d
fix number spinner input issues with scheduler
2016-02-12 11:58:50 -05:00
John Mitchell
e7cf1ce021
add support for select2 in scheduler form
2016-02-12 11:57:40 -05:00
John Mitchell
6283f8715d
fixed icon colors for form elements with buttons
2016-02-12 11:56:12 -05:00
John Mitchell
2c432ee974
fix scheduler name border color issues
2016-02-12 11:55:26 -05:00
Leigh Johnson
4558b880a0
remove Stream dependencies
2016-02-12 11:26:33 -05:00
Leigh Johnson
4ade498c6c
#646 add pagination support to setup > organizations, pass orgCount as pageSize, handle case where a 2nd page might be visible for an unusually high # of orgs, fix breadcrumb shown in organization.edit state
2016-02-12 11:08:47 -05:00
Michael Abashian
1bcc3b9269
Merge pull request #921 from mabashian/add-stream-inv-manage
...
Turned on the activity stream for inventory manage
2016-02-12 09:15:10 -05:00
Jared Tabor
7509fdf751
Password element styling
2016-02-11 23:35:44 -08:00
Jared Tabor
3503ec9deb
Styling of genMD5 input field on JT form page
...
uses same styling as the lookup button
2016-02-11 22:47:48 -08:00
Jared Tabor
b0d5403d41
changing color of dropdown arrow for select2
...
for whenever the dropdown menu is open
2016-02-11 22:41:23 -08:00
Jared Tabor
3fbbd4f234
Changing textarea input color
...
For textarea elements that don't get CodeMirror attached.
2016-02-11 22:31:20 -08:00
Jared Tabor
9fa6d74efc
Formatting job template-job tag element
...
Accomplished by adding the regular text input styling. This field is a 1 line textarea so adding the Form-textInput class gives it all the styling it needs.
2016-02-11 22:10:55 -08:00
Jared Tabor
44bf4e1ac4
Changing CodeMirror font back to monospace
...
previously I had set it to Open Sans to match the rest of Tower.
2016-02-11 22:07:19 -08:00
Jared Tabor
cbfe382bb3
Merge pull request #924 from jaredevantabor/number-input-styling
...
Number input styling
2016-02-11 21:36:49 -08:00
Chris Church
ce5989ba31
Update browsable API styling based on UI feedback.
2016-02-12 00:07:15 -05:00