Commit Graph

75 Commits

Author SHA1 Message Date
3d0854ac4c Use correct var 2023-07-13 11:34:42 +02:00
b5bb6f8480 Show nicer diff when merging 2023-07-13 11:33:55 +02:00
Georg Krause
d47a63e331 ci: Don't push built docker image on PRs 2023-07-13 09:52:26 +02:00
Georg Krause
3cdf24a5f3 fix(exporter): Default to toml as default format 2023-07-13 09:51:54 +02:00
735bb5fe6d Add merge functionality 2023-07-13 09:50:42 +02:00
2180f28c78 Add support for diff and deploy for GTS 2023-05-04 10:47:06 +02:00
27168a2a6e Allow missing values of remote block for GTS support 2023-05-04 10:38:25 +02:00
569cff0957 Add json 2023-05-03 15:40:27 +02:00
e1d9fe04f9 Merge branch 'rework_export' 2023-05-03 15:14:23 +02:00
2984729841 Upadte reference in readme 2023-05-03 15:11:56 +02:00
58429a39f0 Add csv format option 2023-05-03 15:09:12 +02:00
a646714f76 Remove double output, typo 2023-05-03 14:48:09 +02:00
173aac081d Update help 2023-05-03 14:48:09 +02:00
d41bd5322d Rework exporter 2023-05-03 14:48:08 +02:00
fe12631ee4 Remove double output, typo 2023-05-03 14:45:53 +02:00
7d986a7072 Update help 2023-05-03 11:53:41 +02:00
4668d9023e Typos 2023-05-03 11:48:20 +02:00
46b0fe6b50 Rework exporter 2023-05-03 11:30:28 +02:00
3dce62417e refactor: Cleaner solution for exportable dict 2023-01-26 12:05:12 +01:00
Georg Krause
d4c754c103
Merge branch 'develop' 2023-01-26 11:54:22 +01:00
8a8a725002 fix: Remove id from export
As this wil not be the same id on other instances exporting it does not make sense
2023-01-25 23:36:25 +01:00
58998e1c17 fix: Allow name to be empty in local blocklist 2023-01-25 23:35:04 +01:00
a484a41b45 Merge branch 'develop' of https://git.gieszer.link/gcrkrause/mastodon-blocklist-deploy into develop 2023-01-22 18:23:54 +01:00
Georg Krause
7ad318bc48
feat: Build docker image in CI 2023-01-18 12:02:56 +01:00
Georg Krause
8d5676d0b2
refactor: Avoid manually templating toml file entries 2023-01-13 13:56:56 +01:00
6d2a4d82b4
fix: Avoid exception when input is missing for diff and deploy 2023-01-13 13:56:55 +01:00
Georg Krause
d9d3f02fda
feat: Add Dockerfile for development and deployment 2023-01-13 13:56:55 +01:00
0fca58810a
feat: Allow token via environment variables 2023-01-13 13:56:55 +01:00
181ac45bbf
refactor: Rename load_remote_blocklist->load_blocklist_from_instance 2023-01-13 13:56:43 +01:00
6a2a13bd74
refactor: Add missing return types 2023-01-13 13:56:43 +01:00
0dd6930c0f
refactor: Rename load_local_blocklist -> load_blocklist_file 2023-01-13 13:56:43 +01:00
33fee03059 Merge branch 'develop' of https://git.gieszer.link/gcrkrause/mastodon-blocklist-deploy into develop 2023-01-13 08:12:35 +01:00
2066c0332d fix: Avoid exception when input is missing for diff and deploy 2023-01-13 08:12:29 +01:00
moanos
5376af3e7e Merge pull request 'refactor: Avoid manually templating toml file entries' (#6) from toml-dump into develop
Reviewed-on: https://git.gieszer.link/gcrkrause/mastodon-blocklist-deploy/pulls/6
2023-01-13 08:08:26 +01:00
moanos
1565f17778 Merge pull request 'feat: Add Dockerfile for development and deployment' (#5) from dockerfile into develop
Reviewed-on: https://git.gieszer.link/gcrkrause/mastodon-blocklist-deploy/pulls/5
2023-01-12 22:27:21 +01:00
Georg Krause
229608a090
refactor: Avoid manually templating toml file entries 2023-01-12 17:11:10 +01:00
Georg Krause
ddc2ba1b43
feat: Add Dockerfile for development and deployment 2023-01-12 16:31:58 +01:00
0b49740e83 feat: Allow token via environment variables 2023-01-12 16:22:03 +01:00
c7872201ea Merge branch 'develop' of https://git.gieszer.link/gcrkrause/mastodon-blocklist-deploy into develop 2023-01-12 16:16:41 +01:00
ce5c1ae39d refactor: Rename load_remote_blocklist->load_blocklist_from_instance 2023-01-12 16:16:18 +01:00
da984d80e4 refactor: Rename load_remote_blocklist->load_blocklist_from_instance 2023-01-12 16:06:01 +01:00
eaccce8c6e refactor: Add missing return types 2023-01-12 16:04:56 +01:00
066e77d493 refactor: Rename load_local_blocklist -> load_blocklist_file 2023-01-12 16:01:55 +01:00
moanos
b4ef4b9199 Merge pull request 'fix: Avoid exception when output is missing for exports' (#4) from fix-exception-with-missing-output into develop
Reviewed-on: https://git.gieszer.link/gcrkrause/mastodon-blocklist-deploy/pulls/4
2023-01-12 15:56:07 +01:00
Georg Krause
0ecc925373
fix: Avoid exception when output is missing for exports 2023-01-12 12:36:46 +01:00
c54beb76d3 fix #3
A conversion to a lowercase string is needed for boolean values
2023-01-12 09:03:37 +01:00
80d66b1919 Add some documentation 2023-01-12 08:40:25 +01:00
c1e4770b0e Restructure project to make a valid poetry project, add script 2023-01-12 08:00:36 +01:00
45f52b940e Add documentation 2023-01-12 07:46:11 +01:00
7c54a1286a Add newlines for better overview 2023-01-12 07:42:23 +01:00