 Tanner
|
31daa56df0
|
Merge pull request #118 from Dmitra/feat-class-failed
Feat class failed
|
2023-08-15 19:46:39 +00:00 |
|
|
Tanner
|
306860bf51
|
Merge pull request #117 from Dmitra/master
please, have a look at commits
|
2023-07-31 21:41:23 +00:00 |
|
|
Tanner
|
e809299ca1
|
Merge pull request #106 from DeflateAwning/master
Fix minor annoyances
|
2022-12-22 17:56:35 +00:00 |
|
|
Tanner
|
c288df0905
|
Merge pull request #98 from frollard/patch-1
Change paymaster paypal target to new tab
|
2022-10-27 19:57:43 +00:00 |
|
|
Tanner Collin
|
61c263151f
|
Merge pull request #93 from Protospace/google-calendar-support
Google calendar support
|
2022-07-12 03:42:26 +00:00 |
|
|
Tanner Collin
|
6c258225fb
|
Merge pull request #91 from Protospace/kb-fun
First handful of API tests
|
2022-07-05 20:22:46 +00:00 |
|
|
Tanner Collin
|
7da3ce6d56
|
Merge pull request #90 from Protospace/kb-fun
Fix tests
|
2022-06-27 05:06:59 +00:00 |
|
|
Tanner Collin
|
1196012193
|
Merge pull request #69 from Protospace/dependabot/pip/apiserver/reportlab-3.5.55
Bump reportlab from 3.5.34 to 3.5.55 in /apiserver
|
2022-02-06 14:24:35 -07:00 |
|
|
Tanner Collin
|
1e952f0623
|
Merge pull request #71 from Protospace/dependabot/pip/apiserver/django-3.1.14
Bump django from 3.1.13 to 3.1.14 in /apiserver
|
2022-02-06 14:24:17 -07:00 |
|
|
Tanner Collin
|
0ab495f8c5
|
Merge pull request #76 from pspencer53/ldap-pds
Add set_account_enabled LDAP function
|
2022-02-03 21:03:06 -07:00 |
|
|
Tanner Collin
|
293209b3e0
|
Merge pull request #66 from Protospace/dependabot/pip/apiserver/babel-2.9.1
Bump babel from 2.8.0 to 2.9.1 in /apiserver
|
2021-10-21 15:54:56 -06:00 |
|
|
Tanner Collin
|
b0b480c95b
|
Merge pull request #60 from Protospace/dependabot/pip/apiserver/pillow-8.3.2
Bump pillow from 8.2.0 to 8.3.2 in /apiserver
|
2021-09-25 19:39:21 -06:00 |
|
|
Tanner Collin
|
3a08a671c0
|
Merge pull request #64 from Protospace/dependabot/pip/apiserver/django-3.1.13
Bump django from 3.1.12 to 3.1.13 in /apiserver
|
2021-09-25 19:38:29 -06:00 |
|
|
Tanner Collin
|
d7b713bbf2
|
Merge pull request #61 from pspencer53/ldap_pat
Merge in Pat's LDAP fix
|
2021-09-18 15:43:40 -06:00 |
|
|
Tanner Collin
|
35d2dd22f1
|
Merge pull request #58 from Protospace/optimize-footer
Optimize footer
|
2021-08-14 18:23:10 -06:00 |
|
|
Tanner Collin
|
4226df2684
|
Merge pull request #55 from Protospace/dependabot/pip/apiserver/django-3.1.12
Bump django from 3.1.10 to 3.1.12 in /apiserver
|
2021-06-10 14:25:26 -06:00 |
|
|
Tanner Collin
|
ee528c06d9
|
Merge pull request #52 from Protospace/dependabot/pip/apiserver/pillow-8.2.0
Bump pillow from 8.1.1 to 8.2.0 in /apiserver
|
2021-06-10 00:01:23 -06:00 |
|
|
Tanner Collin
|
5db9c47d88
|
Merge pull request #53 from Protospace/dependabot/pip/apiserver/django-3.1.10
Bump django from 3.1.9 to 3.1.10 in /apiserver
|
2021-06-10 00:01:04 -06:00 |
|
|
Tanner Collin
|
137f37b2fe
|
Merge pull request #49 from Protospace/dependabot/pip/apiserver/urllib3-1.26.5
Bump urllib3 from 1.25.8 to 1.26.5 in /apiserver
|
2021-06-05 00:22:28 -06:00 |
|
|
Tanner Collin
|
b2b4105d0f
|
Merge pull request #50 from Protospace/dependabot/pip/apiserver/django-3.1.9
Bump django from 3.0.14 to 3.1.9 in /apiserver
|
2021-06-05 00:22:10 -06:00 |
|
|
Tanner Collin
|
b725acb2d1
|
Merge pull request #41 from Protospace/dependabot/npm_and_yarn/webclient/ssri-6.0.2
Bump ssri from 6.0.1 to 6.0.2 in /webclient
|
2021-04-30 18:52:36 -06:00 |
|
|
Tanner Collin
|
75ed8fee4f
|
Merge pull request #42 from Protospace/dependabot/pip/apiserver/urllib3-1.25.8
Bump urllib3 from 1.25.7 to 1.25.8 in /apiserver
|
2021-04-30 18:52:28 -06:00 |
|
|
Tanner Collin
|
15e1821817
|
Merge pull request #25 from Protospace/dependabot/npm_and_yarn/webclient/ini-1.3.8
Bump ini from 1.3.5 to 1.3.8 in /webclient
|
2021-04-15 17:49:16 -06:00 |
|
|
Tanner Collin
|
d2191bae2c
|
Merge pull request #26 from Protospace/dependabot/pip/apiserver/bleach-3.3.0
Bump bleach from 3.1.4 to 3.3.0 in /apiserver
|
2021-04-15 17:49:06 -06:00 |
|
|
Tanner Collin
|
2548953e42
|
Merge pull request #27 from Protospace/dependabot/npm_and_yarn/webclient/elliptic-6.5.4
Bump elliptic from 6.5.3 to 6.5.4 in /webclient
|
2021-04-15 17:48:57 -06:00 |
|
|
Tanner Collin
|
894ad568cc
|
Merge pull request #29 from Protospace/dependabot/pip/apiserver/pillow-8.1.1
Bump pillow from 7.2.0 to 8.1.1 in /apiserver
|
2021-04-15 17:48:47 -06:00 |
|
|
Tanner Collin
|
430ee32efc
|
Merge pull request #30 from Protospace/dependabot/pip/apiserver/djangorestframework-3.11.2
Bump djangorestframework from 3.11.0 to 3.11.2 in /apiserver
|
2021-04-15 17:48:37 -06:00 |
|
|
Tanner Collin
|
9920a729a0
|
Merge pull request #31 from Protospace/dependabot/pip/apiserver/jinja2-2.11.3
Bump jinja2 from 2.10.3 to 2.11.3 in /apiserver
|
2021-04-15 17:48:26 -06:00 |
|
|
Tanner Collin
|
d740cf8aa9
|
Merge pull request #32 from Protospace/dependabot/pip/ldapserver/jinja2-2.11.3
Bump jinja2 from 2.11.1 to 2.11.3 in /ldapserver
|
2021-04-15 17:48:03 -06:00 |
|
|
Tanner Collin
|
89401029cb
|
Merge pull request #33 from Protospace/dependabot/pip/authserver/jinja2-2.11.3
Bump jinja2 from 2.11.2 to 2.11.3 in /authserver
|
2021-04-15 17:47:53 -06:00 |
|
|
Tanner Collin
|
cd089988c2
|
Merge pull request #34 from Protospace/dependabot/npm_and_yarn/webclient/three-0.125.0
Bump three from 0.119.1 to 0.125.0 in /webclient
|
2021-04-15 17:47:44 -06:00 |
|
|
Tanner Collin
|
5419c560ec
|
Merge pull request #36 from Protospace/dependabot/pip/apiserver/pygments-2.7.4
Bump pygments from 2.5.2 to 2.7.4 in /apiserver
|
2021-04-15 17:47:34 -06:00 |
|
|
Tanner Collin
|
3042c00aa7
|
Merge pull request #39 from Protospace/dependabot/pip/apiserver/django-3.0.14
Bump django from 3.0.7 to 3.0.14 in /apiserver
|
2021-04-15 17:47:14 -06:00 |
|
|
Tanner Collin
|
5abb91d838
|
Merge pull request #38 from Protospace/optimize-laser
Update Laser.js
|
2021-04-03 18:06:55 -06:00 |
|
|
Tanner Collin
|
2ba546d94c
|
Merge pull request #22 from Protospace/webgl-footer
🚀
|
2021-03-20 16:34:15 -06:00 |
|
|
Tanner Collin
|
bb25ca0e05
|
Merge pull request #23 from Protospace/dependabot/npm_and_yarn/webclient/http-proxy-1.18.1
Bump http-proxy from 1.18.0 to 1.18.1 in /webclient
|
2020-09-06 17:29:19 -06:00 |
|
|
Tanner Collin
|
7297e30eb9
|
Merge pull request #21 from Protospace/dependabot/npm_and_yarn/webclient/elliptic-6.5.3
Bump elliptic from 6.5.2 to 6.5.3 in /webclient
|
2020-08-02 19:17:19 -06:00 |
|
|
Tanner Collin
|
ac3bd5ba49
|
Merge pull request #20 from Protospace/dependabot/npm_and_yarn/webclient/websocket-extensions-0.1.4
Bump websocket-extensions from 0.1.3 to 0.1.4 in /webclient
|
2020-06-05 14:46:06 -06:00 |
|
|
Tanner Collin
|
134401dbb8
|
Merge pull request #19 from Protospace/dependabot/pip/apiserver/django-3.0.7
Bump django from 3.0.3 to 3.0.7 in /apiserver
|
2020-06-05 14:41:50 -06:00 |
|
|
Tanner Collin
|
a5fdc70a2d
|
Merge pull request #16 from Protospace/dependabot/pip/apiserver/bleach-3.1.4
Bump bleach from 3.1.2 to 3.1.4 in /apiserver
|
2020-03-30 14:16:06 -06:00 |
|
|
Tanner Collin
|
adaa0e0d3c
|
Merge pull request #14 from Protospace/dependabot/pip/apiserver/bleach-3.1.2
Bump bleach from 3.1.1 to 3.1.2 in /apiserver
|
2020-03-28 20:50:01 -06:00 |
|
|
Tanner Collin
|
9fb122aed4
|
Merge pull request #13 from pspencer53/ldap-groups
Add group functions. Add members, list members, create new groups
|
2020-03-17 17:23:21 -06:00 |
|
|
Tanner Collin
|
79800b3562
|
Merge pull request #11 from Protospace/dependabot/npm_and_yarn/webclient/acorn-5.7.4
Bump acorn from 5.7.3 to 5.7.4 in /webclient
|
2020-03-15 22:58:04 -06:00 |
|