Ken Hoes
d6f1f2f22e
Simplified and fixed save button permissions
2016-12-12 15:50:50 -05:00
Matthew Jones
93ce2a5dfd
Set proot/bubblewrap enabled by default
2016-12-12 15:26:31 -05:00
Michael Abashian
e00e4f6a10
Merge pull request #4389 from mabashian/4165-add-edit-node-audit
...
Add/Edit workflow from audit items
2016-12-12 15:14:21 -05:00
kensible
de88839059
Merge pull request #4384 from kensible/fixing-loading-errors
...
Fixing loading of config info errors
2016-12-12 15:12:01 -05:00
Chris Church
08286d6d06
Add valid 1px GIF as placeholder.
2016-12-12 14:57:13 -05:00
Matthew Jones
e83360592f
Merge pull request #4391 from ansible/set_max_page_size
...
Set an upper limit of 200 on the max page size
2016-12-12 14:51:29 -05:00
Leigh Johnson
e895c0989a
Fixes routing to scheduled jobs view ( #4280 )
...
* Issue #4267
* Fixes routing issues to upcoming scheduled jobs view
* Fixes edit schedule routing from scheduled jobs list view
* re-enable jobDetails route, match jobDetais route only when url is /jobs/integer/
2016-12-12 14:51:09 -05:00
jaredevantabor
e2ea73aa35
making labels collapsible on workflow-results
...
to match the job results page
2016-12-12 11:18:22 -08:00
Michael Abashian
deca2bb5c1
Various fixes to the templates list based on audit feedback
2016-12-12 14:14:36 -05:00
Wayne Witzel III
824fb21b3f
Merge pull request #4357 from wwitzel3/release_3.1.0
...
Update uwsgi/nginx configurations.
2016-12-12 14:08:01 -05:00
Wayne Witzel III
19f7d9e8d8
redirect if no forward-slash
2016-12-12 13:25:10 -05:00
Wayne Witzel III
c6e1598b9c
explicitly set long harakiri time to deal with very large inventory deletes
2016-12-12 12:44:05 -05:00
Wayne Witzel III
fafec3a0e3
Update to use Modern values for SSL
2016-12-12 12:42:56 -05:00
Wayne Witzel III
5f5624c5a3
Update to use Modern values for SSL
2016-12-12 12:42:53 -05:00
Wayne Witzel III
88dc742f42
update uwsgi/nginx production configuration
2016-12-12 12:42:51 -05:00
Wayne Witzel III
4c8af2a4b8
update uwsgi/nginx dev configuration
2016-12-12 12:42:20 -05:00
Matthew Jones
8b8c29b9dc
Purge has_schedules
...
Also... migration for big field docs updates
2016-12-12 12:33:09 -05:00
Chris Church
c52366e580
Merge pull request #4312 from cchurch/saml-error-handling
...
SAML error handling fixes
2016-12-12 12:29:17 -05:00
Matthew Jones
bb7a201c2f
Add missing field to ad-hoc command partial
2016-12-12 12:25:19 -05:00
Alan Rominger
5575f67aba
Merge pull request #4393 from AlanCoding/encrypt_log_pass
...
Encrypt log token or password
2016-12-12 12:16:58 -05:00
Matthew Jones
349d497bb4
Make max page size tunable
2016-12-12 12:10:33 -05:00
AlanCoding
249469c576
encrypt log token or password
2016-12-12 12:02:56 -05:00
Matthew Jones
08edbb1b72
Set an upper limit of 200 on the max page size
2016-12-12 12:01:48 -05:00
Bill Nottingham
abbe41dbac
Merge pull request #4298 from wenottingham/stringy
...
Mark more strings for translation.
2016-12-12 11:55:23 -05:00
Bill Nottingham
933cc83b90
Mark up UsersAdd properly.
2016-12-12 11:35:41 -05:00
Michael Abashian
fdcae226aa
Removed rogue comment - not needed
2016-12-12 11:25:20 -05:00
AlanCoding
278d70ed49
do not copy WFJT labels in 3.1
2016-12-12 11:21:21 -05:00
Michael Abashian
8165e18e64
Various small bug fixes dealing with the workflow maker and the add/edit workflow form.
2016-12-12 11:20:10 -05:00
AlanCoding
30b212b724
fix RBAC bugs associated with WFJT copy
2016-12-12 11:11:25 -05:00
Matthew Jones
2d6dff1a3b
Better error handling on deprovision_node management command
2016-12-12 10:55:03 -05:00
Alan Rominger
ecdb9ac02a
Merge pull request #4374 from AlanCoding/logger_reloading_PR
...
Chain reloading uWSGI on log setting change
2016-12-12 10:28:27 -05:00
Matthew Jones
aa0139078f
Merge pull request #4371 from wenottingham/cannot-think-of-a-good-branch-name-today
...
Update project help for ConfigureTowerInTower.
2016-12-12 10:26:26 -05:00
Alan Rominger
39e5765f12
Merge pull request #4381 from AlanCoding/prefetch_optimizing
...
Use prefetch_related for several more things
2016-12-12 10:22:43 -05:00
Chris Meyers
d7a4a9d0c0
Merge pull request #4366 from chrismeyersfsu/fix-2_inv_updates_1_jt
...
fix two inv updates created from 1 jt run
2016-12-12 10:14:05 -05:00
Chris Meyers
c7f935367f
Merge pull request #4369 from chrismeyersfsu/enhancement-dependencies
...
Enhancement dependencies
2016-12-12 10:13:59 -05:00
Chris Meyers
ed2a857ed9
Merge pull request #4370 from chrismeyersfsu/fix-remove_mongo
...
remove more mongo things
2016-12-12 10:13:49 -05:00
Alan Rominger
5ee11b5ba3
Merge pull request #4379 from AlanCoding/node_exec_rbac
...
Check for UJT start access when adding node
2016-12-12 10:12:20 -05:00
AlanCoding
4cc1642ab3
clarity edit of uWSGI chain reload task
2016-12-12 09:40:49 -05:00
Ken Hoes
53349cc24d
Fixed bug with loading and permissions, error logging and continuing after GET error
2016-12-12 09:08:53 -05:00
Jake McDermott
07a395b738
Merge pull request #4326 from jakemcdermott/issue-3905
...
ensure new settings are placed by installer when updating tower
2016-12-12 09:05:27 -05:00
AlanCoding
a90bafe6f0
move various items to prefetch for optimization
2016-12-11 07:31:04 -05:00
AlanCoding
c3666752e6
check for UJT start access when adding node
2016-12-10 07:46:30 -05:00
Alan Rominger
75a85cdab2
Merge pull request #4376 from AlanCoding/wf_start_survey
...
Do not check survey license for workflow job relaunch
2016-12-09 16:49:26 -05:00
AlanCoding
c6f3d498de
remove django configure_logging import
2016-12-09 16:07:47 -05:00
AlanCoding
c318b12428
do not check survey license for workflow job relaunch
2016-12-09 16:03:10 -05:00
AlanCoding
431dcc6490
switch to smoother chain reloading
2016-12-09 15:38:38 -05:00
AlanCoding
5ff62c97b6
uwsgi auto-reload on logging change
2016-12-09 15:21:03 -05:00
Chris Meyers
35fe4c8448
remove pyzmq
2016-12-09 14:34:32 -05:00
Bill Nottingham
56d8fa8ae6
Update project help for ConfigureTowerInTower.
2016-12-09 14:29:46 -05:00
Chris Meyers
40d5142d11
remove more mongo things
2016-12-09 14:19:41 -05:00
