7612 Commits

Author SHA1 Message Date
Ken Hoes
fce3ba14ad Updated icons and default interface text for marketing 2016-05-20 11:45:51 -04:00
Akita Noek
150c98de18 Merge pull request #1988 from anoek/1919-v2
Text update for team role removal confirmation message
2016-05-19 14:47:24 -04:00
Akita Noek
741c6a0cfd Text update for team role removal confirmation message
#1919
2016-05-19 14:46:35 -04:00
Michael Abashian
bd8ce603fd Merge branch 'mabashian-job-launch-modal-overhaul' into devel 2016-05-19 13:22:41 -04:00
Michael Abashian
e373316df0 Merge branch 'job-launch-modal-overhaul' of https://github.com/mabashian/ansible-tower into mabashian-job-launch-modal-overhaul
# Conflicts:
#	awx/ui/client/legacy-styles/forms.less
2016-05-19 13:22:05 -04:00
Matthew Jones
31f05a45cd Merge pull request #1971 from matburt/job_stdout_backup
Add backup and restore tasks for job stdout
2016-05-19 11:17:10 -04:00
Michael Abashian
da7d77eb08 Survey textarea should have Form-textArea class. Fixed various extra vars bugs dealing with code mirror. 2016-05-19 10:51:35 -04:00
Akita Noek
aa9a4925b0 Fix annoying warning message related to license info not loading appropriately
Log it into the console though.

This shouldn't be necessary after #1763 lands, but isn't a bad thing to
be doing in general.
2016-05-19 10:03:42 -04:00
Akita Noek
727dc580c7 Merge pull request #1968 from wwitzel3/issue-1938
adds related `roles` for InventoryScript
2016-05-19 09:25:53 -04:00
kensible
a3ab3f85e9 Merge pull request #1973 from kensible/1940-formButtons
Confirm/proceed action on right, cancel on left
2016-05-19 09:21:35 -04:00
Akita Noek
9dc662e3b2 Merge pull request #1972 from wwitzel3/issue-1890
ensure superusers can still see JTs even if proj/inv/org are deleted
2016-05-19 09:17:58 -04:00
Akita Noek
e8a3e7456d Merge pull request #1944 from wwitzel3/issue-1910
Fix access to JT for admin and superuser
2016-05-19 09:17:29 -04:00
Michael Abashian
c31f53517c Fixed various bugs dealing with styling of inputs, prompting for variables and converting extra vars from yaml/json and vice-versa. 2016-05-18 16:55:14 -04:00
Alan Rominger
c158c9dfe3 Merge pull request #1943 from AlanCoding/863_activity_stream_sorting
Implement a default ordering for ActivityStream
2016-05-18 16:07:19 -04:00
Alan Rominger
8c1e2e4efc Merge pull request #1892 from AlanCoding/1364_AS_permission
Access filters in ActivityStream
2016-05-18 16:06:38 -04:00
Alan Rominger
50bb6b8fc3 Merge pull request #1951 from AlanCoding/1949_scan_runtime_bugs
Fix 500 error caused in job launch runtime vars validation
2016-05-18 15:34:58 -04:00
Wayne Witzel III
4b95e5db8d ensure superusers can still see JTs even if proj/inv/org are deleted 2016-05-18 15:31:48 -04:00
Wayne Witzel III
1810e80203 pep8 fixups, unused imports 2016-05-18 15:29:13 -04:00
Ken Hoes
6ca8b37614 Confirm/proceed action on right, cancel on left 2016-05-18 15:28:10 -04:00
Wayne Witzel III
c99e4ea398 remove copy/paste .all() from Role get_queryset implementations 2016-05-18 15:23:41 -04:00
Alan Rominger
b1725491c5 Merge pull request #1946 from AlanCoding/1788_more_err_grammar
Error message consistency audit
2016-05-18 15:21:11 -04:00
AlanCoding
5bc0403d9c add spaces around euality operator 2016-05-18 15:18:27 -04:00
Michael Abashian
365fc31f5b Merge pull request #1964 from mabashian/activity-stream
Turned the activity stream button into a toggle
2016-05-18 14:46:03 -04:00
Michael Abashian
526a1482b1 Need to check for this attributes existence before trying to use it 2016-05-18 14:33:16 -04:00
Wayne Witzel III
cce7af3d19 adds related roles for InventoryScript 2016-05-18 14:21:30 -04:00
Wayne Witzel III
f00825ecf0 removed OR test, removed that functionality 2016-05-18 14:08:15 -04:00
AlanCoding
f6b3da0c46 Make error message grammar more consistent 2016-05-18 13:39:06 -04:00
Graham Mainwaring
84aa762135 Merge pull request #1948 from ghjm/remove-source-fix
Properly remove Tower source from RPM builds
2016-05-18 13:39:02 -04:00
kensible
d7eeedec91 Merge pull request #1927 from kensible/1845-1907-userPassAndDirectUrl
Password fields one line, direct URL access for User edit
2016-05-18 12:38:42 -04:00
Michael Abashian
ecf8d8765d Turned the activity stream button into a toggle. Removed the dashboard icon that was shown when a state does not have an activity stream. 2016-05-18 11:24:07 -04:00
Chris Meyers
e32d20b5c4 Merge pull request #1957 from chrismeyersfsu/fix-restore
lay down backup relative to playbook
2016-05-18 10:28:42 -04:00
Matthew Jones
e5ec5c9726 Change prefix for imported sattelite groups 2016-05-18 10:22:12 -04:00
Wayne Witzel III
4395f3945c Merge pull request #1945 from wwitzel3/issue-1936
move related roles UnifiedJobTemplate -> JobTemplate
2016-05-18 10:22:08 -04:00
Alan Rominger
5fc5f1858a Merge pull request #1801 from AlanCoding/1773_cred_detail_serializer
Purge credential detail view of special fields
2016-05-18 09:54:43 -04:00
AlanCoding
f19088db1b fix job_type change 500 error, patch up runtime tests 2016-05-18 09:24:33 -04:00
Michael Abashian
4eeea9ab0d Removed urls declaration - this bug was fixed upstream 2016-05-17 15:55:43 -04:00
Michael Abashian
d1e6a3323d Job launch ui overhaul 2016-05-17 15:50:56 -04:00
Matthew Jones
9ba98d9cac Rename channels to rooms for hipchat notifications 2016-05-17 15:33:22 -04:00
John Mitchell
9d1a3e065a styling fixes to dashboard and tag search 2016-05-17 14:24:12 -04:00
Wayne Witzel III
2e4c26a77f remove the ORing of local roles, check against organization roles 2016-05-17 13:56:11 -04:00
Akita Noek
3347bcac79 Merge pull request #1942 from anoek/cowsay
Fixed our beloved cow
2016-05-17 11:59:00 -04:00
Akita Noek
e9ea791a85 Brand that cow! 2016-05-17 11:47:49 -04:00
Wayne Witzel III
ddc8f73b63 move related roles UnifiedJobTemplate -> JobTemplate 2016-05-17 11:29:26 -04:00
AlanCoding
a7fed53efc implement a default ordering for ActivityStream 2016-05-17 11:24:13 -04:00
Akita Noek
9026d02be2 Fixed our beloved cow 2016-05-17 11:06:58 -04:00
AlanCoding
9cc8ae9329 ActivityStream access checking test for most resources 2016-05-17 10:39:38 -04:00
Matthew Jones
430b548395 Exclude the job template limit during callback
This causes some unexpected behavior when commas instead of colons are
used during the job template limit due to a bug in ansible.  It has the
effect of expanding the number of hosts that it will run on instead of
just one which is what we are expecting
2016-05-17 10:35:14 -04:00
Akita Noek
3862d6d1be Merge pull request #1935 from anoek/1929
Fix project update permissions
2016-05-17 10:15:20 -04:00
Alan Rominger
863105435e Merge pull request #1871 from AlanCoding/1868_org_cts_sublist
Add organization resource cts. in sublists
2016-05-17 09:58:44 -04:00
AlanCoding
4e2e4667de test for activity stream selective access 2016-05-17 09:06:08 -04:00