Skip to content

Conversation

@DeDuplicate
Copy link
Contributor

No description provided.

@potts99
Copy link
Collaborator

potts99 commented Nov 24, 2023

haha quality appreciate man, will take a deeper look as my hebrew is a little no existant

@potts99
Copy link
Collaborator

potts99 commented Nov 28, 2023

Could you update to the following code structure so i can give you the merge credits?

@vercel
Copy link

vercel bot commented Dec 11, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated (UTC)
docs ✅ Ready (Inspect) Visit Preview Feb 29, 2024 0:11am
peppermint ❌ Failed (Inspect) Feb 29, 2024 0:11am

@DeDuplicate
Copy link
Contributor Author

i fixed the files can you check now?

@DeDuplicate
Copy link
Contributor Author

Could you update to the following code structure so i can give you the merge credits?
i don't understand what you mean?

@DeDuplicate
Copy link
Contributor Author

@potts99 can you please help me to solve this?

@potts99 potts99 merged commit 3dec5a9 into Peppermint-Lab:master Feb 29, 2024
potts99 added a commit that referenced this pull request Mar 22, 2024
* add hebrew translation (#170)

* add hebrew translation

* add he

* Update index.js

* Update i18n.js

* Update peppermint.json

* fix index.js

* fix

* fix

* fix

* space

* add hebrew

* add DATABASE_URL to run local docker

* add pgadmin to check postgress and fix some translation issues

* fix edit

* fix add italiano

* revert docker file

---------

Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Jack Andrews <45759583+potts99@users.noreply.github.com>

* Consistency Across Languages (#235)

* Clarify and enhance conciseness of English translation

* Update peppermint.json

* Consistent English translation

* Consistent Danish translation

* Consistent German translation

* Consistent English translation

* Consistent Danish translation

* Consistent German translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Italian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent German translation

* Consistent Portuguese translation

* Consistent Swedish translation

* Consistent Swedish translation

* Consistent Filipino translation

* Consistent Hebrew translation

* Consistent Danish translation

* Consistent German translation

* Consistent English translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Hebrew translation

* Consistent Italian translation

* Consistent Norwegian translation

* Consistent Portuguese translation

* Consistent Swedish translation

* Consistent Swedish translation

* Consistent Filipino translation

* Update German translation (#239)

Fix some translations issues and also some changes that have been reverted in the latest commit

* Next (#240)

* fix explot

* fix delete user

* lock version

* global ticket search

* clean up

* admin layout nav

* app based notification system

* version bump

---------

Co-authored-by: DeDuplicate <31889523+DeDuplicate@users.noreply.github.com>
Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Matthew <68716884+2406mmartin@users.noreply.github.com>
Co-authored-by: A.Ottr <alex@shorkbytes.com>
potts99 added a commit that referenced this pull request Mar 22, 2024
* fix explot

* fix delete user

* lock version

* global ticket search

* clean up

* admin layout nav

* app based notification system

* version bump

* up to date (#241)

* add hebrew translation (#170)

* add hebrew translation

* add he

* Update index.js

* Update i18n.js

* Update peppermint.json

* fix index.js

* fix

* fix

* fix

* space

* add hebrew

* add DATABASE_URL to run local docker

* add pgadmin to check postgress and fix some translation issues

* fix edit

* fix add italiano

* revert docker file

---------

Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Jack Andrews <45759583+potts99@users.noreply.github.com>

* Consistency Across Languages (#235)

* Clarify and enhance conciseness of English translation

* Update peppermint.json

* Consistent English translation

* Consistent Danish translation

* Consistent German translation

* Consistent English translation

* Consistent Danish translation

* Consistent German translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Italian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent German translation

* Consistent Portuguese translation

* Consistent Swedish translation

* Consistent Swedish translation

* Consistent Filipino translation

* Consistent Hebrew translation

* Consistent Danish translation

* Consistent German translation

* Consistent English translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Hebrew translation

* Consistent Italian translation

* Consistent Norwegian translation

* Consistent Portuguese translation

* Consistent Swedish translation

* Consistent Swedish translation

* Consistent Filipino translation

* Update German translation (#239)

Fix some translations issues and also some changes that have been reverted in the latest commit

* Next (#240)

* fix explot

* fix delete user

* lock version

* global ticket search

* clean up

* admin layout nav

* app based notification system

* version bump

---------

Co-authored-by: DeDuplicate <31889523+DeDuplicate@users.noreply.github.com>
Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Matthew <68716884+2406mmartin@users.noreply.github.com>
Co-authored-by: A.Ottr <alex@shorkbytes.com>

* hide for now

* improved landing page

---------

Co-authored-by: DeDuplicate <31889523+DeDuplicate@users.noreply.github.com>
Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Matthew <68716884+2406mmartin@users.noreply.github.com>
Co-authored-by: A.Ottr <alex@shorkbytes.com>
potts99 added a commit that referenced this pull request Mar 22, 2024
* fix explot

* fix delete user

* lock version

* global ticket search

* clean up

* admin layout nav

* app based notification system

* version bump

* up to date (#241)

* add hebrew translation (#170)

* add hebrew translation

* add he

* Update index.js

* Update i18n.js

* Update peppermint.json

* fix index.js

* fix

* fix

* fix

* space

* add hebrew

* add DATABASE_URL to run local docker

* add pgadmin to check postgress and fix some translation issues

* fix edit

* fix add italiano

* revert docker file

---------

Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Jack Andrews <45759583+potts99@users.noreply.github.com>

* Consistency Across Languages (#235)

* Clarify and enhance conciseness of English translation

* Update peppermint.json

* Consistent English translation

* Consistent Danish translation

* Consistent German translation

* Consistent English translation

* Consistent Danish translation

* Consistent German translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Italian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent German translation

* Consistent Portuguese translation

* Consistent Swedish translation

* Consistent Swedish translation

* Consistent Filipino translation

* Consistent Hebrew translation

* Consistent Danish translation

* Consistent German translation

* Consistent English translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Hebrew translation

* Consistent Italian translation

* Consistent Norwegian translation

* Consistent Portuguese translation

* Consistent Swedish translation

* Consistent Swedish translation

* Consistent Filipino translation

* Update German translation (#239)

Fix some translations issues and also some changes that have been reverted in the latest commit

* Next (#240)

* fix explot

* fix delete user

* lock version

* global ticket search

* clean up

* admin layout nav

* app based notification system

* version bump

---------

Co-authored-by: DeDuplicate <31889523+DeDuplicate@users.noreply.github.com>
Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Matthew <68716884+2406mmartin@users.noreply.github.com>
Co-authored-by: A.Ottr <alex@shorkbytes.com>

* hide for now

* improved landing page

* improved mobile view

---------

Co-authored-by: DeDuplicate <31889523+DeDuplicate@users.noreply.github.com>
Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Matthew <68716884+2406mmartin@users.noreply.github.com>
Co-authored-by: A.Ottr <alex@shorkbytes.com>
potts99 added a commit that referenced this pull request Mar 24, 2024
* fix explot

* fix delete user

* lock version

* global ticket search

* clean up

* admin layout nav

* app based notification system

* version bump

* up to date (#241)

* add hebrew translation (#170)

* add hebrew translation

* add he

* Update index.js

* Update i18n.js

* Update peppermint.json

* fix index.js

* fix

* fix

* fix

* space

* add hebrew

* add DATABASE_URL to run local docker

* add pgadmin to check postgress and fix some translation issues

* fix edit

* fix add italiano

* revert docker file

---------

Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Jack Andrews <45759583+potts99@users.noreply.github.com>

* Consistency Across Languages (#235)

* Clarify and enhance conciseness of English translation

* Update peppermint.json

* Consistent English translation

* Consistent Danish translation

* Consistent German translation

* Consistent English translation

* Consistent Danish translation

* Consistent German translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Italian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent Norwegian translation

* Consistent German translation

* Consistent Portuguese translation

* Consistent Swedish translation

* Consistent Swedish translation

* Consistent Filipino translation

* Consistent Hebrew translation

* Consistent Danish translation

* Consistent German translation

* Consistent English translation

* Consistent Spanish translation

* Consistent French translation

* Consistent Hebrew translation

* Consistent Italian translation

* Consistent Norwegian translation

* Consistent Portuguese translation

* Consistent Swedish translation

* Consistent Swedish translation

* Consistent Filipino translation

* Update German translation (#239)

Fix some translations issues and also some changes that have been reverted in the latest commit

* Next (#240)

* fix explot

* fix delete user

* lock version

* global ticket search

* clean up

* admin layout nav

* app based notification system

* version bump

---------

Co-authored-by: DeDuplicate <31889523+DeDuplicate@users.noreply.github.com>
Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Matthew <68716884+2406mmartin@users.noreply.github.com>
Co-authored-by: A.Ottr <alex@shorkbytes.com>

* hide for now

* improved landing page

* improved mobile view

* email template editor first imp

* version bump

* fix port 465 issue

* verify & delete email settings

* small tweaks

* fix search

* html email content inside an iframe

* version bump

* re-add videos

---------

Co-authored-by: DeDuplicate <31889523+DeDuplicate@users.noreply.github.com>
Co-authored-by: yossef-bismart <83905330+yossef-bismart@users.noreply.github.com>
Co-authored-by: Matthew <68716884+2406mmartin@users.noreply.github.com>
Co-authored-by: A.Ottr <alex@shorkbytes.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants