Commit Graph

19 Commits

Author SHA1 Message Date
Isaac Connor 64d024b0c0 Fix spacing 2019-08-28 10:33:18 -04:00
Isaac Connor 44e4d93445 Merge branch 'master' into storageareas 2019-06-24 11:35:36 -04:00
Pliable Pixels 299f994506 Fix zmcrypt message (#2645)
* added more clarity on zm_crypt authentication errors

* fixed variable name
2019-06-24 11:28:32 -04:00
Isaac Connor 470da03322 Merge sync fixes from storageareas 2019-06-20 15:14:20 -04:00
Isaac Connor 540a114c4b spacing google code style 2019-06-19 10:31:53 -04:00
Pliable Pixels 21710b6e49 demote logs 2019-05-12 15:45:39 -04:00
Pliable Pixels 1f22c38453 more fixes 2019-05-12 05:10:20 -04:00
Pliable Pixels 6ab31dfe4b more fixes 2019-05-12 05:03:16 -04:00
Pliable Pixels 3e66be27a8 use strtoul for conversion 2019-05-11 16:09:42 -04:00
Pliable Pixels 053e57af62 use strtoul for conversion 2019-05-11 16:01:05 -04:00
Pliable Pixels 96fa6149a8 use strtoul for conversion 2019-05-11 15:58:07 -04:00
Pliable Pixels ae14be916c initial plumbing to introduce token expiry and API bans per user 2019-05-11 13:39:40 -04:00
Pliable Pixels 0bb5ff934e move sha headers out 2019-05-08 19:17:31 -04:00
Pliable Pixels 4ab0c35962 move JWT/Bcrypt inside zm_crypt 2019-05-08 16:45:28 -04:00
Pliable Pixels 4c8d20db64 typo 2019-05-04 15:27:00 -04:00
Pliable Pixels 983e050fd7 fixed SHA1 algo 2019-05-04 15:20:31 -04:00
Pliable Pixels d952fe7117 Moved to openSSL SHA1, initial JWT plugin 2019-05-04 11:52:53 -04:00
Pliable Pixels ca2e7ea97c logs tweak 2019-05-03 12:01:13 -04:00
Pliable Pixels 72325d12b7 move to wrapper 2019-05-03 11:40:35 -04:00