Silversthorn
d7e0716ccb
Merge branch 'dev' into dev-BetterDisplayMobile
2022-03-24 20:55:35 +01:00
Iain Powrie
ff1d94505b
Merge branch 'devops/black' into 'dev'
...
🏴 Black Formatting
See merge request crafty-controller/crafty-commander!223
2022-03-24 18:52:52 +00:00
Silversthorn
3797d5430f
Merge branch 'dev' into dev-BetterDisplayMobile
2022-03-23 19:33:43 +01:00
Silversthorn
089e464d82
Adding *.stats files
2022-03-23 15:17:11 +01:00
Iain Powrie
e9ad7696a5
Add logo svg to Repo
...
Waiting for review, it's pretty :)
2022-03-23 12:29:46 +00:00
Iain Powrie
cd87aa6a04
Preemptively at badges
...
Hardcoded badges will be replaced with generated ones
when the repository is public
2022-03-23 11:11:59 +00:00
Zedifus
237e43fa75
Update readme to add ⬛ Black Badge
2022-03-23 06:25:44 +00:00
Zedifus
09bba7fdb0
Further fix files to conform with ⚫ Black pylintrc
...
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
2022-03-23 06:16:22 +00:00
Zedifus
2a512d7273
Fix files to conform with new ⚫ Black pylintrc
...
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
2022-03-23 06:06:13 +00:00
Zedifus
9b2161d450
Add pylint compatability for black
...
Marking exemptions and pulling back to new line length
(It's gonna hate comments, will fix in a sec)
2022-03-23 02:51:37 +00:00
Zedifus
e06fe8a52a
⬛ Black codebase
...
Apply black formatting to codebase
2022-03-23 02:50:12 +00:00
Zedifus
9d8ed37341
Last lint correction on gitlab-ci file
2022-03-23 02:48:55 +00:00
Zedifus
69b547a553
Furthor minor yml corrections
2022-03-23 02:41:19 +00:00
Zedifus
932d81fe81
Correct yml for compose file and example for lint
2022-03-23 02:37:52 +00:00
Zedifus
6664ff276b
Lint corrections to gitlab-ci yml
2022-03-23 02:32:41 +00:00
Zedifus
f5ace96fe6
Add missing runner tags and triggers for ymllint
2022-03-23 02:12:18 +00:00
Zedifus
fc0adcd3cb
Add extra yaml lint
...
yamllint does not only check for syntax validity,
but for weirdnesses like key repetition and cosmetic problems
such as lines length, trailing spaces, indentation, etc.
2022-03-23 02:05:02 +00:00
Zedifus
416543d33e
Add extra linting to validate json files
2022-03-23 02:01:41 +00:00
Zedifus
dfd3220482
Add black cicd testing
2022-03-23 01:57:46 +00:00
Zedifus
698594087c
Amend editor config for black
...
Also restructure, separate js and move to tabs
Add md spec
2022-03-23 01:53:43 +00:00
Iain Powrie
5f2bd0a378
Merge branch 'bug/iOS-context' into 'dev'
...
Add context menu for iOS + Bug fix
See merge request crafty-controller/crafty-commander!222
2022-03-22 14:24:16 +00:00
Andrew
ecc87a6137
Add context menu for iOS + Bug fix
2022-03-22 14:24:15 +00:00
Iain Powrie
f56b86308c
Merge branch '3.0-import' into 'dev'
...
Add ability to import config from 3.x
See merge request crafty-controller/crafty-commander!216
2022-03-22 11:27:06 +00:00
Iain Powrie
85d6f102e5
Merge branch 'darthleo-disable-mobile-sorting' into 'dev'
...
Disable server sorting on mobile
See merge request crafty-controller/crafty-commander!220
2022-03-22 01:57:57 +00:00
xithical
4177ca882c
Put encoding arg in its proper location for maximum linter appeasal
2022-03-20 12:19:11 -05:00
xithical
1279784cc7
Appease the linter again
2022-03-20 12:14:51 -05:00
xithical
bf6d0d0368
Appease the linter
2022-03-20 12:01:14 -05:00
Andrew
5c04e1e748
Merge branch 'bug/remove-pesky-print' into 'dev'
...
Remove print statement everytime a page loads
See merge request crafty-controller/crafty-commander!219
2022-03-20 16:47:06 +00:00
Andrew
5682455bcc
Appease the linter
2022-03-20 12:39:57 -04:00
Silversthorn
0933c5750d
Trying to do table dropdown for Dashboard page
2022-03-20 14:41:27 +01:00
Randy Carranza
6d6699638a
Resolves an issue on mobile where the table cant be scrolled to the side
2022-03-20 08:03:56 -04:00
Andrew
d311ccbfa1
Remove print statement everytime a page loads
2022-03-20 07:05:11 -04:00
Randy Carranza
c303a866b6
Added code to disabled sorting when the user is a mobile user
2022-03-20 06:04:06 -04:00
Iain Powrie
d234f51bab
Merge branch 'devops/tester-compatibility-speed' into 'dev'
...
Remove dind from tests and retag runners
See merge request crafty-controller/crafty-commander!218
2022-03-19 20:00:11 +00:00
Zedifus
ccf8d8d148
Remove dind from tests and retag
...
This should make tests faster as dind not required,
retagging tests to docker so if someone forks, tests should still run
on shared runners.
2022-03-19 16:43:05 +00:00
Iain Powrie
534a277abc
Merge branch 'tweak/remove-dep-duplication' into 'dev'
...
Tweak/remove dep duplication
See merge request crafty-controller/crafty-commander!217
2022-03-19 16:27:40 +00:00
Zedifus
5cefbab5ec
Sort requirements.txt alphabetically
2022-03-19 16:23:31 +00:00
Zedifus
36934d981c
Remove dupe crypto
2022-03-19 16:20:04 +00:00
xithical
cda7b59a12
Fix how memory args are passed in importing from 3
2022-03-18 23:06:04 -05:00
_iEpic
4af62cbaca
Added basic Import functions
2022-03-18 23:59:10 -04:00
xithical
4c14b58a2a
Add user importing from 3 - servers to be added
2022-03-18 21:55:39 -05:00
Andrew
778effab98
Merge branch 'bug/kill-server' into 'dev'
...
Fix server not being cleaned up when killed.
See merge request crafty-controller/crafty-commander!215
2022-03-19 01:55:22 +00:00
Andrew
2efcacceb5
Fix server not being cleaned up when killed.
2022-03-18 21:50:09 -04:00
Andrew
20ea3c402d
Merge branch 'darthleo-jqueryui-integration' into 'dev'
...
Better dashboard re-ordering
See merge request crafty-controller/crafty-commander!214
2022-03-19 01:48:24 +00:00
Iain Powrie
f280da8c52
Better dashboard re-ordering
2022-03-19 01:48:24 +00:00
xithical
7c822b715a
Add functions for importing 3.x users, require passwords when adding users
2022-03-18 20:46:56 -05:00
Iain Powrie
ccd0bc8e8f
Merge branch 'dev-BetterCertsGeneration' into 'dev'
...
Adding Subject Alt Names in certificate
See merge request crafty-controller/crafty-commander!209
2022-03-16 09:49:17 +00:00
Zedifus
a6e99347af
Format the cert gen helper
...
Use black to format this function and appease lint.
We should really use black on the full project
2022-03-15 18:47:49 +00:00
Silversthorn
83c692beb5
pylint happy !!
2022-03-15 19:17:20 +01:00
Silversthorn
2f89c3a93d
It was a comma !!!
2022-03-15 18:12:56 +00:00
