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
838 Commits 12 Branches 45 Tags 104 MiB
b8e9efad76
Commit Graph

838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew
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
Andrew
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
Andrew
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
Andrew
833cc55c5d Fixes upload indicator 
Fixes max-body-size
 2021-08-23 17:52:55 -04:00
Andrew
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
Andrew
3fbf4e6252 Fixes upload indicator 
Fixes max-body size
 2021-08-23 17:40:14 -04:00
Andrew
16c017716f Fixes upload indicator. 
Fixes max-body-size
 2021-08-23 17:37:09 -04:00
Silversthorn
6a29f1063b Fixing Migrations Issues 2021-08-23 21:41:27 +02:00
Silversthorn
e776afc6d2 Fixing Bandaid Workaroud for Permissions Migration 2021-08-22 23:00:46 +00:00
Andrew
910a789ad4 Puts even bigger bandaid on migrations. This needs to have a permanent fix eventually. 2021-08-22 18:05:04 -04:00
Andrew
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
Andrew
d83fd73755 Fix models error when trying to edit admin username 2021-08-22 17:42:12 -04:00
Andrew
000c764ca3 Fix bandaid on migrations...let's call it a cast 2021-08-22 17:40:28 -04:00
Andrew
6022e3814f Fixed typo in uploads 2021-08-22 17:37:37 -04:00
Andrew
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
Andrew
24aec429cc Bandaid db error on migrations by comment. 
Fix error in models where value was undefined
 2021-08-22 17:29:52 -04:00
Andrew
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
Andrew
192a5f2664 Modify handler to adapat to changes made in models. 2021-08-22 16:59:33 -04:00
Andrew
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
Andrew
68202cfa7b Removed uploads from Ajax handler 2021-08-22 16:34:22 -04:00
Andrew
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
Silversthorn
8eef9e094d Fixing UI after deletion of User_Servers 2021-08-22 22:18:39 +02:00
Silversthorn
1acb7827ae Reworking Functions After User_Servers Deletion 2021-08-22 18:50:30 +02:00
Andrew
734a576cb9 Still broken 2021-08-22 10:54:34 -04:00
Andrew
4ff0392292 Still broken 2021-08-22 10:42:06 -04:00
Andrew
7389b37198 Initial commit on this broken branch 2021-08-22 10:17:33 -04:00
Silversthorn
0b29bdf855 Deletion on User_Servers table 2021-08-22 12:21:59 +02:00
Silversthorn
88042998d9 Merge branch 'dev' into dev-Silversthorn 2021-08-22 12:14:31 +02:00
Silversthorn
c668b74ed8 Update DBCHANGES.md 
Corrections and Improvement for Create table exemple
 2021-08-22 10:00:39 +00:00
Silversthorn
331f3e7b12 Adding Crafty Permissions 2021-08-22 11:57:02 +02:00
Silversthorn
540cdf6149 Fixing Roles Permissions for Server Creation 2021-08-22 11:06:44 +02:00
Andrew
73d8be2d57 Still cleaning up my mess...sorry 2021-08-21 23:56:02 -04:00
Andrew
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
Andrew
0d11b80181 Merge branch 'dev' into 'dewfix' 
# Conflicts:
#   app/classes/shared/models.py
 2021-08-22 03:38:39 +00:00
Andrew
7f1f667212 This should fix everything 2021-08-21 23:36:48 -04:00
Andrew
a57a66901c Revert "Merge branch 'revert-ecb2cfbe' into 'dev'" 
This reverts merge request !49
 2021-08-22 03:34:05 +00:00
Andrew
61c242bafb Merge branch 'revert-cbd5d29f' into 'dev' 
Revert "Fixed error with modelselect"

See merge request crafty-controller/crafty-commander!50
 2021-08-22 03:30:54 +00:00
Andrew
773ace55ad Revert "Fixed error with modelselect" 
This reverts commit cbd5d29fe9
 2021-08-22 03:30:43 +00:00
Andrew
4d09ee1f5b Merge branch 'revert-ecb2cfbe' into 'dev' 
Revert "Fixed bug where servers would not get added to roles on creation"

See merge request crafty-controller/crafty-commander!49
 2021-08-22 03:27:51 +00:00
Andrew
f472b377d2 Revert "Fixed bug where servers would not get added to roles on creation" 
This reverts commit ecb2cfbe01
 2021-08-22 03:27:12 +00:00
Andrew
cbd5d29fe9 Fixed error with modelselect 2021-08-21 23:21:06 -04:00
Andrew
8de3b3b3cd Removed User_Servers table. 2021-08-21 23:17:54 -04:00
Andrew
ecb2cfbe01 Fixed bug where servers would not get added to roles on creation 2021-08-21 22:47:43 -04:00
Andrew
c86c5040ea Fixed bug where new servers would not be added to current role 2021-08-21 22:43:16 -04:00
Andrew
2851493589 Removed servers from user_role_permissions query. Not needed and caused query to result in none very time 2021-08-21 22:02:27 -04:00
Andrew
032da16a7b Somehow the delete function was broken. Fixed it 2021-08-21 20:20:33 -04:00
Silversthorn
2df9810ab4 Merge branch 'dev' into dev-Silversthorn 2021-08-22 01:42:43 +02:00
Silversthorn
f1fc2f7d49 Add update for French language 2021-08-22 01:41:55 +02:00
Silversthorn
1262d6708b Improve UI and Permissions on Dashboard 2021-08-22 01:41:25 +02:00
Andrew
2ea4ff1214 Now I actually removed the scroll bars...I think 2021-08-21 18:52:46 -04:00