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.

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

Merge develop onto Main #334

Merged
merged 15 commits into from
Oct 17, 2023
Merged

Merge develop onto Main #334

merged 15 commits into from
Oct 17, 2023

Conversation

eleanorreem
Copy link
Contributor

No description provided.

eleanorreem and others added 2 commits October 4, 2023 14:41
* Feature: Added CONTRIBUTING.md link in the README.md file of the repository

* Feature: Added CONTRIBUTING.md link in the README.md file of the repository
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 8, 2023 03:05 Inactive
Update env variable directions
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 8, 2023 03:13 Inactive
Delete .env.example file
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 8, 2023 04:11 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 8, 2023 04:25 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 8, 2023 04:51 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 8, 2023 23:44 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 9, 2023 00:59 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 9, 2023 01:16 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 10, 2023 21:33 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 10, 2023 22:14 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 10, 2023 22:44 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 11, 2023 02:53 Inactive
kyleecodes and others added 5 commits October 10, 2023 23:07
- new directions for required env variables.
- added dummy values for simplybook for testing
- added details for no-code contributions not requiring env vars & typo fix
Update testing commands in docs
* updated .gitignore

* Moved README.md documentation to new /docs directory

* removed file
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 11, 2023 03:14 Inactive
Simplybook env vars updated with dummy values to pass tests.
Changed involved "page" to Getting involved "guide"
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 11, 2023 03:32 Inactive
Add Active column to Partner Admin Column

---------
Authored-by: Atreay Kukanur <66585295+ATREAY@users.noreply.github.com>
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 12, 2023 23:19 Inactive
* Partner Admin Authguard is checking whether the admin is active

Co-authored-by: Atreay Kukanur <66585295+ATREAY@users.noreply.github.com>
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 14, 2023 18:00 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 17, 2023 19:08 Inactive
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 17, 2023 19:40 Inactive
Added additional guide on syncing with upstream to keep git history cleaner.
Additionally, updated naming conventions for branches.
@eleanorreem eleanorreem temporarily deployed to bloom-backend-staging October 17, 2023 19:50 Inactive
@eleanorreem eleanorreem merged commit 881a3d3 into main Oct 17, 2023
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.

5 participants