Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
623 Commits 12 Branches 45 Tags 104 MiB
b7039573a4
Commit Graph

623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
computergeek125
9720929e33 Resolved missing stdout when java process exits quickly 2021-11-06 12:06:26 -05:00
computergeek125
82f4661044 Fixed db_helper issue 2021-11-06 11:27:15 -05:00
Iain Powrie
cb3f6386c9 Update with more options for registry login 2021-11-06 16:02:58 +00:00
Iain Powrie
1c9ffb2abc Merge branch 'dev' into 'subprocess' 
# Conflicts:
#   app/classes/shared/helpers.py
#   app/classes/shared/server.py
#   app/classes/web/ajax_handler.py
 2021-11-06 15:26:37 +00:00
Silversthorn
6b24b09c81 Merge branch 'dev-DescendingOrderServerVersions' into 'dev' 
Server Versions Ordered by Descending

See merge request crafty-controller/crafty-commander!85
 2021-11-05 18:36:52 +00:00
Silversthorn
133e7cf291 Server Versions Ordered by Descending 2021-11-05 19:33:24 +01:00
Iain Powrie
126964dc30 Merge branch 'lukas-fixes-everywhere' into 'dev' 
Lukas fixes

See merge request crafty-controller/crafty-commander!83
 2021-11-05 16:41:09 +00:00
Zedifus
bbcf239030 Add llvm11-libs to compiler garbage collection 2021-11-05 16:21:37 +00:00
Zedifus
be0efe7c28 Fix pip requirements 
pyOpenSSL req by helpers.py,
PyYAML req by roles.py,
schedule replaced by incorrect package schedules
 2021-11-05 16:04:53 +00:00
Zedifus
0bb3350e69 Update Dockerfile to fix build 
Switched edge repo as openjdk out of testing, added rust dep llvm11-libs
 2021-11-05 15:50:10 +00:00
luukas
76053b6a34 Change README to Alpha 3 2021-11-02 16:09:02 +02:00
luukas
dba72ea194 Improve startup banner 2021-11-02 16:08:27 +02:00
Andrew
a93860ebd8 Fixes bug in player counts 2021-10-20 22:31:36 -04:00
Andrew
4b7088d103 Fixes status page bug where servers always report being online 2021-10-18 17:43:14 -04:00
Andrew
87b6bd7758 Enhances language on login page 2021-10-18 17:27:19 -04:00
Andrew
b4707703af Fixes translation error on status page. 2021-10-18 17:26:03 -04:00
Andrew
fdf9b3fcb9 Fixes bug where all servers would be included in offline/online count even if the user did not have access to those servers. 2021-10-18 17:11:43 -04:00
Silversthorn
a35ffa9e2a Merge branch 'Roles-corrections' into 'dev' 
Fixing Roles

See merge request crafty-controller/crafty-commander!82
 2021-10-09 11:11:23 +00:00
Silversthorn
895e6106a7 Fixing utf-8 encodinf traduction files 2021-10-09 12:51:41 +02:00
Silversthorn
eee528f329 Fixing Allowed Server on Config Page 2021-10-09 11:30:21 +02:00
Silversthorn
74912a8648 Fixing Style Issues 2021-10-09 11:10:24 +02:00
Silversthorn
6984fe7abc Corrections on server creation 2021-10-09 10:59:54 +02:00
Silversthorn
2f36cdd249 Correction for crafty permissions 2021-10-09 10:45:40 +02:00
Silversthorn
a074cb7e1d Correction for roles on server creation 
Fix for superuser to be able to create a server
Don't create a role if the creator is a superuser
 2021-10-09 10:32:52 +02:00
Silversthorn
1e954db3c4 Correction Missing Permissions when 0 servers 2021-10-04 17:48:19 +02:00
Silversthorn
a0b673a2d7 Minor Corrections 2021-10-04 17:06:57 +02:00
luukas
13a5304edc Change version to Alpha 3 2021-09-30 22:34:43 +03:00
luukas
b9423f0233 Fix a couple of bugs on the add user/edit user pages 2021-09-30 22:32:33 +03:00
luukas
220f11bc09 Remove unnecessary lines from requirements.txt and make them get the latest patch version of the minor version 2021-09-30 22:18:14 +03:00
Andrew
1031c1b1f8 Merge branch 'language-update' into 'dev' 
Allows translation on start error messages.

See merge request crafty-controller/crafty-commander!81
 2021-09-30 01:58:42 +00:00
Andrew
606d0ac74b Allows translation on start error messages. 2021-09-29 21:53:14 -04:00
Andrew
3c876304fb Merge branch 'user-language' into 'dev' 
Added inital setup for user-based languages.

See merge request crafty-controller/crafty-commander!80
 2021-09-30 01:14:16 +00:00
Andrew
f16580aa43 Fixes bug where non-super users couldn't edit language/password 2021-09-29 20:06:16 -04:00
Andrew
fc4e8a00e1 Working out bugs in regular user language 2021-09-29 19:50:51 -04:00
Andrew
72a85d7e64 Adds user based languages 
changes server creation so that it adds it to roles instead of creating one
Changes server creation so you cannot create a server without a role.
 2021-09-29 19:32:21 -04:00
Andrew
d0f6e6b8a9 More changes to users lang 2021-09-29 18:05:07 -04:00
Andrew
0ee8418ba5 Merge branch 'db-lang' into 'user-language' 
Db lang

See merge request crafty-controller/crafty-commander!79
 2021-09-29 21:50:17 +00:00
Andrew
56deaa0bcb Initial back end support for user based languages 2021-09-29 17:46:54 -04:00
Silversthorn
e976593d83 Merge branch 'Role-Edit-Correction' into 'dev' 
Role Edition Fix

See merge request crafty-controller/crafty-commander!78
 2021-09-29 20:10:05 +00:00
Silversthorn
8574547d14 Correction Role Edit 2021-09-29 22:08:43 +02:00
Silversthorn
c6389f14b3 Add Support for MVC 
Merge branch 'dev-Silversthorn-MVC' into 'dev'
 2021-09-29 19:52:43 +00:00
Silversthorn
a180d80f5b Fixing Role Deletion 2021-09-29 21:46:11 +02:00
Silversthorn
5a0789faa5 Fixing role edit in case creating role before server 2021-09-29 21:40:56 +02:00
Silversthorn
f5ae4d02ff Correction Role deletion 2021-09-29 21:14:34 +02:00
Silversthorn
1015c4032e Correction Role when deleting Server 2021-09-29 20:57:04 +02:00
Silversthorn
481180289d Improving French Translation 2021-09-29 17:34:41 +02:00
Silversthorn
1f6f66972f Merge branch 'dev' into dev-Silversthorn-MVC 2021-09-29 17:24:18 +02:00
Andrew
acedb0ad8a Added inital setup for user-based languages. 
Waiting for DB changes to finish.
 2021-09-28 22:25:47 -04:00
Andrew
97c74a873f Fixes show/hide for popovers on dash and on config 2021-09-28 20:15:29 -04:00
Silversthorn
8f2338c709 Correction for Uploading Files 2021-09-28 23:48:54 +02:00