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 with 1.5.x #8205

Merged
merged 82 commits into from
May 27, 2024
Merged

Sync with 1.5.x #8205

merged 82 commits into from
May 27, 2024

Conversation

christyjacob4
Copy link
Member

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 April 25, 2024 19:31
@shimonewman
getEnv on worker.php
8588bb4
@loks0n
feat: add version header
2ed3827
@loks0n
feat: use x-appwrite-response-format
3ab9875
@loks0n
fix: version
644bbe1
@loks0n
fix: use APP_VERSION_STABLE
1295128
@loks0n
chore: better name
c746fb4
@shimonewman
Merge branch 'main' of github.com:appwrite/appwrite into feat-worker-…
27e4606 
…get-arg
@loks0n
Merge branch '1.5.x' into feat-add-version-header
2d09a3a
@loks0n
feat: better head demo values
8d6e176
@loks0n
chore: specs
f1a344a
@loks0n
Merge branch 'main' of https://github.com/appwrite/appwrite into feat…
824309e 
…-add-version-header
@loks0n
chore: steven review
0aadda9
@loks0n
Revert "Merge branch 'main' of https://github.com/appwrite/appwrite i…
91ee67d 
…nto feat-add-version-header"

This reverts commit 824309e, reversing
changes made to 2d09a3a.
@shimonewman
platform version on composer
5137d8a
@shimonewman
platform version on composer
9f23871
@shimonewman
composer format
70c6ef3
@shimonewman
composer format
7fed0f9
@shimonewman
Merge branch 'main' of github.com:appwrite/appwrite into feat-worker-…
74c15f5 
…get-arg
@shimonewman
composer format
390dd22
@loks0n
Merge branch '1.5.x' into feat-add-version-header
8ff98bc
@loks0n
feat: generic approach
e73b4b8
@loks0n
Merge branch '1.5.x' into feat-improve-header-demo-values
44ef0c3
@loks0n
Merge branch '1.5.x' into feat-improve-header-demo-values
1c1ba6d
@vermakhushboo
Update executor image name
7961604
@loks0n
chore: remove compose version
96741ac
@loks0n
Merge branch '1.5.x' into feat-improve-header-demo-values
0d5d533
@loks0n
chore: more deletions
2c19bb0
@loks0n
Merge branch 'main' into chore-remove-compose-version
237bec4
@byawitz
refactor(messaging worker): Refactoring local device to worker only
ab0d6f7
@byawitz
refactor(messaging worker): Adding volume and volume variables
e186305
loks0n and others added 28 commits May 24, 2024 11:17
@loks0n
Merge branch '1.5.x' into feat-improve-header-demo-values
b52de35
@christyjacob4
chore: update console
344f926
@christyjacob4
chore: update console
c2215ef
@christyjacob4
chore: remove specs
8c851ec
@christyjacob4
chore: update specs
99a6e81
@Meldiron
Add comments
8dd883a
@christyjacob4
Merge pull request #8188 from appwrite/sync-1.5.x-with-cloud
74a9995 
Sync 1.5.x with cloud
@christyjacob4
Merge pull request #8147 from appwrite/chore-rename-executor-image-name
9f2030f 
Update executor image name
@christyjacob4
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into pre…
ac49f74 
…pare-1.5.7
@christyjacob4
Merge branch 'main' of https://github.com/appwrite/appwrite into sync…
cd5f6f5 
…-with-main
@Meldiron
Update console
1109782
@christyjacob4
Merge pull request #8196 from appwrite/sync-with-main
6ea2177 
Sync with main
@christyjacob4
Merge branch '1.5.x' into prepare-1.5.7
0fcb765
@christyjacob4
Merge pull request #8089 from appwrite/feat-improve-header-demo-values
0e7c417 
feat: improve header demo values
@christyjacob4
Merge pull request #8185 from ItzNotABug/fix-robots-txt
e55f0ad 
Fix: Don't Override `robots.txt` for Other Domains
@loks0n
ui: improve warning message
cb4c15c
@loks0n
Merge branch '1.5.x' into feat-add-version-header
a92713d
@loks0n
fix: typo
ad3cc4e
@loks0n
refactor: remove version format const
d73a9e7
@christyjacob4
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into pre…
c76dbaa 
…pare-1.5.7
@christyjacob4
Merge pull request #8063 from appwrite/feat-add-version-header
a414b2b 
feat: add warning header
@christyjacob4
Merge branch '1.5.x' into prepare-1.5.7
3a63ee8
@christyjacob4
Merge pull request #8195 from appwrite/prepare-1.5.7
623a3ca 
chore: prepare 1.5.7
@christyjacob4
chore: update changelog
131d665
@christyjacob4
chore: update changelog
ecf4e25
@christyjacob4
chore: update changelog
671687c
@christyjacob4
Merge pull request #8197 from appwrite/update-changelog
d5ebde8 
chore: update changelog
@christyjacob4
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into syn…
1c79ccd 
…c-with-1.5.x
@christyjacob4 christyjacob4 merged commit c109dcc into refactor-usage-sn May 27, 2024
21 checks passed
@christyjacob4 christyjacob4 deleted the sync-with-1.5.x branch May 27, 2024 11:42
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
@christyjacob4 @shimonewman @loks0n @vermakhushboo @byawitz @stnguyen90 @ItzNotABug @abnegate @Meldiron