Commit Graph
9876 Commits
Author SHA1 Message Date
Jordan BrownandGitHub dc689189b1 Merge branch 'master' into FixJS 2019-01-09 16:42:55 -05:00
Jordan BrownandGitHub 2b5e7f7d39 Merge pull request #845 from tgstation/Cyberboss-patch-1
Minor grammar improvement in DMAPI
2019-01-09 16:42:43 -05:00
Jordan Brown 0c3d54ea4e Update control panel to create-react-app 2019-01-09 16:38:38 -05:00
Jordan BrownandGitHub 0302928122 Document TgsInstanceName 2019-01-09 13:37:53 -05:00
Jordan BrownandGitHub 3250d016ab Minor grammar improvement in DMAPI 2019-01-09 11:56:26 -05:00
Jordan BrownandGitHub 118eb3c320 Merge pull request #844 from tgstation/DependentDeletion
Removes SessionControllerFactory's dependency on ResolvingIOManager
2019-01-07 09:46:24 -05:00
Jordan BrownandGitHub a275f9a363 Remove trailing whitespace 2019-01-06 16:44:33 -05:00
Jordan Brown 42ba17fbbe Removes SessionControllerFactory's dependency on ResolvingIOManager 2019-01-03 11:59:27 -05:00
Jordan BrownandGitHub 57828b9ea1 Merge pull request #840 from tgstation/Cyberboss-patch-1
Update README with note about Linux BYOND bug
2018-12-25 15:44:19 -05:00
Jordan BrownandGitHub 358b8205a4 Merge branch 'master' into Cyberboss-patch-1 2018-12-24 15:33:39 -05:00
Jordan BrownandGitHub 88c7c6fad0 Merge pull request #842 from tgstation/841-FixMorty
Add missing select for PushTestMergeCommits
2018-12-24 15:18:52 -05:00
Jordan Brown d570f50086 Add missing select for PushTestMergeCommits 2018-12-23 15:35:37 -05:00
Jordan BrownandGitHub 9ac5fd9709 Merge pull request #839 from tgstation/838-FixReattachFail
Do not releaseServers if StopAsync fails
2018-12-23 15:27:20 -05:00
Jordan BrownandGitHub ef0ffb2ce2 Manually embed Linux issue link 2018-12-23 15:05:26 -05:00
Jordan BrownandGitHub 71fdcfecc0 Update README with note about Linux BYOND bug 2018-12-23 15:04:07 -05:00
Jordan Brown c803b508ab Do not releaseServers if StopAsync fails 2018-12-23 14:58:10 -05:00
Jordan BrownandGitHub 1e4bd33a85 Merge pull request #835 from tgstation/Cyberboss-patch-1 [NugetDeploy]
Minor version bumps do not break API
2018-12-23 14:38:40 -05:00
Jordan BrownandGitHub 5ea1703a12 Merge branch 'master' into Cyberboss-patch-1 2018-12-23 13:30:01 -05:00
Jordan BrownandGitHub 0f4f73679d Merge pull request #834 from Pyko1/patch-1
Adds example reverse proxy for apache
2018-12-23 13:29:53 -05:00
Jordan BrownandGitHub 3184f66888 API patch version bump 2018-12-23 13:28:43 -05:00
Jordan BrownandGitHub 1e94f8d793 Minor version bumps do not break API 2018-12-23 13:28:12 -05:00
Jordan BrownandGitHub d28c975474 Merge branch 'master' into patch-1 2018-12-20 15:33:29 -05:00
Jordan BrownandGitHub df9021323d Merge pull request #816 from steamp0rt/thingymajig
Allow testmerge comments to be toggled
2018-12-20 15:33:08 -05:00
PykoandGitHub 2baa28f589 Adds example reverse proxy for apache
Since I had hard time getting it work.
2018-12-20 21:34:17 +02:00
steamportandGitHub 4732afac7c Merge branch 'master' into thingymajig 2018-12-13 16:00:19 +00:00
Jordan BrownandGitHub 7250f320ab Merge pull request #833 from tgstation/Cyberboss-patch-1
Fix the DMAPI bug
2018-12-13 10:13:40 -05:00
Jordan BrownandGitHub 71d02a256c Fix the DMAPI bug 2018-12-09 20:50:21 -05:00
Jordan BrownandGitHub ab810e5e64 Merge pull request #832 from tgstation/VSCodeGoodies
Make the project vscode friendly
2018-12-05 13:22:23 -05:00
Jordan Brown 8114669a39 Make the project vscode friendly 2018-12-05 11:22:38 -05:00
steamport 73e0c9a8e4 no u 2018-12-03 17:44:05 -05:00
steamportandGitHub 9a5fbf50a1 Update DatabaseContext.cs 2018-12-02 16:47:11 +00:00
steamport a07056ea82 Merge branch 'master' of https://github.com/tgstation/tgstation-server into thingymajig 2018-12-02 11:33:43 -05:00
Jordan BrownandGitHub b6e6751e58 Merge pull request #827 from Cyberboss/DMAPIChanges
Add better version handling to the DMAPI
2018-11-29 14:58:02 -05:00
Jordan BrownandGitHub 761703ce7f Merge branch 'master' into DMAPIChanges 2018-11-29 13:31:35 -05:00
Jordan BrownandGitHub 0173da05d7 Merge pull request #831 from tgstation/825-Stylecop
Hires Hitler to maintain the glorious Aryan code genes (Stylecop)
2018-11-29 13:29:45 -05:00
Jordan Brown 10f6cee11d Fix DMAPI things 2018-11-29 10:27:45 -05:00
Jordan Brown c93f2887b2 Merge upstream 2018-11-29 10:21:20 -05:00
Jordan BrownandGitHub 68d1087562 Merge pull request #797 from Cyberboss/SPA
Adds web control panel
2018-11-29 10:03:40 -05:00
Jordan Brown a28fdd089e Buff API and client versions 2018-11-28 17:46:00 -05:00
Jordan Brown 6ce1b5f026 Fix service test 2018-11-28 17:34:13 -05:00
Jordan Brown 4802df752e Delete that too 2018-11-28 17:04:43 -05:00
Jordan Brown 7d1f03026b Fix .dockerignore 2018-11-28 17:03:54 -05:00
Jordan Brown 2a10429e8d Fix doc file issues 2018-11-28 17:03:01 -05:00
Jordan Brown 86f26d725d Update CONTRIBUTING.md 2018-11-28 16:54:34 -05:00
Jordan Brown c27467bade Finish remaining stylecop issues 2018-11-28 16:52:01 -05:00
Jordan Brown 846f143f5d Tagged all instances of complexity that need handling 2018-11-28 16:25:40 -05:00
Jordan Brown 46eea5403a Address all Host stylecop issues asside from complexity/maintainibilty 2018-11-28 16:05:27 -05:00
Jordan Brown d4bbe7533c Get tab enforcement going 2018-11-28 14:58:59 -05:00
Jordan Brown c246ea9e62 This fukken service test 2018-11-28 14:33:59 -05:00
Jordan Brown 5c9c54c86f More Stylecop WIP 2018-11-28 12:57:13 -05:00