Commit Graph

1116 Commits

Author SHA1 Message Date
e6beab0ff6 Remove extra package-lock.json 2021-04-16 00:59:02 +00:00
f622c72fc7 Remove extra package-lock.json 2021-04-15 23:52:14 +00: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
dependabot[bot]
659fb141ff
Bump pillow from 7.2.0 to 8.1.1 in /apiserver
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.2.0 to 8.1.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/7.2.0...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-15 23:48:23 +00:00
dependabot[bot]
9c9426679c
Bump jinja2 from 2.10.3 to 2.11.3 in /apiserver
Bumps [jinja2](https://github.com/pallets/jinja) from 2.10.3 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.10.3...2.11.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-15 23:48:15 +00: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
cad4caf518 Reset backup canaries 2021-04-15 23:30:16 +00:00
3f34a3aaf8 Simplify the race condition fix using F() 2021-04-15 22:58:56 +00:00
9a3a9db4ee Fix tracking race condition 2021-04-15 22:38:46 +00:00
677b4086e5 Add basic tracking of devices 2021-04-10 23:39:58 +00:00
dependabot[bot]
2e4b82d829
Bump django from 3.0.7 to 3.0.14 in /apiserver
Bumps [django](https://github.com/django/django) from 3.0.7 to 3.0.14.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.0.7...3.0.14)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-08 19:11:45 +00:00
0763174494 Fix explosions 2021-04-04 00:10:42 +00:00
b8f8252906 Only show mumble stats if present 2021-04-04 00:07:45 +00:00
Tanner Collin
5abb91d838
Merge pull request #38 from Protospace/optimize-laser
Update Laser.js
2021-04-03 18:06:55 -06:00
Elijah Lucian
6867eb5d8b geometry 2021-04-03 17:57:54 -06:00
Elijah Lucian
7a95d734de
Update Laser.js 2021-04-03 17:41:57 -06:00
868e3636dc Only track mumble stat if URL is set 2021-04-03 19:07:07 +00:00
dependabot[bot]
28fad66f7e
Bump pygments from 2.5.2 to 2.7.4 in /apiserver
Bumps [pygments](https://github.com/pygments/pygments) from 2.5.2 to 2.7.4.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](https://github.com/pygments/pygments/compare/2.5.2...2.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-29 21:42:37 +00:00
605a4ff40b Rotate camera with mouse 2021-03-24 06:20:41 +00:00
52691e8f0b Make the ships explode 2021-03-22 00:20:39 +00:00
8630a9b66c Merge branch 'webgl-footer' 2021-03-21 02:51:23 +00:00
8874850b2f Delete bolts that are far away 2021-03-21 02:50:42 +00:00
94d2a6f0f6 Merge branch 'webgl-footer' 2021-03-21 02:45:04 +00:00
7fb906dbc6 Add randomness to lasers 2021-03-21 02:42:58 +00:00
3529916726 Delete bolts that are far away 2021-03-21 02:42:58 +00:00
Elijah Lucian
cfe4cb3382 👻 2021-03-21 02:42:58 +00:00
8a37626106 Add fancy space battle 2021-03-21 02:42:58 +00:00
5af88cf479 Add chart lines for open and closed 2021-03-21 02:42:58 +00:00
Elijah Lucian
bd7b0ac62f 😭🤳 2021-03-20 19:32:45 -07:00
1e175fa813 Delete bolts that are far away 2021-03-21 02:22:35 +00:00
Elijah Lucian
20c9898174 👻 2021-03-20 18:59:13 -07:00
219f98dab4 Add fancy space battle 2021-03-21 01:44:09 +00:00
6a541a8544 Merge branch 'webgl-footer' 2021-03-20 22:47:54 +00:00
Elijah Lucian
0c5c20f1fc 📐 2021-03-20 15:44:32 -07:00
dependabot[bot]
1163f9553b
Bump three from 0.119.1 to 0.125.0 in /webclient
Bumps [three](https://github.com/mrdoob/three.js) from 0.119.1 to 0.125.0.
- [Release notes](https://github.com/mrdoob/three.js/releases)
- [Commits](https://github.com/mrdoob/three.js/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-20 22:35:10 +00:00
Tanner Collin
2ba546d94c
Merge pull request #22 from Protospace/webgl-footer
🚀
2021-03-20 16:34:15 -06:00
Elijah Lucian
b169f1372b 🚀 2021-03-20 15:29:00 -07:00
dependabot[bot]
1cde290002
Bump jinja2 from 2.11.2 to 2.11.3 in /authserver
Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.11.2...2.11.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-20 05:27:03 +00:00
dependabot[bot]
04d53a331b
Bump jinja2 from 2.11.1 to 2.11.3 in /ldapserver
Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.1 to 2.11.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst)
- [Commits](https://github.com/pallets/jinja/compare/2.11.1...2.11.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-20 02:48:58 +00:00
dependabot[bot]
5de5cc7fdd
Bump djangorestframework from 3.11.0 to 3.11.2 in /apiserver
Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.11.0 to 3.11.2.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.11.0...3.11.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-19 23:01:05 +00:00
Elijah Lucian
03687402c9 handling window resize events 2021-03-17 10:51:19 -06:00