Commit Graph

358 Commits

Author SHA1 Message Date
kevgliss
a1cd2b39eb Merge pull request #135 from mikegrima/travis-tweak
Removed un-needed build step.
2015-10-29 13:34:50 -07:00
kevgliss
8a7a15a361 Merge pull request #132 from cloughrm/master
Use american english for consistency
2015-10-29 13:34:31 -07:00
kevgliss
2cdeecb6e0 Merge pull request #134 from Netflix/monkeysecurity-patch-1
Removing hyphen from in-active.
2015-10-29 13:33:49 -07:00
Mike Grima
638e4a5ac1 Removed un-needed build step.
I hope they have size 'M'.
2015-10-29 13:02:58 -07:00
Patrick Kelley
93b4ef5f17 Removing hyphen from in-active.
`inactive` is a word.  in-active is ... something else.
2015-10-29 11:54:00 -07:00
kevgliss
26d490f74a Merge pull request #133 from belladzaster/grammer
Fixing grammar
2015-10-28 21:53:19 -07:00
belladzaster
01a1190524 Fixing grammer 2015-10-28 19:55:08 -07:00
Ryan Clough
2073090628 Use american english for consistency 2015-10-28 19:39:10 -07:00
kevgliss
6d00cb208d Merge pull request #131 from belladzaster/master
Fixing Typos
2015-10-28 19:32:08 -07:00
belladzaster
13b9bf687d Fixing Typos 2015-10-28 18:24:31 -07:00
kevgliss
56f7da34d7 Merge pull request #129 from kevgliss/version
Version bump and needed documentation.
2015-10-26 11:59:16 -07:00
kevgliss
0f34440b64 Merge pull request #130 from kevgliss/createUser
Fixing issue where roles were not added correctly to user.
2015-10-26 11:58:36 -07:00
kevgliss
bbcc7cca4e Merge pull request #128 from kevgliss/fernet_migration
[WIP] Adding aes - fernet migration
2015-10-26 10:59:41 -07:00
kevgliss
0453afcb0e Fixing issuer where roles were not added correctly to user. 2015-10-26 10:59:20 -07:00
kevgliss
cafecd1e19 Version bump and needed documentation. 2015-10-24 11:18:27 -07:00
kevgliss
4b968a9474 Adding aes - fernet migration 2015-10-23 16:47:17 -07:00
kevgliss
9244945e69 Merge pull request #127 from monkeysecurity/update_cryptography_for_el_capitan
Updating cryptography to 1.0.2 for el capitan
2015-10-21 18:54:43 -07:00
Patrick Kelley
78819c1733 Updating cryptography to 1.0.2 for el capitan 2015-10-21 18:45:50 -07:00
kevgliss
394e18f76e Merge pull request #123 from rpicard/master
Use MultiFernet for encryption
2015-10-14 15:50:33 -07:00
Robert Picard
40eb950e94 Use MultiFernet for encryption
Facilitates key rotation and uses more secure encryption than what
sqlalchemy-utils does.

Fixes #117 and #119.
2015-10-13 16:58:58 -07:00
kevgliss
90636a5329 Merge pull request #118 from rpicard/master
Fix a handful of typos in documentation
2015-10-06 15:30:09 -07:00
Robert Picard
2fc6d4cd21 Fix a handful of typos in documentation
As I was reading through the docs I made note of grammar issues and
typos I saw. Not a huge deal but might as well fix what I noticed.
2015-10-06 15:05:05 -07:00
kevgliss
b20bdf3c4e Merge pull request #116 from kevgliss/algo
Adding the ability to track a certificates signing key algorithm
2015-10-06 13:25:34 -07:00
kevgliss
a20726a301 Fixing python 3.x syntax error 2015-10-06 13:11:24 -07:00
kevgliss
39727a1c9f Fixing tests 2015-10-06 13:00:06 -07:00
kevgliss
168f46a436 Adding the ability to track a certificates signing key algorithm 2015-10-06 12:51:59 -07:00
kevgliss
4ec07a6dc7 Merge pull request #115 from kevgliss/destinations
Fixes destination stat
2015-10-06 09:48:03 -07:00
kevgliss
798a6295ee Fixes destination stat 2015-10-06 09:43:31 -07:00
kevgliss
73cb8da8c1 Merge pull request #114 from kevgliss/clipboard
Add clipboard functionality
2015-10-05 16:14:16 -07:00
kevgliss
3167ce9785 removing unneeded dep 2015-10-05 16:08:12 -07:00
kevgliss
63b7b71b49 adding clipboard functionality 2015-10-05 16:06:56 -07:00
kevgliss
9965af9ccd fixing links, and adding zeroclipboard 2015-10-05 09:48:52 -07:00
kevgliss
ba5d2c925a Merge pull request #113 from kevgliss/perma
Adding ui router and perma links to certificates and authorities
2015-10-05 09:30:52 -07:00
kevgliss
867be09e29 more double quotes 2015-10-05 09:24:11 -07:00
kevgliss
8362a92898 fixing double quotes 2015-10-05 09:19:14 -07:00
kevgliss
162482dbc4 Adding ui router and perma links to certificates and authorities 2015-10-05 09:00:51 -07:00
kevgliss
c0f14db5bb Merge pull request #112 from kevgliss/uitweaks
UI tweaks
2015-10-02 16:31:50 -07:00
kevgliss
3c561914c6 removing angular tour 2015-10-02 16:29:59 -07:00
kevgliss
34c6f1bf4d Merge pull request #111 from kevgliss/105
Closes #105
2015-10-02 16:26:02 -07:00
kevgliss
2187898494 adding copy and a better profile picture for non-sso users 2015-10-02 15:36:50 -07:00
kevgliss
d4bc6ae7a1 Fixes #105 2015-10-02 13:46:13 -07:00
kevgliss
81cdb15353 Merge pull request #108 from kevgliss/description
description should be optional
2015-09-29 16:56:58 -07:00
kevgliss
5cfa9d4bc5 description should be optional 2015-09-29 16:37:32 -07:00
kevgliss
92da453233 Merge pull request #107 from waffle-iron/master
waffle.io Badge
2015-09-29 13:39:36 -07:00
Making GitHub Delicious.
2aedfedbd3 add waffle.io badge 2015-09-29 13:50:33 -06:00
kevgliss
64c9b11c09 Merge pull request #106 from kevgliss/release
version bump
2015-09-28 14:55:24 -07:00
kevgliss
5f87c87751 version bump 2015-09-28 14:54:58 -07:00
kevgliss
70f9022aae Merge pull request #104 from kevgliss/guide
Adding connections in user guides
2015-09-24 16:28:52 -07:00
kevgliss
43683fe554 changing readme language 2015-09-24 16:09:34 -07:00
kevgliss
002de6f5e4 adding docker Link 2015-09-24 16:03:15 -07:00