Luke B. Silver
|
f285173f4e
|
Merge branch '1.5.x' into feat-ssr-dx
|
2024-02-22 13:22:41 +00:00 |
|
Jake Barnby
|
623c82c727
|
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
# app/config/specs/open-api3-1.4.x-client.json
# app/config/specs/open-api3-1.4.x-console.json
# app/config/specs/open-api3-1.4.x-server.json
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-1.4.x-client.json
# app/config/specs/swagger2-1.4.x-console.json
# app/config/specs/swagger2-1.4.x-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.json
# composer.lock
# src/Appwrite/Auth/Validator/Phone.php
|
2024-02-22 01:32:26 +13:00 |
|
Jake Barnby
|
942847cf3a
|
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
# app/config/collections.php
# app/config/errors.php
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# app/controllers/api/account.php
# app/controllers/api/teams.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/init.php
# app/worker.php
# composer.json
# composer.lock
# docker-compose.yml
# src/Appwrite/Extend/Exception.php
# src/Appwrite/Platform/Services/Tasks.php
# src/Appwrite/Platform/Tasks/Maintenance.php
# src/Appwrite/Platform/Workers/Certificates.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Messaging.php
# src/Appwrite/Platform/Workers/Usage.php
# src/Appwrite/Platform/Workers/UsageHook.php
# src/Appwrite/Specification/Format/OpenAPI3.php
# src/Appwrite/Specification/Format/Swagger2.php
# tests/e2e/Services/Account/AccountConsoleClientTest.php
|
2024-02-22 01:29:28 +13:00 |
|
loks0n
|
a3b88f2015
|
chore: remove x-forwarded-for
|
2024-02-21 12:18:50 +00:00 |
|
Jake Barnby
|
9498d680fb
|
Add doc refs
|
2024-02-21 22:04:27 +13:00 |
|
Jake Barnby
|
41be4da5c9
|
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images
|
2024-02-21 13:01:53 +13:00 |
|
Jake Barnby
|
a9d1aa5bca
|
Merge pull request #7620 from appwrite/refactor-remove-resource-collection
Refactor remove resource collection
|
2024-02-21 13:00:48 +13:00 |
|
Jake Barnby
|
ad8450af32
|
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images
|
2024-02-21 03:29:00 +13:00 |
|
Jake Barnby
|
400b28de8a
|
Replace resourceCollection with switch
|
2024-02-21 03:25:01 +13:00 |
|
Jake Barnby
|
379c79dae9
|
Consistent naming for device resources
|
2024-02-21 03:10:51 +13:00 |
|
Jake Barnby
|
2667d1fb07
|
Inject always local file device
|
2024-02-21 02:50:44 +13:00 |
|
Jake Barnby
|
35441dc542
|
Merge remote-tracking branch 'origin/1.5.x' into feat-email-attachments
|
2024-02-21 02:33:35 +13:00 |
|
Jake Barnby
|
b9b54b808c
|
Merge pull request #7618 from appwrite/feat-remove-callback-resources
Remove callback resources from workers
|
2024-02-21 02:30:32 +13:00 |
|
Jake Barnby
|
b265106af2
|
Fix tests
|
2024-02-21 02:20:09 +13:00 |
|
Jake Barnby
|
439e7b1ccf
|
Merge remote-tracking branch 'origin/feat-remove-callback-resources' into feat-email-attachments
# Conflicts:
# app/worker.php
# src/Appwrite/Platform/Workers/Messaging.php
|
2024-02-21 02:00:46 +13:00 |
|
loks0n
|
1fa0f18e44
|
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr-dx
|
2024-02-20 12:43:50 +00:00 |
|
Jake Barnby
|
bbce53cda5
|
Auto trigger messaging events
|
2024-02-21 01:06:35 +13:00 |
|
loks0n
|
fa28496b32
|
feat: ssr dx changes
|
2024-02-20 11:45:11 +00:00 |
|
Jake Barnby
|
2f711c84ed
|
Remove callback resources from workers
|
2024-02-21 00:40:55 +13:00 |
|
Jake Barnby
|
5747b33e38
|
Make self-hosted and cloud specs consistent
|
2024-02-20 23:15:46 +13:00 |
|
Jake Barnby
|
d61f4e4d2d
|
Add compound UID to spec generator
|
2024-02-20 20:15:08 +13:00 |
|
Jake Barnby
|
4bc6c202d9
|
Use compound ID for push notification image
|
2024-02-20 18:25:57 +13:00 |
|
Jake Barnby
|
42e1b0dfe3
|
Merge remote-tracking branch 'origin/feat-email-attachments' into feat-push-images
|
2024-02-20 18:06:29 +13:00 |
|
Jake Barnby
|
d15e85d1f6
|
Fix injecting invalid resource
|
2024-02-20 17:27:35 +13:00 |
|
Jake Barnby
|
710e08c109
|
Make sure to clear cache if file was downloaded from remote source
|
2024-02-20 00:11:10 +13:00 |
|
Jake Barnby
|
022c4678ec
|
Allow attaching files from storage to emails
|
2024-02-20 00:08:57 +13:00 |
|
Jake Barnby
|
d3913c422b
|
Add compound UID valdiator
|
2024-02-19 23:57:54 +13:00 |
|
Jake Barnby
|
1bb75fdd63
|
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images
# Conflicts:
# src/Appwrite/Extend/Exception.php
|
2024-02-19 20:44:11 +13:00 |
|
Eldad A. Fux
|
44a9aed48e
|
Merge pull request #7165 from appwrite/feat-more-phone-validation
Feat more phone validation
|
2024-02-18 22:39:45 +01:00 |
|
Torsten Dittmann
|
de0e83f703
|
fix: move user and project logic from general to api hook
|
2024-02-16 17:58:51 +00:00 |
|
Jake Barnby
|
14a243cc37
|
Merge pull request #7457 from appwrite/1.5.x-response-request-models
Update Response and Request filters aswell as Migrations for 1.5.x
|
2024-02-16 20:58:08 +13:00 |
|
Jake Barnby
|
4d7becc459
|
Apply suggestions from code review
|
2024-02-16 20:23:31 +13:00 |
|
Jake Barnby
|
c192f14d01
|
Merge remote-tracking branch 'origin/1.5.x' into feat-topic-totals-per-type
|
2024-02-16 14:08:04 +13:00 |
|
Christy Jacob
|
7dbb1c6399
|
Merge branch 'main' into refactor-cache-poc
|
2024-02-15 20:33:57 +05:30 |
|
Torsten Dittmann
|
14ecbd6658
|
fix: 2fa endpoint params
|
2024-02-15 11:26:34 +00:00 |
|
Jake Barnby
|
d38197380e
|
Support adding image to push notification via storage file
|
2024-02-15 22:36:34 +13:00 |
|
Jake Barnby
|
d82c7c24c4
|
Fix allowed query attributes
|
2024-02-15 19:35:47 +13:00 |
|
Jake Barnby
|
afba7f75f0
|
Update appropriate total count when mutating topic
|
2024-02-15 17:23:30 +13:00 |
|
Jake Barnby
|
e462e916f0
|
Add email, sms and push totals to topic
|
2024-02-15 17:22:43 +13:00 |
|
Jake Barnby
|
ae7a5c6c9c
|
Merge pull request #7580 from appwrite/feat-subscribe-permission
Feat subscribe permission
|
2024-02-15 16:47:44 +13:00 |
|
shimon
|
459db9b43e
|
usage updates
|
2024-02-14 07:34:12 +02:00 |
|
Jake Barnby
|
cbf1085850
|
Merge pull request #7135 from appwrite/remove-deletes-db-leftovers
Remove database methods from deletes worker
|
2024-02-13 23:13:24 +13:00 |
|
Bradley Schofield
|
b60c591f8f
|
Merge branch '1.5.x' into 1.5.x-response-request-models
|
2024-02-13 09:45:59 +00:00 |
|
Bradley Schofield
|
e2c6a2067a
|
Address comments
|
2024-02-13 09:39:09 +00:00 |
|
shimon
|
dac0e2a543
|
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
Conflicts:
src/Appwrite/Platform/Workers/UsageHook.php
|
2024-02-13 10:48:47 +02:00 |
|
Jake Barnby
|
b2f119868d
|
Add test
|
2024-02-13 17:41:07 +13:00 |
|
Jake Barnby
|
2ce85ce6ef
|
Add unknown error is delivered total is 0 but there were no delivery errors
|
2024-02-13 17:08:45 +13:00 |
|
Jake Barnby
|
3a77ec1920
|
Merge remote-tracking branch 'origin/1.5.x-response-request-models' into cache-attr-migrations
|
2024-02-13 15:07:45 +13:00 |
|
Jake Barnby
|
66e51c0f18
|
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models
# Conflicts:
# src/Appwrite/Platform/Workers/Usage.php
# src/Appwrite/Platform/Workers/UsageHook.php
|
2024-02-13 15:07:16 +13:00 |
|
Jake Barnby
|
37522ea66f
|
Merge branch '1.5.x' into fix-catch-exception
|
2024-02-13 12:47:36 +13:00 |
|