Commit Graph

892 Commits

Author SHA1 Message Date
Knuspel
246670275f
Update Dockerfile
Removed nginx from Dockerfile
2020-12-25 23:14:35 +01:00
Knuspel
dc1cde89f9
Update Dockerfile
Realized there as been a change within the setup of Dockerfile
Factorio is installed during the entrypoint.sh
2020-12-25 21:23:29 +01:00
Knuspel
f1405e827c
Merge branch 'develop' into docker-fix 2020-12-25 21:02:48 +01:00
knuspel
ae49c8a42f changed from mroote to OFSM 2020-12-25 17:23:36 +01:00
knuspel
d2122e5a20 changed latest to stable 2020-12-25 17:03:40 +01:00
Mitch Roote
5be9e79043
Merge pull request #198 from MichaelPereira/api-auth-instructions
Add instructions for API auth
2020-12-18 22:38:18 -05:00
Michael Pereira
3939890d9e Add instructions for API auth 2020-12-18 21:16:51 -06:00
Mitch Roote
6d9ad408ae fix readme command typo 2020-12-09 12:11:36 -05:00
knoxfighter
2c4ab7e843
Merge pull request #197 from knoxfighter/docker_fixes
Docker fixes
2020-12-09 18:02:41 +01:00
Mitch Roote
2c62426212 remove lonely c 2020-12-09 11:53:43 -05:00
knoxfighter
a78b085cea Merge remote-tracking branch 'mroote/develop' into docker_fixes 2020-12-09 17:51:40 +01:00
knoxfighter
019f237583 default to port 80 2020-12-09 17:51:14 +01:00
knoxfighter
c421e025ac updated Changelog 2020-12-09 17:50:43 +01:00
knoxfighter
1a33e7e15c fixed fsm not finding factorio 2020-12-09 17:46:21 +01:00
Mitch Roote
5b2df68995 Update links in README, add authors 2020-12-09 11:43:51 -05:00
Mitch Roote
2cf43daf47 run on published release 2020-12-09 11:29:41 -05:00
Mitch Roote
33d5386220 test prereleased release trigger 2020-12-09 11:28:20 -05:00
Mitch Roote
ed380ccfd9 Merge branch 'develop' of github.com:OpenFactorioServerManager/factorio-server-manager into develop 2020-12-09 11:21:45 -05:00
Mitch Roote
aae4e6ae89 trigger release build on unpublished release 2020-12-09 11:21:01 -05:00
Mitch Roote
54009feac7 revert release on tags 2020-12-09 11:15:01 -05:00
Mitch Roote
fe7523db76 Merge branch 'develop' of github.com:OpenFactorioServerManager/factorio-server-manager into develop 2020-12-09 10:57:44 -05:00
Mitch Roote
c98032c53c Allow manual job trigger 2020-12-09 10:56:31 -05:00
Mitch Roote
67d68410d2 update workflow 2020-12-09 10:51:53 -05:00
Mitch Roote
1c42dbdade run release pipeline on tags 2020-12-09 10:49:13 -05:00
Mitch Roote
7ae3b7da22
Merge pull request #194 from knoxfighter/fix_rcon_random
fixed rcon port not randomized
2020-12-09 10:31:42 -05:00
knoxfighter
7f4dbc215c golang rand was not seeded before rcon port was chosen 2020-12-09 05:15:24 +01:00
knoxfighter
87889c93dd
Merge pull request #186 from jannaahs/rework-ui
Complete UI Rework
2020-12-09 03:10:24 +01:00
Jan Naahs
1eb7b7fe65
Merge pull request #20 from knoxfighter/rework-ui
reworked websocket connection
2020-12-08 22:49:36 +01:00
knoxfighter
7b4feac2f6 cache latest server messages to show them in the Console Tab, when it is opened/renewed 2020-12-07 23:35:13 +01:00
knoxfighter
54bc8bd354 reworked websocket connection 2020-12-06 17:08:53 +01:00
Jan Naahs
17c398acb0 update test-workflow.yml 2020-12-02 17:12:02 +01:00
Jan Naahs
4e6b740fc7 update test-workflow.yml 2020-12-02 17:02:43 +01:00
Jan Naahs
1c324368f8 update test-workflow.yml 2020-12-02 16:51:22 +01:00
Jan Naahs
14c21444ec Merge branch 'develop' into rework-ui
# Conflicts:
#	.travis.yml
2020-12-02 16:28:57 +01:00
Mitch Roote
a14ca4f462
Merge pull request #189 from knoxfighter/github-actions
GitHub actions
2020-11-28 13:52:28 -05:00
Jan Naahs
2d884d927c add flash message for successfully saving server settings 2020-11-27 19:50:24 +01:00
Jan Naahs
6c2dff47cc load modpack requires confirmation including a warning text 2020-11-27 19:45:30 +01:00
Jan Naahs
56a66fc426 load mods from save has flash message on success 2020-11-27 19:40:27 +01:00
knoxfighter
d9592074f9 use whitelist for PRs too 2020-11-24 03:12:33 +01:00
knoxfighter
00aceeeda1 branches has to be defined, if tags-ignore is used 2020-11-24 03:09:51 +01:00
knoxfighter
4e133904fb removed travis.yml we dont need it anymore 2020-11-24 02:48:17 +01:00
knoxfighter
f89997e494 use latest as docker tag 2020-11-24 02:41:39 +01:00
knoxfighter
e5e40a0255 also publish release on dockerhub 2020-11-24 02:35:11 +01:00
knoxfighter
ca4394295a dont run tests on releases 2020-11-24 02:13:06 +01:00
knoxfighter
dc7490b055 use fork of getting the tag 2020-11-24 01:58:57 +01:00
knoxfighter
dc71a8bcd4 use plugin to get git tag name 2020-11-24 01:43:50 +01:00
knoxfighter
5701f07f8f try using an env for the filename 2020-11-24 01:32:16 +01:00
knoxfighter
00bdd9de2b try without quotest 2020-11-24 01:20:36 +01:00
knoxfighter
0834900e04 fix var syntax 2020-11-24 01:18:12 +01:00
knoxfighter
602f3cc6fa use build folder to search for zips 2020-11-24 01:09:57 +01:00