Commit Graph

368 Commits

Author SHA1 Message Date
Björn Dahlgren
faf4fa4aa1
Merge pull request #118 from Dahlgren/bugfix/missions-callback
Add null check for error callback on missions update
2018-08-18 16:38:59 +02:00
Björn Dahlgren
5880b10b24 Add null check for error callback on missions update 2018-08-18 16:34:01 +02:00
Björn Dahlgren
0d6e66e131
Merge pull request #116 from Dahlgren/feature/socket-missions
Push missions with socket connection
2018-08-18 13:10:08 +02:00
Björn Dahlgren
ae21680da8 Push missions with socket connection 2018-08-18 13:04:33 +02:00
Björn Dahlgren
e16b558df6
Merge pull request #115 from Dahlgren/feature/socket-settings
Push settings with socket connection
2018-08-18 12:42:47 +02:00
Björn Dahlgren
4b1fa7b52f Push settings with socket connection 2018-08-18 12:31:47 +02:00
Björn Dahlgren
50ab69f80d
Merge pull request #113 from Dahlgren/bugfix/lodash
Update to latest lodash version 4.17.10
2018-08-18 05:35:28 +02:00
Björn Dahlgren
d157116073 Update to latest lodash version 4.17.10
Use Underscore for Backbone and Marionette
2018-08-18 05:30:14 +02:00
Björn Dahlgren
1ce9c3123d
Merge pull request #95 from Dahlgren/feature/webpack
Assemble frontend with webpack
2018-08-18 03:43:10 +02:00
Björn Dahlgren
b13cc58b33 Assemble frontend with webpack 2018-08-18 03:35:48 +02:00
Björn Dahlgren
20d82f8f2c
Merge pull request #112 from Dahlgren/bugfix/pws-leftover-image
Remove leftover PWS image
2018-08-18 03:34:57 +02:00
Björn Dahlgren
7a36ba1c66 Remove leftover PWS image 2018-08-18 03:31:58 +02:00
Björn Dahlgren
97f73909e1
Merge pull request #111 from Dahlgren/feature/travis-node
Use more NodeJS versions while building with Travis CI
2018-08-18 03:10:13 +02:00
Björn Dahlgren
4a451e9e8a Use more NodeJS versions while building with Travis CI 2018-08-18 03:05:16 +02:00
Björn Dahlgren
94bb58761e
Merge pull request #110 from Dahlgren/feature/lint-root-js
Lint all js files in root directory
2018-08-18 03:03:01 +02:00
Björn Dahlgren
279239dc30 Lint all js files in root directory 2018-08-18 02:58:49 +02:00
Björn Dahlgren
09c44ef585
Merge pull request #90 from Dahlgren/feature/marionette-2
Update frontend dependencies
2018-08-18 02:58:02 +02:00
Björn Dahlgren
c58ec6f308 Update frontend dependencies
Backbone to 1.3.3
Marionette to 2.4.7
Underscore to 1.8.3

Fixes collection sorting when new items are added
2018-08-18 02:53:27 +02:00
Björn Dahlgren
9ca5cb3c82
Merge pull request #109 from Dahlgren/feature/remove-playwithsix
Remove Play withSIX
2018-08-18 01:27:29 +02:00
Björn Dahlgren
a39e6f17e0 Remove Play withSIX 2018-08-18 01:22:44 +02:00
Björn Dahlgren
4154cd697f
Merge pull request #102 from Dahlgren/bugfix/readme-fix
Fix Linux typo in README
2018-03-07 10:06:38 +01:00
Björn Dahlgren
103a743d41 Fix Linux typo in README 2018-03-07 09:59:05 +01:00
Björn Dahlgren
a880c48523
Merge pull request #100 from Dahlgren/bugfix/mods-endpoints-send-status
Add missing send response to mods requests
2018-01-20 22:02:31 +01:00
Björn Dahlgren
7fa714b8d5 Add missing send response to mods requests 2018-01-20 21:59:41 +01:00
Björn Dahlgren
bcb1fe6a9b
Merge pull request #97 from Dahlgren/feature/api-whitelist-config
Whitelist which config settings to send for API endpoint
2018-01-02 14:44:31 +01:00
Björn Dahlgren
b37342e100 Whitelist which config settings to send for API endpoint
Avoids sharing private username and password for Steam etc
2018-01-02 14:36:02 +01:00
Björn Dahlgren
6278bf02f5
Merge pull request #98 from Dahlgren/bugfix/multiple-instance
Avoid spawning a new instance of an already running server
2018-01-02 14:35:28 +01:00
Björn Dahlgren
c84acff059 Avoid spawning a new instance of an already running server 2018-01-02 14:30:39 +01:00
Björn Dahlgren
01a9151c36 Merge pull request #89 from Dahlgren/feature/remove-marionette-formview
Remove marionette formview library
2017-10-06 00:13:22 +02:00
Björn Dahlgren
de7b482fe4 Remove marionette formview library 2017-10-06 00:01:55 +02:00
Björn Dahlgren
1e63fb566f Merge pull request #88 from Dahlgren/bugfix/mod-search-missing-type
Fix exception for mod with missing type while searching
2017-10-05 23:19:11 +02:00
Björn Dahlgren
065a6cf76b Fix exception for mod with missing type while searching 2017-10-05 23:15:23 +02:00
Björn Dahlgren
841b9385b7 Merge pull request #86 from Dahlgren/feature/delete-log-file
Add delete button to log files list
2017-10-05 21:47:15 +02:00
Björn Dahlgren
4b23b687d6 Add delete button to log files list 2017-10-05 21:42:50 +02:00
Björn Dahlgren
d37b6e80f8 Merge pull request #85 from Dahlgren/feature/older-games-log-folder
Support logs directory for Arma, Arma 2 and Arma 2 OA
2017-10-05 21:42:01 +02:00
Björn Dahlgren
7dedbc9f45 Support logs directory for Arma, Arma 2 and Arma 2 OA 2017-10-05 21:39:31 +02:00
Björn Dahlgren
056150a30a Merge pull request #84 from Dahlgren/bugfix/server-json-file-patch
Fix file patching json key for server
2017-10-03 10:59:31 +02:00
Björn Dahlgren
85ab98e778 Fix file patching json key for server 2017-10-03 10:56:58 +02:00
Björn Dahlgren
6de8246af2 Merge pull request #81 from gruppe-adler/filePatching
add file patching options
2017-10-03 10:54:18 +02:00
Moritz Schmidt
a3298f3057 add file patching options 2017-10-03 10:46:02 +02:00
Björn Dahlgren
4763420f7b Merge pull request #82 from gruppe-adler/open-logfiles
view logfiles in browser
2017-10-02 11:00:50 +02:00
Moritz Schmidt
6c979baeec enable user to view log file in browser 2017-10-02 10:57:00 +02:00
Moritz Schmidt
f5e3755c51 add file size to log file view 2017-10-02 10:52:38 +02:00
Björn Dahlgren
b1bb295d57 Merge pull request #83 from gruppe-adler/multi-upload
multi missions file upload
2017-10-02 10:34:26 +02:00
Moritz Schmidt
c38f23f54c multi missions file upload 2017-10-02 10:21:27 +02:00
Björn Dahlgren
55a8985701 Merge pull request #75 from gruppe-adler/admins-motd-forcedDifficulty
more options in web frontend
2017-10-01 04:28:07 +02:00
Moritz Schmidt
49ceacf8ae configure motd/forcedDifficulty per server 2017-10-01 04:24:05 +02:00
Moritz Schmidt
af17f8a76d pass admins array from config to server config 2017-10-01 04:11:42 +02:00
Björn Dahlgren
2c5d8cfd30 Bump arma-server dependency to 0.0.6 2017-10-01 04:11:42 +02:00
Björn Dahlgren
a7126bce86 Merge pull request #74 from gruppe-adler/server-clone
add button to clone server configuration
2017-10-01 03:48:31 +02:00