Jared Tabor
47a2ba8a30
Merge pull request #5268 from jaredevantabor/4966-license-info-of-undefined
...
Cannot find "license_info" of undefined
2017-02-09 09:04:06 -08:00
Jared Tabor
7e18c3e172
Merge pull request #5261 from jaredevantabor/lookup-modal-default-params
...
Lookup modal & default params
2017-02-09 09:03:27 -08:00
Wayne Witzel III
1851276b10
Merge pull request #5271 from wwitzel3/release_3.1.0
...
Rewrite type to polymorphic_ctype__model for certain filter requests
2017-02-09 11:42:19 -05:00
kensible
2024ca0ae3
Merge pull request #5241 from kensible/4617-search-action-buttons
...
Search bar width, action button placement
2017-02-09 11:29:32 -05:00
Ken Hoes
3559a88c6b
Added permissions modal to 100% width
2017-02-09 11:21:55 -05:00
Bill Nottingham
d513f58934
Merge pull request #5251 from wenottingham/hmm
...
Don't explicitly require the postgresql server in the RPM spec file.
2017-02-09 10:52:37 -05:00
Ryan Petrello
8753d4968a
Merge pull request #5252 from ryanpetrello/log-handler-tests
...
refactor utils.handlers.HTTPSHandler's usage of django settings
2017-02-09 10:29:38 -05:00
Wayne Witzel III
0562e4baad
Rewrite type to polymorphic_ctype__model for certain filter requests
2017-02-09 09:55:25 -05:00
Shane McDonald
60c163c892
Update pot files
...
String changed in becdc5128cd0de801c5d1e2f6503fc131d3c8969.
2017-02-09 09:37:21 -05:00
Michael Abashian
bed9974c29
Merge pull request #5260 from mabashian/5221-assign-role-link
...
Override the ngHref's for jt/wfjt lists inside of the rbac multiselect
2017-02-09 09:12:03 -05:00
Michael Abashian
960e49a24b
Merge pull request #5259 from mabashian/4677-workflow-link
...
Added Template link to workflow job
2017-02-09 09:11:42 -05:00
Michael Abashian
9a317e7f9e
Merge pull request #5258 from mabashian/4543-sort-users-orgs
...
Fixed sorting on a few related lists
2017-02-09 09:11:17 -05:00
Michael Abashian
63a732ae68
Merge pull request #5256 from mabashian/5222-scm-update
...
Fixed project link in scm_update
2017-02-09 09:10:54 -05:00
jaredevantabor
1edf2dc77f
adding additional check to prevent race condition
2017-02-08 20:12:04 -08:00
jaredevantabor
57883e37bf
Adding default params for some lookup modals
...
the organization and inventory-script lookup modals require some additional
default params set to properly present the user w/ options they have permission to see.
If these default params aren't set, they'll show up as search tags, which we don't want.
2017-02-08 16:36:53 -08:00
Michael Abashian
fa9d47f548
Override the ngHref's for jt/wfjt lists inside of the rbac multiselect
2017-02-08 19:13:10 -05:00
Michael Abashian
7ae63acf17
Added Template link to workflow job
2017-02-08 19:12:13 -05:00
Michael Abashian
d8262e131a
Fixed sorting on a few related lists
2017-02-08 18:24:30 -05:00
Michael Abashian
cba4763b88
Fixed project link in scm_update
2017-02-08 17:58:23 -05:00
Michael Abashian
32622add2c
Merge pull request #5243 from mabashian/4804-wf-null-inv
...
Remove prompt for inv/prompt for cred results from the wf editor jt list
2017-02-08 17:12:30 -05:00
Alan Rominger
90cbfb3cf2
Merge pull request #5234 from AlanCoding/im_the_boss_but_pretend_to_be_one_of_the_members
...
switcharoo of team admin for member role
2017-02-08 16:53:36 -05:00
Ryan Petrello
56433fd2ca
move log handling tests from functional -> unit
2017-02-08 16:34:06 -05:00
Ryan Petrello
669012138e
refactor utils.handlers.HTTPSHandler's usage of django settings
2017-02-08 16:34:00 -05:00
Jared Tabor
29869f7093
Merge pull request #5186 from jaredevantabor/smart-search
...
Smart search, and invalid searches
2017-02-08 12:00:02 -08:00
jaredevantabor
2a8bff824a
fixing deletion after PR feedback from mabashian
2017-02-08 11:57:01 -08:00
Ryan Petrello
a076ab015d
Merge pull request #5246 from ryanpetrello/log-handler-tests
...
add tests for our custom log aggregator/handler
2017-02-08 14:31:51 -05:00
Ryan Petrello
00af3ccb1a
Merge pull request #5247 from ryanpetrello/fix-5239
...
remove unnecessary hashes included in "CUSTOM_LOGO" help text
2017-02-08 14:20:29 -05:00
Ryan Petrello
2c447942d5
add tests for our custom log aggregator/handler
2017-02-08 14:19:32 -05:00
Michael Abashian
0567542588
Merge pull request #5123 from mabashian/4546-multiselect
...
Fixed permissions multi-select issues
2017-02-08 14:16:17 -05:00
Alan Rominger
b21513754d
Merge pull request #5245 from AlanCoding/inv_src_cred
...
check related credential for inventory source
2017-02-08 13:47:24 -05:00
Ryan Petrello
34492d677d
remove unnecessary hashes included in "CUSTOM_LOGO" help text
...
see: #5239
2017-02-08 13:46:55 -05:00
Jared Tabor
2c1145570b
Merge pull request #5236 from jaredevantabor/remove-teams-from-orgs
...
Organizations -> Users & Teams, but minus the teams now
2017-02-08 10:39:06 -08:00
Jared Tabor
5ab26a4138
Merge pull request #5235 from jaredevantabor/workflow-cancel
...
fixing cancel function for workflow results
2017-02-08 10:37:28 -08:00
AlanCoding
f60f1fdcc4
check related credential for inventory source
2017-02-08 13:16:02 -05:00
Michael Abashian
56303c144c
Merge pull request #5214 from mabashian/5135-org-job-templates
...
Fixed up organizations/job templates list
2017-02-08 11:59:20 -05:00
Michael Abashian
2eafa76fac
Removed escape-proned rogue foobar
2017-02-08 11:55:31 -05:00
Michael Abashian
c6b2e56100
Remove prompt for inv/prompt for cred results from the wf editor jt list
2017-02-08 11:51:50 -05:00
AlanCoding
07773bb19e
Remove unsuported team indirect access from test
...
Add in team admin_role in its place
confirm that team admin looks the same as team member
2017-02-08 11:43:38 -05:00
Michael Abashian
aca471ecc9
Merge pull request #5231 from mabashian/4873-pagination-max-pages
...
Make pagination max pages shown configurable
2017-02-08 11:36:45 -05:00
Michael Abashian
3cef0aed48
Merge pull request #5219 from mabashian/5162-display-large-wf-job
...
Recursively fetch workflow nodes when there is more than 1 page of nodes
2017-02-08 11:36:21 -05:00
Michael Abashian
9e61c61285
Merge pull request #5218 from mabashian/4939-between-nodes
...
Disable workflow editor save when currently adding a node
2017-02-08 11:35:29 -05:00
Michael Abashian
7ae5531df1
Fixed org jt's smart status
2017-02-08 11:32:02 -05:00
Matthew Jones
819d8d1fb3
Show the data that would have been a problem sending payload
...
for websocket
2017-02-08 11:30:15 -05:00
Matthew Jones
4ed054f568
Implement optional message persistence on callback events
2017-02-08 11:11:14 -05:00
Ken Hoes
24c681d47c
Search bar width, action button placement
2017-02-08 09:45:21 -05:00
jaredevantabor
a7a968e0fa
changing the related tab on an edit of an organization to be for users, instead of users & teams
2017-02-07 17:17:03 -08:00
jaredevantabor
db50779731
fixing cancel function for workflow results
2017-02-07 16:04:05 -08:00
AlanCoding
99b7532ef6
switcharoo of team admin for member role
2017-02-07 17:43:43 -05:00
jaredevantabor
ab57396fcf
Generalizing error message when user inputs an invalid search
2017-02-07 14:41:52 -08:00
jaredevantabor
f00214495a
fix for #5179 for deleting tags for non search params
2017-02-07 14:41:52 -08:00
