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
2,627 Commits 12 Branches 45 Tags 104 MiB
6215932311
Commit Graph

2627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
6688085292 Prepare 4.0.16 release base 2022-10-02 22:23:59 +01:00
Iain Powrie
ba8e9dc123 Merge branch 'dev' into 'master' 
v4.0.15

See merge request crafty-controller/crafty-4!474
 2022-10-02 20:46:56 +00:00
Iain Powrie
a8fc02b3fe Merge branch 'bug/websocket-clients' into 'dev' 
Fix set size changed during iteration

See merge request crafty-controller/crafty-4!473
 2022-10-02 20:32:07 +00:00
Zedifus
a6b22c0fb8 Update changelog !473 2022-10-02 21:29:48 +01:00
Zedifus
0ab8a2d80e Merge branch 'dev' into bug/websocket-clients 2022-10-02 21:16:31 +01:00
Iain Powrie
d63b0299f4 Merge branch 'feature/upload-import' into 'dev' 
Add upload import functionality.

See merge request crafty-controller/crafty-4!472
 2022-10-02 20:14:36 +00:00
Zedifus
cd0486fe11 Update changelog !472 2022-10-02 21:10:44 +01:00
Andrew
352a3e12e7 Fix minor bugs with uploads import 2022-10-02 15:54:13 -04:00
Andrew
5f8c0dab4c Merge branch 'dev' into 'feature/upload-import' 
# Conflicts:
#   app/frontend/templates/server/wizard.html
 2022-10-02 19:10:05 +00:00
Iain Powrie
f809833aec Merge branch 'enhancement/themes' into 'dev' 
Add Basic Themes to Crafty

See merge request crafty-controller/crafty-4!471
 2022-10-02 19:00:04 +00:00
Zedifus
ccfed613d7 Update changelog !471 2022-10-02 19:55:45 +01:00
Zedifus
7cc8503941 Merge branch 'dev' into enhancement/themes 2022-10-02 19:52:56 +01:00
Iain Powrie
7cd237d65b Merge branch 'bug/api-stdin' into 'dev' 
Fix bug with API stdin

See merge request crafty-controller/crafty-4!470
 2022-10-02 18:48:16 +00:00
Zedifus
91e065c59c Update changelog !470 2022-10-02 19:42:55 +01:00
Zedifus
f9a918e014 Merge branch 'dev' into bug/api-stdin 2022-10-02 19:40:13 +01:00
Iain Powrie
a2aa9ad58e Merge branch 'bug/schedule-type-error' into 'dev' 
Traceback on schedule creation

See merge request crafty-controller/crafty-4!469
 2022-10-02 18:37:48 +00:00
Andrew
cb064f95df Fix set size changed during iteration 2022-10-02 14:29:36 -04:00
Zedifus
2fc7bcbcde Update changelog !469 2022-10-02 19:27:22 +01:00
Andrew
dc218eb9d5 Remove java specific settings from bedrock upload 2022-09-28 18:23:12 -04:00
Andrew
a21bb36f7c Make it so a user cannot upload anything but zip 
TODO add better feedback than "error"
 2022-09-27 23:07:44 -04:00
Andrew
f090bf8c6f Add task to check for old files every 12 hours 2022-09-27 22:57:24 -04:00
Andrew
ab344cbff4 Add zip upload to bedrock servers 2022-09-27 22:49:52 -04:00
Andrew
b9bd654e58 Add upload import functionality. 
Update gitignore
 2022-09-27 22:06:22 -04:00
Andrew
31a8366186 Fix tooltip colors 2022-09-26 21:41:22 -04:00
Andrew
3d82b61007 Add comments to CSS file. 
Update ronald theme
 2022-09-26 21:34:54 -04:00
Andrew
8e1534e268 Add arguments to API routes 2022-09-26 21:31:44 -04:00
Andrew
3eb87209de Fix color issues with dropdown 2022-09-26 21:24:00 -04:00
Andrew
a5a81aa22a Add themes to users page/base 2022-09-26 21:23:47 -04:00
Andrew
05f08773a3 Add themes to users DB 2022-09-26 21:23:16 -04:00
Andrew
0cba81788e Add translation 2022-09-26 21:22:56 -04:00
Andrew
95188a053d Fix navigation colors 2022-09-25 22:36:17 -04:00
Andrew
c7a292a662 Fix notification color 2022-09-25 22:23:37 -04:00
Andrew
baa441d427 Add light. Fix login 2022-09-25 22:18:36 -04:00
Andrew
ca91debea1 Set base.html origin back to default 2022-09-25 17:52:24 -04:00
Andrew
e6121b06a6 Add dark mode. Refactor code to accept themes 2022-09-25 17:52:01 -04:00
Andrew
d7de340807 Initial commit for themes/black 2022-09-25 12:45:22 -04:00
Andrew
046943c250 Fix bug with API stdin 2022-09-25 12:14:01 -04:00
Andrew
eaa68751b2 Fix type error on interval check. 2022-09-25 11:17:44 -04:00
Zedifus
8cada1c450 Prepare 4.0.15 release base 2022-09-23 03:36:15 +01:00
Iain Powrie
47a06d2706 Merge branch 'dev' into 'master' 
v4.0.14

See merge request crafty-controller/crafty-4!468
 2022-09-23 02:26:32 +00:00
Iain Powrie
372d8fff37 Merge branch 'bug/websocket-set-subscription' into 'dev' 
self.clients was already a set. cannot subscript

See merge request crafty-controller/crafty-4!467
 2022-09-23 02:20:01 +00:00
Zedifus
9582eca869 Update changelog !467 2022-09-23 03:18:24 +01:00
Andrew
e2c846205b self.clients was already a set. cannot subscript 2022-09-22 21:42:58 -04:00
Zedifus
ff78e711d0 Prepare 4.0.14 release base 2022-09-20 23:50:07 +01:00
Iain Powrie
8dbda09f06 Merge branch 'dev' into 'master' 
v4.0.13

See merge request crafty-controller/crafty-4!464
 2022-09-20 22:41:15 +00:00
Zedifus
68561515f3 Correct release date 2022-09-20 23:24:00 +01:00
Zedifus
3209f69d14 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-20 23:22:00 +01:00
Zedifus
03a54d0249 Override 'unsubscriptable-object' pylint rule 
False positive from 'self' use
 2022-09-20 23:21:57 +01:00
Iain Powrie
251e676fec Merge branch 'bug/dev-schedules-users' into 'dev' 
Fix cron edit traceback.

See merge request crafty-controller/crafty-4!466
 2022-09-20 22:13:08 +00:00
Zedifus
ef87920114 Update changelog !465 !466 2022-09-20 23:10:39 +01:00