Commit Graph

2730 Commits

Author SHA1 Message Date
Hossein Shafagh 4f5f55a383
Merge branch 'master' into updating-docs 2019-07-09 10:41:25 -07:00
Hossein Shafagh 0b2a5e8646 updating the python version 2019-07-09 09:51:51 -07:00
Hossein Shafagh c7398d9e2f
Merge pull request #2820 from castrapel/celery_time_limit_sync
Relax celery time limit for source syncing; Ensure metric tags are string
2019-07-01 11:14:05 -07:00
Curtis Castrapel 0c5a8f2039 Relax celery time limit for source syncing; Ensure metric tags are string 2019-07-01 08:35:04 -07:00
Hossein Shafagh ff3016e65e
Merge pull request #2818 from Netflix/revert-2807-FasterPermalink
Revert "Faster permalink"
2019-06-26 10:44:44 -07:00
Hossein Shafagh 0e037973b2
Revert "Faster permalink" 2019-06-26 10:31:58 -07:00
Curtis 14d32368c0
Merge pull request #2808 from intgr/restore-manage-shebang
manage.py: Restore shebang line
2019-06-25 09:41:22 -07:00
Curtis 850620c2a2
Merge branch 'master' into restore-manage-shebang 2019-06-25 09:41:08 -07:00
Curtis 5df06501f6
Merge pull request #2814 from intgr/expose-cert-hasprivaatekey
Expose new certificate field hasPrivateKey
2019-06-25 09:40:27 -07:00
Curtis 8fbff00850
Merge branch 'master' into restore-manage-shebang 2019-06-25 09:29:06 -07:00
Curtis 3434f78e50
Merge pull request #2815 from alwaysjolley/cleanup_chain
Cleanup no chain in Vault destination plugin
2019-06-25 09:28:52 -07:00
Hossein Shafagh 404b7a25bc
Merge branch 'master' into restore-manage-shebang 2019-06-25 09:27:08 -07:00
alwaysjolley 86a1fb41ac lint fix 2019-06-25 06:56:37 -04:00
alwaysjolley 55a96ba790 type none 2019-06-24 15:10:10 -04:00
alwaysjolley 6699833297 fixing empty chain 2019-06-24 13:10:08 -04:00
Marti Raudsepp 2319858586 Expose new certificate field hasPrivateKey
We can also now disable the 'private key' tab when cert doesn't have a
private key.
2019-06-22 15:38:28 +03:00
Mike Grima d96155b6df
Merge pull request #2813 from DanielThomas/master
Update SAN text
2019-06-21 13:44:54 -07:00
Danny Thomas 4565bd7dc6
Update SAN text 2019-06-21 13:33:55 -07:00
Hossein Shafagh e1d8bb83ec
Merge pull request #2812 from kush-bavishi/temp-ExpiredToggle-3
Color change for Show Expired button
2019-06-21 11:43:17 -07:00
Kush Bavishi 960064d5c6 Color change for Show Expired button 2019-06-21 11:32:16 -07:00
Hossein Shafagh b564f97a47
Merge pull request #2810 from kush-bavishi/temp-ExpiredToggle-3
Expired Toggle
2019-06-21 09:12:31 -07:00
Hossein Shafagh 23caac5576
Merge branch 'master' into temp-ExpiredToggle-3 2019-06-21 08:59:53 -07:00
Hossein Shafagh 7bff3a7947
Merge pull request #2811 from hosseinsh/generalizing-api
removing the rotation enabled requirement, to keep the endpoint generic
2019-06-20 16:38:28 -07:00
Hossein Shafagh 39d65db7fd
Merge branch 'master' into generalizing-api 2019-06-20 16:13:04 -07:00
Hossein Shafagh 162a300e53
Merge branch 'master' into temp-ExpiredToggle-3 2019-06-20 16:12:55 -07:00
Hossein Shafagh 5b8c600261
Merge pull request #2809 from alwaysjolley/vault_regex
fixing regex to be more flexable
2019-06-20 16:12:03 -07:00
Hossein Shafagh 34cdd29a50 removing the rotation enabled requirement, to keep the endpoint generic 2019-06-20 16:06:26 -07:00
Kush Bavishi de0462e54f Added missing semi-colon and changed double quotes to single quotes 2019-06-20 15:41:32 -07:00
Kush Bavishi 68815b8f44 UI changes - Button to show / hide expired certs. 2019-06-20 15:05:26 -07:00
alwaysjolley bbf50cf0b0 updated dest as well as src 2019-06-20 08:26:32 -04:00
alwaysjolley 02719a1de7 Merge branch 'master' into vault_regex
fixed conflicts:
	lemur/plugins/lemur_vault_dest/plugin.py
2019-06-19 09:53:08 -04:00
alwaysjolley 56917614a2 fixing regex to be more flexable 2019-06-19 09:46:44 -04:00
Marti Raudsepp 8a08edb0f3 manage.py: Restore shebang line
This is an executable file but cannot be executed without the interpreter.

The shebang line was lost in commit 8cbc6b8325
2019-06-18 10:51:11 +03:00
Kush Bavishi f836c6fff6 API additions for viewing expired certs as well. Default behavior modified to show only valid certs and those which have expired less than 1 month ago. 2019-06-17 14:29:48 -07:00
Kush Bavishi cdb83c48c5 API additions for viewing expired certs as well. Default behavior modified to show only valid certs and those which have expired less than 1 month ago. 2019-06-17 13:44:50 -07:00
Hossein Shafagh 198abcfe65
Merge pull request #2807 from kush-bavishi/FasterPermalink
Faster permalink
2019-06-11 16:16:55 -07:00
Kush Bavishi c0f8fbb24f Modified Permalink behavior to access a newer, faster API 2019-06-11 15:53:47 -07:00
Kush Bavishi 57016f2f45 Merge branch 'master' of https://github.com/Netflix/lemur into FasterPermalink 2019-06-11 14:33:58 -07:00
Kush Bavishi 491d048948 Modified the behavior of Permalink to access a newer, faster API 2019-06-10 09:47:29 -07:00
Hossein Shafagh 29213972ae
Merge pull request #2806 from hosseinsh/duplicate-notifications-(alternative)
Duplicate notifications (alternative)
2019-06-06 16:29:55 -07:00
Curtis 0446aea20e
Update messaging.py 2019-06-06 13:35:45 -07:00
Hossein Shafagh 1ed41d03ea
Merge branch 'master' into duplicate-notifications-(alternative) 2019-06-06 09:10:57 -07:00
Hossein Shafagh 28e26a1baf to prevent duplicate emails, we might better remove owner and security email address from the notification recipient 2019-06-05 17:57:11 -07:00
Hossein Shafagh 3a512d5bda
Merge pull request #2804 from kush-bavishi/CommonNameAutoAdditionAsDNS
Common name auto addition as domain name
2019-06-05 15:29:35 -07:00
Hossein Shafagh 24f5ce7170
Merge branch 'master' into CommonNameAutoAdditionAsDNS 2019-06-04 13:59:57 -07:00
Curtis f991317301
Merge pull request #2805 from castrapel/docker_37
Upgrade docker to 3.7
2019-06-04 08:32:20 -07:00
Curtis Castrapel aeb32f4853 Upgrade docker to 3.7 2019-06-04 08:21:52 -07:00
Kush Bavishi 45231c2423 Added code to automatically add the common name as a DNS name while creating a certificate. 2019-05-31 14:08:28 -07:00
Kush Bavishi 28b216273d Upgrading Gulp. If this is not necessary, we can remove it later. 2019-05-31 14:07:26 -07:00
Curtis ce9b06e4c6
Merge pull request #2802 from castrapel/downgrade_kombu_0530
Downgrade Kombu
2019-05-30 13:37:26 -07:00