Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Experiment: Integrate backend into main repo #351

Closed
wants to merge 489 commits into from
Closed

Experiment: Integrate backend into main repo #351

wants to merge 489 commits into from

Conversation

beatbrot
Copy link
Contributor

@beatbrot beatbrot commented Jan 3, 2024 •
edited
Loading

No description provided.

TomBursch and others added 30 commits January 3, 2023 12:54
@TomBursch
fix: expense statistics
7c1ca50
@TomBursch
Prepare release 53
0381467
@TomBursch
feat: Parse and merge item descriptions (TomBursch/kitchenowl-backend#16
505a766 
)
@TomBursch
Prepare release 54
6c120c3
@TomBursch
chore: update CI
65fd584
@TomBursch
CI: deactivate 32bit
1c37671
@TomBursch
feat: Multiple shopping lists
9893699
@TomBursch
Prepare beta v55
af4aa14
@TomBursch
fix: missing import fields
67105fb
@TomBursch
feat: update template items
1ed3cbc
@TomBursch
l10n: Update localization
a27ac44
@TomBursch
l10n: Update localization
f8862dd
@TomBursch
fix: localization duplicate key
32354df
@TomBursch
fix: import with duplicate item names
5df9576
@TomBursch
feat: Custom DB support
dded337
@TomBursch
chore: upgrade requirements
5a45b85
@weblate @comradekingu
@Iagocds @Bost0n
Translations update from Hosted Weblate (TomBursch/kitchenowl-backend#18
b74428c 
)

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/

* Translated using Weblate (German)

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/de/

* Added translation using Weblate (French)

* Added translation using Weblate (Norwegian Bokmål)

* Added translation using Weblate (Portuguese)

* Added translation using Weblate (Portuguese (Brazil))

* Added translation using Weblate (Spanish)

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt_BR/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

Co-authored-by: J. Lavoie <[email protected]>
Co-authored-by: Allan Nordhøy <[email protected]>
Co-authored-by: Iagocds <[email protected]>
Co-authored-by: German <[email protected]>
Co-authored-by: gallegonovato <[email protected]>
@TomBursch
feat: Add languages
1e5e394
@weblate @comradekingu
@Iagocds @Bost0n @liimee @despa1rjjj @SantosSi
Translations update from Hosted Weblate (TomBursch/kitchenowl-backend#19
e739d3c 
)

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/

* Translated using Weblate (German)

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/de/

* Added translation using Weblate (French)

* Added translation using Weblate (Norwegian Bokmål)

* Added translation using Weblate (Portuguese)

* Added translation using Weblate (Portuguese (Brazil))

* Added translation using Weblate (Spanish)

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt_BR/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt_BR/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (420 of 420 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

* Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

* Translated using Weblate (Spanish)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/

* Added translation using Weblate (Indonesian)

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/id/

* Translated using Weblate (Indonesian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/id/

* Added translation using Weblate (Russian)

* Translated using Weblate (Russian)

Currently translated at 3.5% (15 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/ru/

* Translated using Weblate (Portuguese)

Currently translated at 4.7% (20 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt/

---------

Co-authored-by: J. Lavoie <[email protected]>
Co-authored-by: Allan Nordhøy <[email protected]>
Co-authored-by: Iagocds <[email protected]>
Co-authored-by: German <[email protected]>
Co-authored-by: gallegonovato <[email protected]>
Co-authored-by: liimee <[email protected]>
Co-authored-by: Roman <[email protected]>
Co-authored-by: ssantos <[email protected]>
@TomBursch
feat: Add Indonesian and Russian
c46e042
@TomBursch
fix: bugs and upgrade dependencies
5f2a274
@TomBursch
Prepare release 56
5254d49
@dependabot
chore(deps): bump werkzeug from 2.2.2 to 2.2.3 (TomBursch/kitchenowl-…
2b8cf13 
…backend#21)

Bumps [werkzeug](https://github.com/pallets/werkzeug) from 2.2.2 to 2.2.3.
- [Release notes](https://github.com/pallets/werkzeug/releases)
- [Changelog](https://github.com/pallets/werkzeug/blob/main/CHANGES.rst)
- [Commits](pallets/werkzeug@2.2.2...2.2.3)

---
updated-dependencies:
- dependency-name: werkzeug
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@weblate @TomBursch @gekenson
Translations update from Hosted Weblate (TomBursch/kitchenowl-backend#20
a20f8b9 
)

* Translated using Weblate (Portuguese)

Currently translated at 5.0% (21 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt/

* Translated using Weblate (Russian)

Currently translated at 66.3% (278 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/ru/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/nb_NO/

* Translated using Weblate (Russian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/ru/

* Translated using Weblate (German)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/de/

---------

Co-authored-by: Tom Bursch <[email protected]>
Co-authored-by: gekenson <[email protected]>
@BenDundon @TomBursch
fix: Amended a spelling error in "Chili Pepper" (TomBursch/kitchenowl…
db56002 
…-backend#22)

* fix: Amended a spelling error in "Chili Pepper"

* fix: other languages

---------

Co-authored-by: Tom Bursch <[email protected]>
@TomBursch
l10n: update and fix
dc13208
@weblate
Translations update from Hosted Weblate (TomBursch/kitchenowl-backend#23
ecfcad2 
)

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/nb_NO/

* Translated using Weblate (Russian)

Currently translated at 100.0% (419 of 419 strings)

Translation: KitchenOwl/Default Items
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/ru/
@TomBursch
chore: upgrade requirements
b3101b1
@TomBursch
feat: Refactor meal planner and add planned yields
1553a5e
@TomBursch
feat: add item icons
e545c41
TomBursch and others added 24 commits November 29, 2023 19:42
@TomBursch
fix: Expense overview for PostgreSQL
c573ce7
@TomBursch
Prepare release 89
b9f1dc6
@TomBursch
fix: send mail in background
7f6cab5
@TomBursch
fix: error logging
18e2128
@weblate
Translated using Weblate (Spanish) (TomBursch/kitchenowl-backend#65)
7665766 
Currently translated at 100.0% (494 of 494 strings)


Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/es/
Translation: KitchenOwl/Default Items

Co-authored-by: gallegonovato <[email protected]>
@TomBursch
chore: upgrade requirements
7300ab2
@TomBursch
Prepare release 90
8a249f1
@TomBursch
fix: manage send mails
5e90e3f
@TomBursch
fix: Upgrade default items
ec8383a
@TomBursch
Prepare release 91
82fe88e
@TomBursch
fix: send async verification mail
97c0ce0
@TomBursch
fix: python manage script
0568d85
@TomBursch
fix: email spelling
c21baae
@TomBursch
fix: update all user sorting
e6f5a96
@TomBursch
fix: smaller bugs
a81ae24
@TomBursch
feat: improve SQLite language support
9ec2806
@TomBursch
chore: upgrade requirements
ba57882
@TomBursch
fix: docker build
12695c5
@weblate @MiguelNdeCarvalho
@pHamala @sappan
Translated using Weblate (Chinese (Simplified)) (TomBursch/kitchenowl…
7890930 
…-backend#66)

Currently translated at 93.9% (464 of 494 strings)

Translated using Weblate (Portuguese)

Currently translated at 100.0% (494 of 494 strings)

Translated using Weblate (Portuguese)

Currently translated at 94.5% (467 of 494 strings)

Translated using Weblate (Finnish)

Currently translated at 100.0% (494 of 494 strings)

Translated using Weblate (Greek)

Currently translated at 100.0% (494 of 494 strings)






Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/el/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/fi/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/pt/
Translate-URL: https://hosted.weblate.org/projects/kitchenowl/default-items/zh_Hans/
Translation: KitchenOwl/Default Items

Co-authored-by: BeardedWatermelon <[email protected]>
Co-authored-by: MiguelNdeCarvalho <[email protected]>
Co-authored-by: Petri Hämäläinen <[email protected]>
Co-authored-by: 一叶知秋 <[email protected]>
@TomBursch
chore: Upgrade requirements
65cc5db
@TomBursch
Prepare release 92
bf76252
@TomBursch
chore: upgrade requirements
8b09363
@TomBursch
chore: upgrade requirements
54aeccb
@TomBursch
fix: IPv6 not starting (TomBursch/kitchenowl-backend#68)
a0c8cc0
@beatbrot
Copy link
Contributor Author

beatbrot commented Jan 3, 2024

@TomBursch Based on the discussion in #346, I tried to rewrite the history of the backend repo so that all files are in a "backend" folder for every commit of the whole history.
This breaks all GPG signatures of all commits. Also the issues and PRs referenced in commit messages are now pointing to the wrong location.
In addition to that, it doesn't make sense that there is a backend/.github folder. This folder should've been excluded from the relocation.
I believe these issues are fixable.

Of course, it does not make sense to merge this as-is and in the end, it is of course your decision whether you want to merge the repos or not. I just wanted to do some experimentation and share my findings with you :)

@TomBursch
Copy link
Owner

Wow, looks good, I'm fine without the signatures as long as all code ownership is still available (which it seems like it is).

Both variants would take me some weeks though.

I guess they didn't 😄

@beatbrot
Copy link
Contributor Author

beatbrot commented Jan 5, 2024

@TomBursch One follow-up question: What should we do with all the tags that were in the backend repo? Delete them? Give them a "backend-" prefix?

@TomBursch
Copy link
Owner

We can delete them. I've done some smaller fixes and published a new release, so I'll focus on this next.

@beatbrot beatbrot closed this Jan 7, 2024
@beatbrot beatbrot mentioned this pull request Jan 7, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@beatbrot @TomBursch @weblate @BenDundon