fogelito
|
03ce64d41a
|
Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2
Conflicts:
composer.lock
|
2024-02-25 11:01:08 +02:00 |
|
|
fogelito
|
1474bd65b0
|
Rename $collectionDocument
|
2024-02-25 10:57:41 +02:00 |
|
|
fogelito
|
af34f195c6
|
Address comments
|
2024-02-25 10:26:02 +02:00 |
|
Jake Barnby
|
404e4258f6
|
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
|
2024-02-25 20:56:34 +13:00 |
|
|
Jake Barnby
|
209c29991b
|
Only return allowed runtimes in runtime list route
|
2024-02-25 18:49:25 +13:00 |
|
loks0n
|
008f086f40
|
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into chore-remove-array-sdk-method
|
2024-02-24 14:44:50 +00:00 |
|
|
loks0n
|
b650884351
|
chore: fix hide in specs
|
2024-02-24 14:38:09 +00:00 |
|
|
Jake Barnby
|
a178dbfc4b
|
Allow existing session when upgrading from anonymous to oauth
|
2024-02-25 03:04:35 +13:00 |
|
|
Jake Barnby
|
4190a09333
|
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
|
2024-02-25 03:00:47 +13:00 |
|
|
Jake Barnby
|
7a24f5fb3d
|
Fix missing userId on update challenge
|
2024-02-25 02:21:33 +13:00 |
|
|
loks0n
|
5ff2121ef7
|
fix: sdk.hideServer & sdk.hideClient
|
2024-02-24 13:17:58 +00:00 |
|
|
loks0n
|
5ba50c842b
|
chore: remove array sdk method
|
2024-02-24 12:53:47 +00:00 |
|
|
Jake Barnby
|
46575b6df7
|
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
# app/controllers/api/account.php
# composer.lock
|
2024-02-25 00:16:40 +13:00 |
|
Utkarsh Ahuja
|
8c4473932f
|
fix: list api select query
|
2024-02-24 10:55:33 +00:00 |
|
|
Jake Barnby
|
0a37a0dd20
|
Merge pull request #7645 from appwrite/feat-dev-apns
Allow setting APNS to sandbox mode
|
2024-02-24 14:07:20 +13:00 |
|
|
Jake Barnby
|
4ce6eabf40
|
Merge pull request #7638 from appwrite/fix-update-topics-permissions
Fix update topics permissions
|
2024-02-24 13:35:23 +13:00 |
|
|
Jake Barnby
|
11e9f43982
|
Allow setting APNS to sandbox mode
|
2024-02-24 13:34:08 +13:00 |
|
Torsten Dittmann
|
076ffe8866
|
fix: missing team variable and added mfa templates to config
|
2024-02-23 14:59:12 +01:00 |
|
|
Torsten Dittmann
|
af6091e04a
|
fix: template name typo for mfa challenge
|
2024-02-23 14:59:12 +01:00 |
|
|
Torsten Dittmann
|
f577811c04
|
fix: formatting on emails
|
2024-02-23 14:59:12 +01:00 |
|
|
Torsten Dittmann
|
9ae2948d0e
|
fix: mfa email template
|
2024-02-23 14:59:12 +01:00 |
|
|
Jake Barnby
|
aa6778712f
|
Merge pull request #7640 from appwrite/fix-tests
Fix tests
|
2024-02-24 02:54:59 +13:00 |
|
|
Jake Barnby
|
7ab80b9288
|
Fix account method
|
2024-02-24 02:00:31 +13:00 |
|
|
Jake Barnby
|
0d62ecf90f
|
Merge pull request #7625 from appwrite/provider-null
Provider null
|
2024-02-24 01:17:58 +13:00 |
|
|
Torsten Dittmann
|
a684f7b132
|
fix: add mfa path to console
|
2024-02-23 12:13:22 +01:00 |
|
|
Jake Barnby
|
8742bfaee8
|
Fix missing subscribe on topic update
|
2024-02-23 23:56:49 +13:00 |
|
|
Jake Barnby
|
7c42a59c85
|
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
# Conflicts:
# 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
# composer.lock
|
2024-02-23 18:01:59 +13:00 |
|
|
loks0n
|
046c11ceb2
|
chore: revert X-Forwarded-For
|
2024-02-22 15:37:51 +00:00 |
|
|
loks0n
|
7985a9ed2c
|
chore: remove forwarded for
|
2024-02-22 13:26:08 +00:00 |
|
|
Luke B. Silver
|
f285173f4e
|
Merge branch '1.5.x' into feat-ssr-dx
|
2024-02-22 13:22:41 +00:00 |
|
|
Torsten Dittmann
|
e7259f0a3d
|
Merge branch '1.5.x' into feat-rc-sdks
|
2024-02-21 18:22:17 +01:00 |
|
|
Torsten Dittmann
|
18e4385ca5
|
fix: change emailPassword factor from email to password
|
2024-02-21 18:18:56 +01:00 |
|
|
Torsten Dittmann
|
6cd456a35e
|
fix: mfa sdk method
|
2024-02-21 17:54:39 +01:00 |
|
|
Jake Barnby
|
a877850707
|
Fix GraphQL tests
|
2024-02-22 02:26:17 +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 |
|
|
fogelito
|
b762a9cedd
|
Check user false
|
2024-02-21 11:48:16 +02:00 |
|
|
fogelito
|
a851a5f244
|
providerInternalId nulls
|
2024-02-21 11:43:04 +02:00 |
|
|
Jake Barnby
|
9498d680fb
|
Add doc refs
|
2024-02-21 22:04:27 +13:00 |
|
|
Jake Barnby
|
607ba5b32f
|
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
|
2024-02-21 18:40:01 +13:00 |
|
|
Jake Barnby
|
3aeb62377c
|
Fix missed update with image
|
2024-02-21 17:07:52 +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
|
1c1a2eab2c
|
Format
|
2024-02-21 03:16:01 +13:00 |
|
|
Jake Barnby
|
64eaf91ee7
|
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
|
2024-02-21 03:15:23 +13:00 |
|
|
Jake Barnby
|
379c79dae9
|
Consistent naming for device resources
|
2024-02-21 03:10:51 +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
|
6c4b0ecd5b
|
Simplify allow list
|
2024-02-20 23:27:40 +13:00 |
|
|
Jake Barnby
|
5747b33e38
|
Make self-hosted and cloud specs consistent
|
2024-02-20 23:15:46 +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
|
022c4678ec
|
Allow attaching files from storage to emails
|
2024-02-20 00:08:57 +13:00 |
|
|
Jake Barnby
|
7a420000fa
|
Fix image permissions check and URL
|
2024-02-19 20:48:52 +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 |
|
Damodar Lohani
|
928ae74ffe
|
fix project network usage
|
2024-02-19 06:04:29 +00:00 |
|
Eldad A. Fux
|
ad78259c10
|
Merge pull request #7375 from appwrite/fix-sentry-errors
Update exception for github session not found
|
2024-02-18 22:37:00 +01:00 |
|
|
Torsten Dittmann
|
b500c085e1
|
revert: unnecessary style changes
|
2024-02-16 18:00:49 +00:00 |
|
|
Torsten Dittmann
|
de0e83f703
|
fix: move user and project logic from general to api hook
|
2024-02-16 17:58:51 +00:00 |
|
|
Torsten Dittmann
|
5193a97ddb
|
fix: move user logic from general to api hook
|
2024-02-16 16:26:50 +00:00 |
|
|
Torsten Dittmann
|
4748dedd29
|
fix: blocked users from accessing console
|
2024-02-16 14:58:38 +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
|
3c727861bb
|
Fix target permissions
|
2024-02-16 17:07:16 +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 |
|
|
Torsten Dittmann
|
14ecbd6658
|
fix: 2fa endpoint params
|
2024-02-15 11:26:34 +00:00 |
|
|
Jake Barnby
|
2fffbd93f8
|
Lint fix
|
2024-02-15 22:41:45 +13:00 |
|
|
Jake Barnby
|
d38197380e
|
Support adding image to push notification via storage file
|
2024-02-15 22:36:34 +13:00 |
|
|
Jake Barnby
|
5f59f4c5c8
|
Fix syntax error
|
2024-02-15 17:56:06 +13:00 |
|
|
Jake Barnby
|
afba7f75f0
|
Update appropriate total count when mutating topic
|
2024-02-15 17:23:30 +13:00 |
|
|
Jake Barnby
|
ed2add1f1a
|
Merge pull request #7581 from appwrite/chore-remove-redundant-hook
Remove redundant hook
|
2024-02-15 16:48:03 +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 |
|
|
fogelito
|
84acf990ec
|
Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2
|
2024-02-14 16:53:58 +02:00 |
|
|
Jake Barnby
|
0246fb254a
|
Merge pull request #7578 from appwrite/fix-smtp-provider-update
Fix smtp provider update
|
2024-02-14 12:48:38 +13:00 |
|
|
fogelito
|
b9000e6d2f
|
Changes message like Utopia
|
2024-02-13 12:29:36 +02:00 |
|
|
fogelito
|
99fed365db
|
Update comment
|
2024-02-13 12:05:47 +02:00 |
|
|
fogelito
|
796e44a1ed
|
Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2
|
2024-02-13 11:46:33 +02:00 |
|
Bradley Schofield
|
b60c591f8f
|
Merge branch '1.5.x' into 1.5.x-response-request-models
|
2024-02-13 09:45:59 +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
|
014464506e
|
Remove redundant hook
|
2024-02-13 17:45:03 +13:00 |
|
|
Jake Barnby
|
1f470aecd2
|
Add subscribe permission to topics
|
2024-02-13 17:24:31 +13:00 |
|
|
Jake Barnby
|
01e88e65d6
|
Fix swapping options/credentials on create/update smtp provider
|
2024-02-13 15:16:37 +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 |
|
|
Jake Barnby
|
ff1f7e4819
|
Merge pull request #7569 from appwrite/fix-telesign-params
Fix telesign params
|
2024-02-13 12:38:49 +13:00 |
|
|
Jake Barnby
|
0bd3fe6473
|
Merge pull request #7571 from appwrite/fix-updating-message-status
Fix updating message status
|
2024-02-13 12:38:39 +13:00 |
|
|
Jake Barnby
|
06b15c79ff
|
Merge pull request #7572 from appwrite/attributes-query-fix
fix Indexes
|
2024-02-13 12:37:59 +13:00 |
|
Christy Jacob
|
c076dfe6f1
|
Merge pull request #7576 from appwrite/refactor-usage-sn
Refactor usage sn
|
2024-02-12 23:05:56 +05:30 |
|
|
fogelito
|
4018224cc6
|
parseQueries
|
2024-02-12 18:06:37 +02:00 |
|
|
fogelito
|
ace75b0786
|
parseQueries
|
2024-02-12 18:02:04 +02:00 |
|
|
fogelito
|
6c064430fb
|
Merge branch '1.5.x' of github.com:appwrite/appwrite into json_syntax_error
|
2024-02-12 17:41:42 +02:00 |
|
|
fogelito
|
2f9cadf4c0
|
remove var_dump
|
2024-02-12 15:30:34 +02:00 |
|
|
fogelito
|
6aae8cbf64
|
Add cursor test
|
2024-02-12 15:27:19 +02:00 |
|
|
Jake Barnby
|
f5aebe6673
|
Merge pull request #7559 from Souptik2001/fix-7109-user-activity-log
Fix missing user activity logs
|
2024-02-12 23:04:20 +13:00 |
|