20922 Commits

Author SHA1 Message Date
softwarefactory-project-zuul[bot]
4a711ec2dc
Merge pull request #3914 from itdependsnetworks/var_port_numbers
Update the ports for memcache and rabbitmq to be variablized

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-22 14:08:41 +00:00
softwarefactory-project-zuul[bot]
75fe801efb
Merge pull request #3913 from marshmalien/3886-instance-group-breadcrumb-label
Dynamically show instance group name in breadcrumb

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-21 14:28:55 +00:00
Marliana Lara
56df930b99
Sanitize instance group breadcrumb name 2019-05-21 09:55:35 -04:00
softwarefactory-project-zuul[bot]
dc1bf3ef07
Merge pull request #3910 from AlanCoding/no_user_get
Avoid unnecessary user get expiring session memberships

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-20 17:20:36 +00:00
softwarefactory-project-zuul[bot]
9d4cfa7400
Merge pull request #3890 from AlanCoding/fix_debug_toolbar
Fix Django debug toolbar after its upgrade

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-20 16:41:13 +00:00
AlanCoding
06be3a29b9
fix Django debug toolbar after its upgrade 2019-05-20 12:17:57 -04:00
softwarefactory-project-zuul[bot]
2addf20907
Merge pull request #3918 from jbradberry/middleware-ordering
Fix the middleware ordering

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-20 15:43:06 +00:00
softwarefactory-project-zuul[bot]
29bbecb6bf
Merge pull request #3820 from AlanCoding/default_ordering
Resolve default ordering warnings from tests

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-20 15:31:36 +00:00
AlanCoding
f4c18843a3
Resolve default ordering warnings from tests 2019-05-20 10:58:36 -04:00
Jeff Bradberry
44907b33dc Fix the middleware ordering 2019-05-17 14:40:33 -04:00
softwarefactory-project-zuul[bot]
f174902bb2
Merge pull request #3874 from jbradberry/expose-role-type
Expose the content type associated with roles for ActivityStream objects in the API

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-17 18:06:38 +00:00
AlanCoding
1223148116
Avoid unnecessary user get expiring session memberships 2019-05-17 14:05:17 -04:00
softwarefactory-project-zuul[bot]
ab1e45d6c4
Merge pull request #3875 from rooftopcellist/swifty_operation
reorder migrations to avoid session error

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-17 15:41:26 +00:00
softwarefactory-project-zuul[bot]
bd50e5d6a8
Merge pull request #3896 from rooftopcellist/collection_no_reset
collect events based on last ship, not collection

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-17 15:32:48 +00:00
itdependsnetworks
f085b828e4 Update the ports for memcache and rabbitmq to be variablized 2019-05-16 19:59:57 -04:00
Marliana Lara
e95339ba6e
Add instance group name to breadcrumb 2019-05-16 16:46:53 -04:00
softwarefactory-project-zuul[bot]
d353daebc5
Merge pull request #3911 from rooftopcellist/rm_extra_error
rm extra collection error line

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-16 20:11:41 +00:00
softwarefactory-project-zuul[bot]
6681cd918c
Merge pull request #3906 from heavenly999/devel
Increasing requests-credssp ver to 1.0.2

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-16 20:00:07 +00:00
Christian Adams
2b327935de reorder migrations to avoid session error 2019-05-16 15:13:47 -04:00
Christian Adams
0c4925afe8 rm extra collection error line 2019-05-16 14:48:41 -04:00
softwarefactory-project-zuul[bot]
e0062484d0
Merge pull request #3908 from rverchere/fr_fix
Correct fr translation for Cancel message

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-16 18:46:19 +00:00
softwarefactory-project-zuul[bot]
faa353521a
Merge pull request #3909 from marshmalien/3884-dropdown-alignment
Fix styling bug in Sort Dropdown

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-16 18:03:07 +00:00
softwarefactory-project-zuul[bot]
ff7e244a84
Merge pull request #3905 from NickBusey/patch-1
Update INSTALL.md

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-16 17:02:07 +00:00
Marliana Lara
17f71600df
Add styles to grow dropdown width based on content 2019-05-16 12:23:47 -04:00
Rémi VERCHERE
9120a69006 Correct fr translation for Cancel message 2019-05-16 17:42:13 +02:00
softwarefactory-project-zuul[bot]
d9965cfe7e
Merge pull request #3882 from ryanpetrello/debug-log
add the ability to toggle DEBUG logging on dynamically

Reviewed-by: Shane McDonald <me@shanemcd.com>
             https://github.com/shanemcd
2019-05-16 15:12:01 +00:00
Adam Nagy
c38ee06642 Increasing requests-credssp ver to 1.0.2
Signed-off-by: Adam Nagy <anagy@netsuite.com>
2019-05-16 15:56:35 +02:00
Ryan Petrello
b1d75327e3
add the ability to toggle DEBUG logging on dynamically 2019-05-16 07:58:31 -04:00
softwarefactory-project-zuul[bot]
8981c7d59a
Merge pull request #3904 from wenottingham/new-year-new-you
Bump date.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-16 03:35:31 +00:00
Nick Busey
b10f06201d
Update INSTALL.md 2019-05-15 16:34:27 -06:00
Bill Nottingham
681fe4865c Some more dates. 2019-05-15 17:01:33 -04:00
Bill Nottingham
faae55d085 Bump date. 2019-05-15 16:58:59 -04:00
softwarefactory-project-zuul[bot]
efddd9f679
Merge pull request #3854 from beeankha/add_debug_toolbar
Update Custom Middleware to New Style

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-15 18:38:24 +00:00
beeankha
6fb173da8a Remove redundant methods from SocialAuthMiddleware class 2019-05-15 12:54:00 -04:00
beeankha
64e8b76a10 Remove redundant middleware 2019-05-15 10:16:20 -04:00
Christian Adams
d0e160a037 collect events based on last ship, not collection 2019-05-14 17:14:44 -04:00
beeankha
20e5d8200e Subclass more middlware with deprecation mixin 2019-05-14 13:37:34 -04:00
beeankha
a6d3c0fd32 Remove redundant code and update URLModificationMiddleware 2019-05-14 13:37:34 -04:00
beeankha
318e0631b7 Add super() call 2019-05-14 13:37:34 -04:00
beeankha
da4153d653 Add mixin to ActivityStreamMiddleware class 2019-05-14 13:37:34 -04:00
beeankha
26e9dd307e Fix missing argument error 2019-05-14 13:37:34 -04:00
beeankha
6a2d59963f Update wsgi file to be compatible with new style of middleware 2019-05-14 13:37:34 -04:00
beeankha
68800d0e8e Make custom middleware use new style vs old 2019-05-14 13:37:34 -04:00
beeankha
97dc77ea63 Add debug_toolbar.middleware.DebugToolbarMiddleware to MIDDLEWARE classes in development.py 2019-05-14 13:37:34 -04:00
softwarefactory-project-zuul[bot]
6bc1856658
Merge pull request #3861 from beeankha/awx_doc_edits
Update/Edit AWX Docs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-05-13 20:41:14 +00:00
beeankha
9ea3ec24ca Address comments/suggested changes 2019-05-13 15:46:24 -04:00
beeankha
7466873f69 Make more edits/grammatical changes 2019-05-13 15:27:54 -04:00
beeankha
07fa533b6f Make edits to Notification doc 2019-05-13 11:47:04 -04:00
Jeff Bradberry
3579584ffc i18n 2019-05-13 11:20:15 -04:00
Jeff Bradberry
05cae23180 Add help text to the ActivityStreamSerializer m2m relationship fields 2019-05-13 11:10:33 -04:00