Commit Graph

1359 Commits

Author SHA1 Message Date
Andrew
f00830aeb5 Merge branch 'bug/general-user-gravatar' into 'dev'
Bug/general user gravatar

See merge request crafty-controller/crafty-commander!232
2022-04-02 01:11:01 +00:00
Andrew
8e704b61ca Fix naming on super user variables 2022-04-01 18:09:55 -04:00
Andrew
1242b318c8 Fix bug - general user could not add gravatar 2022-04-01 18:04:42 -04:00
Iain Powrie
af0e6252a3 Merge branch 'bug/gravatar-stack' into 'dev'
Bug/gravatar stack

See merge request crafty-controller/crafty-commander!231
2022-03-31 08:28:44 +00:00
Iain Powrie
f253f33f87 Merge branch 'feature/apache2-default-wss' into 'dev'
Feature/apache2 default wss

See merge request crafty-controller/crafty-commander!230
2022-03-31 08:24:16 +00:00
amcmanu3
d15bae8df7 Add credit for Zedifus 2022-03-30 14:56:50 -04:00
Andrew
f78d59fd34 Server jars/gravatar would stack with no internet 2022-03-27 18:09:49 -04:00
Andrew
cf42ff72eb Add apache requirement notes 2022-03-27 17:30:01 -04:00
Andrew
0f78c4b2a3 Add apache2.conf.example for rev proxy 2022-03-27 17:27:03 -04:00
Andrew
c93824de7c Add quotes to fix formatting 2022-03-27 17:26:48 -04:00
Andrew
dc72ac5c3e Merge branch 'bug/CPU-Usage' into 'dev'
Add sleep to realtime - Reduce CPU load.

See merge request crafty-controller/crafty-commander!228
2022-03-26 23:48:18 +00:00
Andrew
822a3707b2 Add sleep to realtime - Reduce CPU load. 2022-03-26 19:10:04 -04:00
Iain Powrie
8f95b0a96a Merge branch 'tweak/add-default-env-to-ignore' into 'dev'
Add default.env to .gitignore

See merge request crafty-controller/crafty-commander!227
2022-03-26 21:37:04 +00:00
Iain Powrie
03b6c246e6 Add default.env to .gitignore 2022-03-26 21:33:19 +00:00
Iain Powrie
dfe7b05415 Badge Update
Fix supported versions, link correctly to python home
2022-03-26 16:46:54 +00:00
Iain Powrie
391e23a328 Merge branch 'devops/tweak/dockerfile-label-ordering' into 'dev'
Move our oci labelling of the image to the end

See merge request crafty-controller/crafty-commander!226
2022-03-24 22:50:25 +00:00
Zedifus
ca78e79076 Move our labeling of the image to the end
This is so we don't recache all the layers on a version number change
That would be silly😅
2022-03-24 22:47:04 +00:00
Iain Powrie
553ec0900d Merge branch 'devops/fix-oci-version-annotation' into 'dev'
Strip string doublequotes from meta jq output

See merge request crafty-controller/crafty-commander!225
2022-03-24 22:16:28 +00:00
Zedifus
0f41e1ae25 Strip string doublequotes from meta jq output 2022-03-24 22:07:50 +00:00
Iain Powrie
cd0a6c0e88 Merge branch 'devops/minute-improvements-and-meta-tags' into 'dev'
Further fine tuning to better miniutes and add meta tags.

See merge request crafty-controller/crafty-commander!224
2022-03-24 21:49:28 +00:00
Zedifus
a548f49759 Add OCI Annotation Keys 2022-03-24 21:45:00 +00:00
Zedifus
e259d5c3d7 Replace pylint build step with prebuild
Kudos to Robbert Müller https://gitlab.com/mjrider
For implimenting my request to include the gitlab plugin for pylint
This means we don't have to waste time installing anything
2022-03-24 19:34:11 +00:00
Zedifus
1404da082c Remove lint badge generation until public release 2022-03-24 19:28:37 +00: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
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
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