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: 1.5.x with main #7486

Merged
merged 192 commits into from
Jan 24, 2024
Merged

sync: 1.5.x with main #7486

merged 192 commits into from
Jan 24, 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 October 25, 2023 10:39
@shimonewman
usage sync
9fad9dc
@shimonewman
usage sync
b80bfb0
@shimonewman
CHANGES.md
8736a01 
migrations::V20
@shimonewman
usage workers
b7675df
@shimonewman
usage workers
ef347f6
@shimonewman
workers start hook
14ac780
@shimonewman
workers start hook
c11b3ff
@shimonewman
clean up
b775c53
@shimonewman
clean up
4c69764
@shimonewman
migration ver
19fe1c3
@shimonewman
usage test
5e17cde
@shimonewman
composer json
a42577b
@shimonewman
composer json
6527a50
@shimonewman
refactor storage, databases usage display
0429073
@shimonewman
refactor users, project, functions usage display
1c10284
@shimonewman
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-us…
f64d0ab 
…age-sn

� Conflicts:
�	.gitmodules
�	CHANGES.md
�	Dockerfile
�	composer.lock
�	src/Appwrite/Migration/Migration.php
@shimonewman
added inf metric
ad63a37
@shimonewman
project.php
d54615d
@shimonewman
editing the response models
91fed7a
@shimonewman
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-us…
21895e3 
…age-sn

� Conflicts:
�	.gitmodules
�	CHANGES.md
�	Dockerfile
�	app/controllers/api/storage.php
�	app/init.php
�	composer.lock
�	src/Appwrite/Migration/Migration.php
�	src/Appwrite/Platform/Services/Tasks.php
�	src/Appwrite/Usage/Calculators/TimeSeries.php
@shimonewman
sync against 1.4x
7ee96fb
@shimonewman
tests fix
c9a4eb0
@shimonewman
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usa…
30d5e99 
…ge-sn
@shimonewman
tests fix
5daae1d
@shimonewman
Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-us…
c313e83 
…age-sn

� Conflicts:
�	composer.lock
@shimonewman
tests fix
d624481
@shimonewman
composer.lock
235e31e
@shimonewman
console::billing
fce2055
@shimonewman
console::billing
f16aa59
@lohanidamodar
support maile template override
83d4de9
shimonewman and others added 22 commits January 17, 2024 22:10
@shimonewman
hamster additions
0d10668
@shimonewman
hamster additions
6bd810c
@shimonewman
Merge branch 'main' of github.com:appwrite/appwrite into refactor-usa…
a0b38a5 
…ge-sn
@shimonewman
adding debug output to usage-worker
37316f9
@shimonewman
Added marked_for_deletion and billing_plan_downgrade
c116de2 
to hamster export
@shimonewman
Added marked_for_deletion and billing_plan_downgrade
0e30f65 
to hamster export
@shimonewman
Added marked_for_deletion and billing_plan_downgrade
9fc1b0b 
to hamster export
@christyjacob4
chore: refactor code
ff7523d
@christyjacob4
chore: refactor code
d04f9f4
@shimonewman
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into…
19b1de2 
… hamster-additions
@shimonewman
Added marked_for_deletion and billing_plan_downgrade
2b865bd 
to hamster export
@shimonewman
Hamster additions
e9a13fe 
Hamster additions
@shimonewman
Added marked_for_deletion and billing_plan_downgrade
d220c2b 
to hamster export
@TorstenDittmann
Merge pull request #7005 from appwrite/refactor-usage-sn
47ea083 
Refactor usage
@TorstenDittmann
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
9f5a031
@TorstenDittmann
fix: deletes worker
d13023f
@TorstenDittmann
Merge branch '1.5.x' into sync-main-with-1.5.x
d087a76
@TorstenDittmann
fix: builds worker
e148617
@TorstenDittmann
fix: workers
62e459c
@TorstenDittmann
fix: race condition with creating a user with targets
88cf7ea
@TorstenDittmann
revert: phpunit stop on failure
50510d9
@TorstenDittmann
test: fix database validator descriptions
8019317
@TorstenDittmann TorstenDittmann enabled auto-merge (rebase) January 24, 2024 15:13
@TorstenDittmann TorstenDittmann merged commit da638a1 into 1.5.x Jan 24, 2024
20 checks passed
@TorstenDittmann TorstenDittmann deleted the sync-main-with-1.5.x branch January 24, 2024 15:23
This was referenced Feb 1, 2024
Closed
Closed
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.
8 participants
@TorstenDittmann @shimonewman @lohanidamodar @Meldiron @christyjacob4 @eldadfux @stnguyen90 @PineappleIOnic