11377 Commits

Author SHA1 Message Date
kensible
d10047147b Update configuration.block.less 2017-02-06 09:23:38 -05:00
Ken Hoes
44e436ca93 Added thumbnail display for custom logo upload 2017-02-03 13:15:12 -05:00
Matthew Jones
a9621d579d Make sure the workflow link is included in the notification 2017-02-03 12:57:59 -05:00
Alan Rominger
b822ef14c4 Merge pull request #5105 from AlanCoding/data_gen_to_the_moon
Make data generator work for larger data sets
2017-02-03 12:34:56 -05:00
Shane McDonald
691248c579 Clean up webpack config (#5157)
* Make “dev” and “release” more consistent in web pack config

* Consolidate dev and release webpack configs
2017-02-03 12:19:29 -05:00
Alan Rominger
9993c5d5fd Merge pull request #5144 from AlanCoding/act_str_clean
Put more summary fields into activity stream
2017-02-03 12:13:44 -05:00
Matthew Jones
b2bef69f7f Remove stray print 2017-02-03 12:06:17 -05:00
Chris Meyers
aa83bda3ca Merge pull request #5125 from chrismeyersfsu/fix-4851
workflow job elapsed timer
2017-02-03 11:39:59 -05:00
jlmitch5
3f098b1167 Merge pull request #5150 from jlmitch5/nullPromptField
fix erros with promptable lookups
2017-02-03 11:39:18 -05:00
kensible
f74396158e Merge pull request #5166 from kensible/ctint-definedInFile-flag
Added defined_in_file flag for CTinT settings
2017-02-03 11:34:57 -05:00
Chris Meyers
51fe00ffac update tests to NOT use json 2017-02-03 11:11:30 -05:00
Chris Meyers
2a8e57e655 Merge pull request #5165 from chrismeyersfsu/logging_creds_not_required
logger username/pass not required
2017-02-03 10:57:41 -05:00
Chris Meyers
a2903199ae logger username/pass not required 2017-02-03 10:19:54 -05:00
Ken Hoes
74fefb7ab1 Added defined_in_file flag for CTinT settings 2017-02-03 10:16:19 -05:00
Michael Abashian
01a9a5da41 Merge pull request #5159 from mabashian/4995-links
Fixed template link open in new tab regressions
2017-02-03 09:06:22 -05:00
Michael Abashian
487428ae7a Merge pull request #5145 from mabashian/4903-inv-group-name-col
Expand group name column out a bit
2017-02-03 09:05:55 -05:00
Michael Abashian
70704610c5 Expand group name column out a bit 2017-02-02 19:58:03 -05:00
Michael Abashian
02c7f87185 Merge pull request #5140 from mabashian/5061-alert-text-wrap
Wrap alert text
2017-02-02 18:53:26 -05:00
Michael Abashian
22ac5f6b59 Merge pull request #5139 from mabashian/5102-job-details-pending
SCM Update status on job details
2017-02-02 18:53:04 -05:00
Michael Abashian
3743c08392 Merge pull request #5126 from mabashian/5113-schedule-workflow
ParseTypeChange when scheduling a workflow job template
2017-02-02 18:52:27 -05:00
Chris Meyers
195a36aef9 embed json into js module 2017-02-02 18:00:41 -05:00
Matthew Jones
ca87c4f83b Implement logout semantics by support DELETE on authtoken 2017-02-02 16:32:09 -05:00
Michael Abashian
81a2070cff Fixed template link regressions 2017-02-02 16:03:30 -05:00
Matthew Jones
d469ef2385 Add in localization setup to the container image
This should fix up utf8 question marks
2017-02-02 15:51:50 -05:00
Bill Nottingham
b0fc65d294 Merge pull request #5154 from wenottingham/se-oops
Add requirement for libsemanage-python (for seboolean ansible module called by setup playbook)
2017-02-02 15:28:09 -05:00
AlanCoding
8683da986d remove redundant clause in act str serializer 2017-02-02 14:59:48 -05:00
Wayne Witzel III
978a5fbcdc Merge pull request #5156 from wwitzel3/issue-5036
only assign the default if it is not None
2017-02-02 14:53:36 -05:00
Wayne Witzel III
ec86961e13 only assign the default if it is not None 2017-02-02 14:48:31 -05:00
Chris Meyers
76e5cc1fb1 update ui packaging 2017-02-02 14:06:08 -05:00
Alan Rominger
fff8564bee Merge pull request #5151 from AlanCoding/ssssssss
make help text noun plural
2017-02-02 13:41:00 -05:00
Ryan Petrello
1d8b8a6d11 Merge pull request #5143 from ryanpetrello/fix-4876
add a field to OPTIONS that tells if the setting came from a .py file
2017-02-02 13:40:27 -05:00
AlanCoding
fad19eb9c7 make help text noun plural 2017-02-02 13:38:45 -05:00
John Mitchell
1d590c0dd3 fix erros with promptable lookups 2017-02-02 13:25:14 -05:00
Ryan Petrello
7dde6bbb3c Merge pull request #5149 from ryanpetrello/fix-5148
default certain LDAP settings to None instead of an empty string
2017-02-02 13:21:40 -05:00
Shane McDonald
028314f38f Merge pull request #5136 from fujiwarat/po
Update translations
2017-02-02 13:14:20 -05:00
Ryan Petrello
5bd670291b default certain LDAP settings to None instead of an empty string
Related: #5148 #4678
2017-02-02 13:06:59 -05:00
Ryan Petrello
afc0f16e58 add a field to OPTIONS that tells if the setting came from a .py file
additionally, update help_text with a helpful message about this

See: #4876
2017-02-02 12:47:53 -05:00
AlanCoding
ebb2b886f1 put more summarizable things into activity stream serializer 2017-02-02 11:51:50 -05:00
Jake McDermott
1ab62a48ed fixes edit button for organization project view (#5134) 2017-02-02 10:40:18 -05:00
Michael Abashian
92857b20a8 Wrap alert text 2017-02-02 10:35:27 -05:00
Wayne Witzel III
71c190e025 Merge pull request #5122 from wwitzel3/release_3.1.0
remove check of http_session, not needed with auth_token
2017-02-02 10:13:40 -05:00
Michael Abashian
ef8b54476d Keep the scm update status hidden until we actually have a status to show. 2017-02-02 10:13:36 -05:00
Michael Abashian
f34081fb8d Merge pull request #5131 from mabashian/5112-launched-by
Fixed up launched by when jt/wfjt is launched via schedule
2017-02-02 09:13:57 -05:00
Ryan Petrello
a680bc314f Merge pull request #5127 from ryanpetrello/fix-4246
add tests for encryption/decryption in awx.main.utils.common
2017-02-02 09:04:14 -05:00
Takao Fujiwara
f55a39599d Update translations 2017-02-02 15:33:52 +09:00
Jared Tabor
f283345a6a Merge pull request #5132 from jaredevantabor/permissions-pagination
Fix for pagination on related lists
2017-02-01 18:52:33 -08:00
jaredevantabor
8c1e015af9 adding 'collection' as attribute passed to <paginate> directive 2017-02-01 15:20:45 -08:00
Alan Rominger
7021655d7d Merge pull request #5124 from AlanCoding/help_text_generalizing
fix inconsistencies in the workflow API help text pages
2017-02-01 17:07:30 -05:00
Michael Abashian
81f5a0fea5 Fixed up launched by when jt/wfjt is launched via schedule 2017-02-01 16:55:04 -05:00
Chris Meyers
8b40cb14ec add job finished test 2017-02-01 16:42:17 -05:00