Commit Graph

1183 Commits

Author SHA1 Message Date
Jörg Thalheim
94bc308bb0 switch back to main 2023-11-08 10:17:00 +01:00
clan-bot
52843315b5 Merge pull request 'api/machines: better input/output validation' (#472) from DavHau-dave into main 2023-11-06 10:59:14 +00:00
DavHau
6e281dd7c3 api/machines: better input/output validation
Also move contents tof 'config' to the top-level
2023-11-06 17:56:27 +07:00
clan-bot
36589fae8f Merge pull request 'clan-cli secrets: flake_name -> flake_dir' (#450) from flakes into main 2023-11-05 16:27:13 +00:00
lassulus
efafe6f0e3 clan-cli secrets: flake_name -> flake_dir 2023-11-05 16:58:48 +01:00
ui-asset-bot
fd6b5a57bd update ui-assets.nix 2023-11-04 14:13:47 +00:00
clan-bot
db7aa564a7 Merge pull request 'add error handling' (#467) from feat/configure-modules into main 2023-11-04 14:12:27 +00:00
Johannes Kirschbauer
37533aa00d add error handling
prevent the user to go into next step if schema cannot be retrieved
2023-11-04 15:10:37 +01:00
ui-asset-bot
61d8bd8c0b update ui-assets.nix 2023-11-04 13:58:39 +00:00
clan-bot
ab483d409b Merge pull request 'style & explanation text' (#466) from feat/configure-modules into main 2023-11-04 13:57:20 +00:00
Johannes Kirschbauer
46cd25cc0d style & explanation text 2023-11-04 14:55:32 +01:00
ui-asset-bot
096a14fb41 update ui-assets.nix 2023-11-04 13:05:01 +00:00
clan-bot
0301417087 Merge pull request 'select modules' (#465) from feat/configure-modules into main 2023-11-04 13:04:27 +00:00
Johannes Kirschbauer
93f0f2141a format stuff 2023-11-04 14:02:32 +01:00
Johannes Kirschbauer
b8c5419dba select modules.Prefetched schema depends only on modules 2023-11-04 13:53:30 +01:00
ui-asset-bot
48fb4f7550 update ui-assets.nix 2023-11-04 08:58:19 +00:00
clan-bot
a24229aa67 Merge pull request 'add create/join switch' (#447) from feat/create-flake into main 2023-11-04 08:57:42 +00:00
Johannes Kirschbauer
aed41a8fbf fix changed api imports 2023-11-04 09:55:53 +01:00
Johannes Kirschbauer
376aee57e9 disable lint rule 2023-11-04 09:46:14 +01:00
Johannes Kirschbauer
1ff5595dbc format 2023-11-04 09:16:37 +01:00
Johannes Kirschbauer
3696ecbae5 merge main 2023-11-04 09:15:15 +01:00
ui-asset-bot
cb385b2e3c update ui-assets.nix 2023-11-03 21:45:18 +00:00
clan-bot
b333d87fab Merge pull request 'contributing.md: Fixed missing direnv install step' (#457) from Qubasa-main into main 2023-11-03 21:44:44 +00:00
Qubasa
0c87485575 Fixed UI incorrectly not deleting api folder. Fixing new import paths for UI 2023-11-03 22:43:03 +01:00
Qubasa
b48cd4e9ae nix fmt 2023-11-03 22:22:16 +01:00
Qubasa
bdd656cb94 Fixing failing test 2023-11-03 22:21:22 +01:00
Qubasa
a00056824d API: Added /api/flake/list. Added API grouping and description for better visibility 2023-11-03 22:05:33 +01:00
Qubasa
6d074ad7dd contributing.md: Fixed missing direnv install step 2023-11-03 20:33:27 +01:00
clan-bot
bf1d8c4c36 Merge pull request 'deltachat: allow other ports to access smtp port' (#455) from Mic92-maddy into main 2023-11-03 14:47:38 +00:00
Jörg Thalheim
7e144f5f85 deltachat: allow other ports to access smtp port 2023-11-03 15:45:29 +01:00
clan-bot
513408ddd2 Merge pull request 'flake.lock: Update' (#454) from Mic92-maddy into main 2023-11-03 14:26:41 +00:00
Jörg Thalheim
c801c7e5d4 flake.lock: Update
Flake lock file updates:

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/c59da7ac29f041954c0864bc7bbb2c66ee18eba5' (2023-11-03)
  → 'github:Mic92/sops-nix/275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f' (2023-11-03)
2023-11-03 15:24:51 +01:00
clan-bot
9dc19130d6 Merge pull request 'flake.lock: Update' (#452) from Mic92-maddy into main 2023-11-03 13:52:50 +00:00
clan-bot
34c86f5900 Merge pull request 'cli: merge nix options correctly; ruff format' (#451) from maddy into main 2023-11-03 13:50:30 +00:00
Jörg Thalheim
0d43343908 flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/4122a18340094151d7911e838237ec7627f0d0c5' (2023-10-22)
  → 'github:nix-community/disko/944d338d24a9d043a3f7461c30ee6cfe4f9cca30' (2023-10-27)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03)
  → 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/30a0ba4a20703b4bfe047fe5def1fc24978e322c' (2023-10-22)
  → 'github:Mic92/sops-nix/c59da7ac29f041954c0864bc7bbb2c66ee18eba5' (2023-11-03)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/aae39f64f5ecbe89792d05eacea5cb241891292a' (2023-10-15)
  → 'github:numtide/treefmt-nix/5deb8dc125a9f83b65ca86cf0c8167c46593e0b1' (2023-10-27)
2023-11-03 14:49:49 +01:00
Jörg Thalheim
68a2df46ae fix clan_error_handler type 2023-11-03 14:48:14 +01:00
Jörg Thalheim
89ca442eb3 deltachat: import module from clanModules 2023-11-03 14:02:07 +01:00
Jörg Thalheim
527db2dbf0 container-driver: fix eval 2023-11-03 14:01:43 +01:00
Jörg Thalheim
483fb2ad9e switch to deltachat branch 2023-11-03 13:50:05 +01:00
Jörg Thalheim
0e003f519d switch to back to nixos-unstable-small 2023-11-03 13:44:12 +01:00
Jörg Thalheim
d08fe82864 switch from black to ruff for formatting 2023-11-03 13:38:13 +01:00
Jörg Thalheim
33515b2ed2 cli: merge nix options correctly 2023-11-03 13:31:36 +01:00
Mic92
9337960cf3 Merge pull request 'add nix option flag that is passed to underlying nix commands' (#449) from maddy into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/449
2023-11-03 12:19:22 +00:00
Jörg Thalheim
542bf47820 add nix option flag that is passed to underlying nix commands 2023-11-03 12:28:26 +01:00
Mic92
d1c4111a49 Merge pull request 'add deltachat module' (#448) from maddy into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/448
2023-11-03 10:39:51 +00:00
Jörg Thalheim
3a60ec4d98 add deltachat module 2023-11-03 10:39:51 +00:00
Jörg Thalheim
bec3f78a8b drop xmpp setup again 2023-11-03 10:39:51 +00:00
Johannes Kirschbauer
c714ab29b4 add create/join switch 2023-10-31 19:05:37 +01:00
clan-bot
f462edc9c9 Merge pull request 'ejabberd: fix sqlite and access' (#446) from Mic92-main into main 2023-10-31 17:45:16 +00:00
Jörg Thalheim
5e52a16eca drop ejabberd again 2023-10-31 18:43:51 +01:00