Torsten Dittmann
8e12a07267
Merge branch 'main' of https://github.com/appwrite/appwrite into fix-specs
2023-10-13 15:42:09 +02:00
Khushboo Verma
f18d33a0d6
Resolved merge conflicts
2023-10-13 18:54:14 +05:30
Khushboo Verma
66ec7f2e1d
VCS tests
2023-10-13 18:50:58 +05:30
Prateek Banga
feac25f401
adds already sent exception in update message
2023-10-13 18:35:49 +05:30
Prateek Banga
0b1b7646d5
review changes
2023-10-13 18:26:54 +05:30
Torsten Dittmann and GitHub
ce0024d97a
Merge pull request #5290 from DH-555/patch-4
...
Fix: spanish translations (emails)
2023-10-13 13:36:28 +02:00
Torsten Dittmann and GitHub
ecd073fb02
Merge pull request #6898 from appwrite/fix-6879-fix-project-delete
...
Update teamInternalId when updating project team
2023-10-13 13:35:47 +02:00
loks0n
63d3a2bc73
chore: revert abuse-key changes
2023-10-13 11:08:25 +01:00
loks0n
07286e5864
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-13 11:05:22 +01:00
loks0n
81c4a9bbd5
chore: fmt
2023-10-13 11:05:14 +01:00
Prateek Banga
4a44fb3330
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-10-13 14:52:02 +05:30
Steven Nguyen
3f2f6ab43a
Ensure permissions are updated when a project moves orgs
...
Since the following collections also have permissions set to the team,
the team should be updated for consistency:
- installations
- repositories
- vcsComments
2023-10-12 17:34:53 -07:00
Steven Nguyen
3bb22c38cc
Update teamInternalId when updating project team
...
This is important because when an organization is deleted, projects are
fetched by the teamInternalId and if the teamInternalId is not updated
when the project team is updated, the project will be deleted if the
previous organization is deleted.
2023-10-12 17:03:45 -07:00
Steven Nguyen
2d2af20547
Fix realtime deletes
...
The realtime collection only exists in the console project so iterating
over every project leads to the not found error.
In addition, the deleteForProjectIds() doesn't include the console
project so the realtime records were not being cleaned up properly.
2023-10-12 22:49:55 +00:00
Khushboo Verma
bb75036efe
WIP: Mocked GitHub installation
2023-10-13 01:45:27 +05:30
loks0n
8ab429b92f
feat: replace session confirmation endpoints
2023-10-12 14:38:32 +01:00
shimon
66c57c9a4f
Merge remote-tracking branch 'origin/refactor-workers' into refactor-workers
2023-10-12 16:34:31 +03:00
shimon
4088941f70
sync with main
2023-10-12 16:34:13 +03:00
Jake Barnby
48bc369149
Hardcode default queue for db worker only
2023-10-12 21:32:33 +13:00
Jake Barnby
204912cb98
Update compose phtml
2023-10-12 20:59:40 +13:00
Jake Barnby
dc580c3d0d
Change name
2023-10-12 20:15:16 +13:00
Prateek Banga
cc1769ed41
review changes
2023-10-12 11:48:26 +05:30
Jake Barnby
e2a8369712
Add docblock for env vars
2023-10-12 19:11:08 +13:00
Jake Barnby
effdeb4bc2
Fix env vars
2023-10-12 19:10:45 +13:00
Jake Barnby
1ac3372239
Set queue name per worker
2023-10-12 17:55:30 +13:00
Jake Barnby
096a529618
Revert "Merge branch 'feat-db-per-process' of github.com:appwrite/appwrite into feat-db-per-process"
...
This reverts commit 6f42305484 , reversing
changes made to 69abd222e8 .
2023-10-12 15:30:01 +13:00
Jake Barnby
6f42305484
Merge branch 'feat-db-per-process' of github.com:appwrite/appwrite into feat-db-per-process
...
# Conflicts:
# bin/worker-databases
# src/Appwrite/Event/Database.php
# src/Appwrite/Platform/Workers/Databases.php
2023-10-12 15:28:52 +13:00
Eldad Fux
c6c7734c29
Merge pull request #6496 from appwrite/fix-readme-cn
...
Update logo in README-CN.md
<!--
Thank you for sending the PR! We appreciate you spending the time to work on these changes.
Help us understand your motivation by explaining why you decided to make this change.
You can learn more about contributing to appwrite here: https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md
Happy contributing!
-->
## 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](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md )?
- [ ] 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?
2023-10-11 22:01:01 +02:00
Vincent (Wen Yu) Ge
291654bee9
Rename ID -> Keys for attribute and index for consistency
2023-10-11 19:29:04 +00:00
loks0n
b299ed056e
chore: rename $sessionSecret
2023-10-11 17:07:02 +01:00
loks0n
f9d6ebd3a0
docs: add descriptions to universal token endpoints
2023-10-11 16:31:32 +01:00
shimon
2cd4514086
sync with main
2023-10-11 16:03:15 +03:00
Torsten Dittmann
92adaee1cb
chore: upgrade console to 3.2.2 on cloud
2023-10-11 14:57:11 +02:00
loks0n
e41fab769f
fix: edge cases
2023-10-11 13:20:25 +01:00
shimon
893b1d0ba7
Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.gitmodules
app/controllers/api/functions.php
app/controllers/api/health.php
app/init.php
app/views/install/compose.phtml
composer.lock
src/Appwrite/Migration/Migration.php
src/Appwrite/Platform/Workers/Builds.php
src/Appwrite/Platform/Workers/Deletes.php
src/Appwrite/Platform/Workers/Functions.php
src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
Jake Barnby
d238d79e29
Allow multiprocess for db queue
2023-10-11 21:28:29 +13:00
Jake Barnby
365630ff39
Set the queue name based on project DB
2023-10-11 17:21:40 +13:00
Jake Barnby
ca5b7f5b16
Add dynamic queue setting for database worker
2023-10-11 16:52:58 +13:00
shimon
002fc19d60
tests fix
2023-10-10 21:02:24 +03:00
Prateek Banga
17ba6355e0
Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller
2023-10-10 19:52:19 +05:30
loks0n
c343d7550f
chore: fmt
2023-10-10 14:41:02 +01:00
loks0n
c30c024805
test: fix magic url assertions
2023-10-10 14:36:53 +01:00
Prateek Banga
bb52647366
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-10-10 19:06:39 +05:30
loks0n
a88175fc46
fix: unhash session responses
2023-10-10 13:30:42 +01:00
Prateek Banga
1e5a2a78aa
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.5.x-with-1.4.x
2023-10-10 17:46:44 +05:30
Torsten Dittmann and GitHub
920d2b2db3
Merge branch 'cl-1.4.x' into 1.4.x
2023-10-10 11:59:24 +02:00
Steven Nguyen
9d3972f43f
Bump API specs
2023-10-09 16:52:11 -07:00
Steven Nguyen
071920fb30
Bump version to 1.4.5
2023-10-09 16:39:46 -07:00
Steven Nguyen
2620328810
Bump APP_CACHE_BUSTER to make sure browsers fetch the new console
2023-10-09 16:38:54 -07:00
Steven Nguyen
81a6512cce
Bump console to 3.2.1
2023-10-09 16:19:59 -07:00