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

Sync main 1.5.x #7727

Merged
merged 69 commits into from
Mar 5, 2024
Merged

Sync main 1.5.x #7727

merged 69 commits into from
Mar 5, 2024

Conversation

TorstenDittmann
Copy link
Contributor

What does this PR do?

(Provide a description of what this PR does and why it's needed.)

Test Plan

(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Screenshots may also be helpful.)

Related PRs and Issues

  • (Related PR or issue)

Checklist

  • Have you read the Contributing Guidelines on issues?
  • If the PR includes a change to an API's metadata (desc, label, params, etc.), does it also include updated API specs and example docs?

shimonewman and others added 30 commits February 14, 2024 23:05
@shimonewman
usage logs updates
26af9b7
@shimonewman
usage logs updates
dae01f7
@christyjacob4
Merge pull request #7588 from appwrite/feat-usage-log
f0a4cf7 
usage logs updates
@vermakhushboo
Add health storage check
00db192
@shimonewman
Addressed comments
2a5f21e
@shimonewman
Addressed comments
ed43193
@christyjacob4
Merge pull request #7598 from appwrite/projectId-to-logger-2
db79299 
Project id to logger
@vermakhushboo
Add deviceFunctions and deviceBuilds as well
3b1233e
@vermakhushboo
Remove global function
e4a86d9
@Meldiron
Add smarter traefik load balancing with health check
2ab6156
@Meldiron
Revert "Add smarter traefik load balancing with health check"
505b481 
This reverts commit 2ab6156.
@shimonewman
usage/usage-dump queue health endpoints
1577be9
@lohanidamodar
fix bandwidth usage
c2ae330
@christyjacob4
Merge pull request #7615 from appwrite/fix-project-usage
abc67ab 
usage logs updates
@shimonewman
Merge pull request #7614 from appwrite/chore-usage-queue-health
3f7d350 
usage/usage-dump queue health endpoints
@PineappleIOnic
Add ARM64 to docker publish
d60e7c6
@PineappleIOnic
Add Docker Buildx for multiplatform
cc87052
@Meldiron
Fix double router curl
0dd2889
@loks0n
fix: msg91
e3c261b
@loks0n
chore: fmt
b2e1c16
@shimonewman
Merge pull request #7626 from appwrite/fix-msg91
db5c44c 
fix: msg91
@Meldiron
Fix missing todo
6567cff
@Meldiron
Fix bigs until works
b03783c
@PineappleIOnic
Merge branch 'refactor-usage-sn' into fix-double-proxy
7a5d64a
@eldadfux
Merge pull request #7627 from appwrite/fix-double-proxy
10d882c 
Fix: Router CURL
@christyjacob4
Merge pull request #7591 from appwrite/feat-storage-health-check
3f5e40a 
Add storage health check
@christyjacob4
Revert "usage/usage-dump queue health endpoints"
a809883
@christyjacob4
Merge pull request #7629 from appwrite/revert-7614-chore-usage-queue-…
42ca924 
…health

Revert "usage/usage-dump queue health endpoints"
@christyjacob4
Revert "Fix: Router CURL"
d2787c8
@christyjacob4
Merge pull request #7630 from appwrite/revert-7627-fix-double-proxy
17888cc 
Revert "Fix: Router CURL"
eldadfux and others added 28 commits February 24, 2024 19:01
@eldadfux
Fixed ID class namespace
e7a847a
@eldadfux
Hide error messages from HTML templates
b78725e
@TorstenDittmann
Merge pull request #7656 from appwrite/fix-function-id-2
3a524c2 
Fix-function-id-2
@shimonewman
Merge branch 'main' of github.com:appwrite/appwrite into chore-usage-…
92dfe93 
…queue-health
@christyjacob4
Merge pull request #7669 from appwrite/main
03d6eb7 
Sync main
@vermakhushboo
Change status code from 503 to 403
bbcb5e8
@vermakhushboo
Update tests
2609289
@christyjacob4
Merge pull request #7672 from appwrite/fix-error-code
1538f78 
Change status code from 503 to 403
@shimonewman
adding limit to queue retry
84f47dc
@shimonewman
adding limit to queue retry
53438ac
@shimonewman
adding limit to queue retry
658396b
@shimonewman
adding limit to queue retry
1a59361
@christyjacob4
Merge pull request #7692 from appwrite/deletes-queue-retry
ec85ec9 
adding limit to queue retry
@christyjacob4
Merge pull request #7661 from appwrite/chore-usage-queue-health
d91f696 
usage/usage-dump queue health endpoints
@christyjacob4
Merge branch 'main' of https://github.com/appwrite/appwrite into refa…
2ffcb9b 
…ctor-usage-sn
@christyjacob4
chore: update composer
0b47167
@christyjacob4 @TorstenDittmann
Update app/init.php
868bba5 
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
@christyjacob4
Update docker-compose.yml
45092a1
@christyjacob4
Merge pull request #7660 from appwrite/refactor-usage-sn
9ea34ce 
Refactor usage sn
@lohanidamodar
update cover image for SDKs
fc498fd
@eldadfux
Merge pull request #7715 from appwrite/lohanidamodar-patch-3
9e4250a 
update cover image for SDKs
@TorstenDittmann
Merge branch 'main' of https://github.com/appwrite/appwrite into sync…
a53e630 
…-main-1.5.x-2
@TorstenDittmann
fix: stats collection name
4d873eb
@TorstenDittmann
fix: tests
b8b1d86
@TorstenDittmann
chore: run linter
e4e40e2
@TorstenDittmann
revert: phpunit change
e0b8144
@TorstenDittmann
fix: merge conflicts
4cac7f5
@TorstenDittmann
fix: formatter
32b3479
@TorstenDittmann TorstenDittmann merged commit 3a7b13e into 1.5.x Mar 5, 2024
21 checks passed
@TorstenDittmann TorstenDittmann deleted the sync-main-1.5.x-2 branch March 5, 2024 10:45
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.

None yet
9 participants
@TorstenDittmann @shimonewman @christyjacob4 @vermakhushboo @Meldiron @lohanidamodar @PineappleIOnic @loks0n @eldadfux