Commit Graph

2503 Commits

Author SHA1 Message Date
7c5674b4bd Merge branch 'download' into 'dev'
Adds download options for files in file tree. This does not add ability to download directories.

See merge request crafty-controller/crafty-commander!62
2021-08-25 01:34:52 +00:00
b77aab954d Adds download options for files in file tree. This does not add ability to download directories. 2021-08-24 21:33:29 -04:00
08bb5db005 Delete chat.txt 2021-08-25 00:39:27 +00:00
aea023b893 Fixes error thrown when calling add_user page 2021-08-24 19:25:35 -04:00
af7e31a744 Fixes issue with error thrown when click save in edit_user 2021-08-24 19:19:33 -04:00
754da44b5b Merge branch 'http_redirect' into 'dev'
Adds support for http redirects to https

See merge request crafty-controller/crafty-commander!61
2021-08-24 22:33:27 +00:00
397fbd5268 Adding Support For Server Creation Quantity Limit 2021-08-25 00:23:33 +02:00
bb1f43bc81 Adding Support for Crafty Permissions with limits 2021-08-24 23:07:00 +02:00
25a0cf3d1e Improving French Translation 2021-08-24 18:23:45 +02:00
d8f090b34d Makes redirect code way more efficient. 2021-08-23 22:54:52 -04:00
42bdc055aa Adds some http redirect support. User is redirected to https login screen on attempted connection. 2021-08-23 22:25:19 -04:00
bd27e619b4 Merge branch 'dew-translation' into 'dev'
Added translations for files page (uploads/zips)

See merge request crafty-controller/crafty-commander!60
2021-08-24 00:29:38 +00:00
d767dd066c Added translations for files page (uploads/zips) 2021-08-23 20:24:40 -04:00
cf331a8bc3 Merge branch 'dev' into dev-Silversthorn 2021-08-24 00:25:07 +02:00
261c8665c8 Pretty Server Version Choice 2021-08-24 00:24:40 +02:00
cc358b63cb Merge branch 'upload-improvement' into 'dev'
Fixes wait window closing after first upload is complete and not waiting for...

See merge request crafty-controller/crafty-commander!59
2021-08-23 22:24:09 +00:00
ce4a7619a6 Fixes wait window closing after first upload is complete and not waiting for all uploads to complete. 2021-08-23 18:22:35 -04:00
e9f5eae28b Merge branch 'uploads' into 'dev'
Fixes upload indicator

See merge request crafty-controller/crafty-commander!58
2021-08-23 21:55:25 +00:00
833cc55c5d Fixes upload indicator
Fixes max-body-size
2021-08-23 17:52:55 -04:00
b686bf98b2 Merge branch 'upload-fixed' into 'dev'
Fixes upload indicator.

See merge request crafty-controller/crafty-commander!57
2021-08-23 21:43:27 +00:00
3fbf4e6252 Fixes upload indicator
Fixes max-body size
2021-08-23 17:40:14 -04:00
16c017716f Fixes upload indicator.
Fixes max-body-size
2021-08-23 17:37:09 -04:00
6a29f1063b Fixing Migrations Issues 2021-08-23 21:41:27 +02:00
e776afc6d2 Fixing Bandaid Workaroud for Permissions Migration 2021-08-22 23:00:46 +00:00
910a789ad4 Puts even bigger bandaid on migrations. This needs to have a permanent fix eventually. 2021-08-22 18:05:04 -04:00
6fd09de810 Merge branch 'migrations-bandaid' into 'dev'
Migrations bandaid

See merge request crafty-controller/crafty-commander!56

iSilverFyre approves
2021-08-22 21:43:42 +00:00
d83fd73755 Fix models error when trying to edit admin username 2021-08-22 17:42:12 -04:00
000c764ca3 Fix bandaid on migrations...let's call it a cast 2021-08-22 17:40:28 -04:00
6022e3814f Fixed typo in uploads 2021-08-22 17:37:37 -04:00
c0a7a49479 Merge branch 'dew-fix' into 'dev'
Bandaid db error on migrations by comment.

See merge request crafty-controller/crafty-commander!55
2021-08-22 21:32:26 +00:00
24aec429cc Bandaid db error on migrations by comment.
Fix error in models where value was undefined
2021-08-22 17:29:52 -04:00
a688e55ca6 Merge branch 'dew-fix' into 'dev'
Modify handler to adapt to changes made in models.

See merge request crafty-controller/crafty-commander!54
2021-08-22 21:07:26 +00:00
192a5f2664 Modify handler to adapat to changes made in models. 2021-08-22 16:59:33 -04:00
b24fd93487 Merge branch 'broken-uploads' into 'dev'
Fixed upload streams

See merge request crafty-controller/crafty-commander!53
2021-08-22 20:37:02 +00:00
68202cfa7b Removed uploads from Ajax handler 2021-08-22 16:34:22 -04:00
86c1b374bf Fixed upload streams
Lukas added a lot of pretty things to the upload waiting screen.
Current bug: progress bar is not 100% working.
2021-08-22 16:31:49 -04:00
8eef9e094d Fixing UI after deletion of User_Servers 2021-08-22 22:18:39 +02:00
1acb7827ae Reworking Functions After User_Servers Deletion 2021-08-22 18:50:30 +02:00
734a576cb9 Still broken 2021-08-22 10:54:34 -04:00
4ff0392292 Still broken 2021-08-22 10:42:06 -04:00
7389b37198 Initial commit on this broken branch 2021-08-22 10:17:33 -04:00
0b29bdf855 Deletion on User_Servers table 2021-08-22 12:21:59 +02:00
88042998d9 Merge branch 'dev' into dev-Silversthorn 2021-08-22 12:14:31 +02:00
c668b74ed8 Update DBCHANGES.md
Corrections and Improvement for Create table exemple
2021-08-22 10:00:39 +00:00
331f3e7b12 Adding Crafty Permissions 2021-08-22 11:57:02 +02:00
540cdf6149 Fixing Roles Permissions for Server Creation 2021-08-22 11:06:44 +02:00
73d8be2d57 Still cleaning up my mess...sorry 2021-08-21 23:56:02 -04:00
890b487d52 Merge branch 'dewfix' into 'dev'
Fixing dev after I broke it

See merge request crafty-controller/crafty-commander!52
2021-08-22 03:39:04 +00:00
0d11b80181 Merge branch 'dev' into 'dewfix'
# Conflicts:
#   app/classes/shared/models.py
2021-08-22 03:38:39 +00:00
7f1f667212 This should fix everything 2021-08-21 23:36:48 -04:00