NussNougate/crafty-4
2
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-01-20 10:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,688 Commits 17 Branches 48 Tags
Commit Graph

2688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
fb26b4eeaf Merge branch 'dev' into bug/dynamic-files-upload 2023-02-11 18:49:34 +00:00
Iain Powrie
a71c833038 Merge branch 'tweak/sidebar-server-limit' into 'dev' 
Truncate sidebar servers to a max of 10

See merge request crafty-controller/crafty-4!552
 2023-02-11 18:30:49 +00:00
Zedifus
7317b31e38 Update changelog !552 2023-02-11 18:27:07 +00:00
Zedifus
11af841d2b Merge branch 'dev' into tweak/sidebar-server-limit 2023-02-11 18:25:14 +00:00
Iain Powrie
70563f3554 Merge branch 'feature/upload-progress' into 'dev' 
Upload progress bar improvements

See merge request crafty-controller/crafty-4!546
 2023-02-11 18:19:19 +00:00
Zedifus
c92368c6c3 Update changelog !546 2023-02-11 18:14:25 +00:00
Zedifus
5b383d9fa9 Merge branch 'dev' into feature/upload-progress 2023-02-11 18:10:32 +00:00
Iain Powrie
65a1459451 Merge branch 'refactor/cleanup-authentication-helpers' into 'dev' 
Cleanup authentication helpers

See merge request crafty-controller/crafty-4!545
 2023-02-11 18:08:09 +00:00
Zedifus
1e8f70ae17 Update changelog !545 2023-02-11 18:04:05 +00:00
Zedifus
454f73c63e Merge branch 'dev' into refactor/cleanup-authentication-helpers 2023-02-11 18:03:08 +00:00
Iain Powrie
77d3421778 Merge branch 'bugfix/404-startup' into 'dev' 
Fix exception related to page data on server start

See merge request crafty-controller/crafty-4!544
 2023-02-11 18:00:56 +00:00
Zedifus
3e3d9b6872 Update changelog !544 2023-02-11 17:48:08 +00:00
Zedifus
c8ea77c81a Merge branch 'dev' into bugfix/404-startup 2023-02-11 17:45:02 +00:00
Iain Powrie
2dd75606b2 Merge branch 'translation/backups' into 'dev' 
Translate additions to backups page

See merge request crafty-controller/crafty-4!543
 2023-02-11 17:42:22 +00:00
Zedifus
4ad96d0970 Update changelog !543 2023-02-11 17:37:56 +00:00
amcmanu3
3714d2393d Fix logical issue with uploading dynamic files 2023-02-10 16:07:59 -05:00
amcmanu3
dd69ad066c Trunkate sidebar servers to a max of 10 2023-02-10 13:35:22 -05:00
amcmanu3
c22a073f2f Add space after gear 2023-02-01 17:34:07 -05:00
amcmanu3
42b564de1c Fix error codes 2023-02-01 17:16:08 -05:00
amcmanu3
bb482b8381 Use response text for errors on uploads. 
Overhaul
 2023-02-01 17:09:39 -05:00
amcmanu3
20ce8996d7 Add better upload feedback for users 2023-02-01 15:43:17 -05:00
amcmanu3
238b8da4d9 Add upload progress bar for file uploads 2023-02-01 15:31:43 -05:00
amcmanu3
5bccfab7b6 add ignored names in conditional 2023-01-31 13:53:27 -05:00
amcmanu3
750e4f40c0 Remove "my secret" from authentication 2023-01-31 13:30:41 -05:00
amcmanu3
6e0805a8a1 Lol uncomment the fix 2023-01-31 13:14:01 -05:00
amcmanu3
ed30cbd4cb Refactor public handler keys 2023-01-31 13:11:28 -05:00
amcmanu3
683c9cecba Add background key to server_handler page_data 2023-01-31 13:11:03 -05:00
amcmanu3
819e84ec4c Translate additions to backups page 2023-01-30 23:27:40 -05:00
Zedifus
3eeb00e524 Prepare 4.0.21 release base 2023-01-30 00:24:35 +00:00
Zedifus
157160724e Close v4.0.20 changelog 2023-01-29 23:49:59 +00:00
Iain Powrie
3495c6c29a Merge branch 'enhancement/auto_log-dash' into 'dev' 
Add Default redirection to Dashboard to prevent login if the user is connected

See merge request crafty-controller/crafty-4!540
 2023-01-29 23:44:12 +00:00
Zedifus
d66521c6a4 Update changelog !540 2023-01-29 23:40:05 +00:00
Zedifus
5699aa40e8 Merge branch 'dev' into enhancement/auto_log-dash 2023-01-29 23:35:34 +00:00
Iain Powrie
4300cab1b9 Merge branch 'refactor/config-json' into 'dev' 
Managed config.json refactor

See merge request crafty-controller/crafty-4!485
 2023-01-29 23:33:55 +00:00
Zedifus
c817d0dbb6 Update changelog !485 2023-01-29 23:29:36 +00:00
amcmanu3
c8b8468030 Move resets before controller is instanciated. 2023-01-29 18:21:53 -05:00
amcmanu3
3f3595acb4 Sort config.json in alphabetical order 2023-01-29 18:21:04 -05:00
amcmanu3
8707a1470c Fix naming 2023-01-29 17:58:47 -05:00
amcmanu3
e04fee0ea1 Fix key reset 2023-01-29 17:58:24 -05:00
amcmanu3
af654bc89f Make the color look nicer 2023-01-29 17:25:44 -05:00
amcmanu3
d24c3c5ba0 Add red color to reset values 2023-01-29 17:05:17 -05:00
amcmanu3
bd8e12f884 Fix wording in reset 2023-01-29 17:00:28 -05:00
amcmanu3
2d9529ba0c Add cookie secret to DB 
Allow users to reset cookie and api secret
Add Crafty row to table on fresh install
Change inserts to updates for crafty settings table.
 2023-01-29 16:54:02 -05:00
Iain Powrie
c993e0d341 Merge branch 'bugfix/file-tree-reload' into 'dev' 
Make it so file tree doesn't reload on upload/delete

See merge request crafty-controller/crafty-4!541
 2023-01-29 20:41:25 +00:00
Zedifus
f60d6424d9 Update changelog !541 2023-01-29 20:37:03 +00:00
amcmanu3
02273580f6 Appease the linter AGAIN 2023-01-29 15:20:27 -05:00
amcmanu3
5ab224d17e Appease the linter 2023-01-29 15:18:10 -05:00
amcmanu3
040536f320 Merge branch 'dev' into bugfix/file-tree-reload 2023-01-29 15:13:02 -05:00
Zedifus
aa2ba4f8cf Merge branch 'dev' into refactor/config-json 2023-01-29 20:00:09 +00:00
Zedifus
68322a3a93 Remove config warning from container init 2023-01-29 19:58:08 +00:00