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
fogelito
e5bada0493
typo
2024-02-12 12:03:31 +02:00
fogelito
2ef59134a0
Merge branch '1.5.x' of github.com:appwrite/appwrite into attributes-query-fix
2024-02-12 12:00:26 +02:00
Jake Barnby
e26230cc34
Disallow creating a session if one already exists
2024-02-12 22:59:49 +13:00
fogelito
adbe11fd50
fix Indexes
2024-02-12 11:55:45 +02:00
Jake Barnby
e2f71cbf3a
Merge pull request #7557 from appwrite/create-array-index
...
Hardcode size and orders for Json Key Indexes
2024-02-12 22:27:15 +13:00
shimon
e7ace61273
Sync against main
2024-02-12 11:10:52 +02:00
shimon
6b6f04d2d3
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/config/collections.php
app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby
8ed2b1f3a5
Fix tests
2024-02-12 18:35:05 +13:00
Jake Barnby
3ba6652be8
Only set schedule active is status is scheduled
2024-02-12 16:55:34 +13:00
Jake Barnby
f237e863de
Throw on updating sent, processing, failed message
2024-02-12 16:55:00 +13:00
Jake Barnby
05884e154e
Update telesign credentials
2024-02-12 15:10:18 +13:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
Damodar Lohani
eb7e2fd23b
fix injection
2024-02-11 09:46:39 +00:00
Damodar Lohani
36eabfa2dd
fix check twice
2024-02-11 09:45:36 +00:00
Damodar Lohani
2634c928c7
fix format
2024-02-11 09:34:13 +00:00
Damodar Lohani
e462d73f65
prevent user with active team, from deletion
2024-02-11 09:31:09 +00:00
Christy Jacob
e2baefe8c6
Merge pull request #7500 from appwrite/fix-account-delete
...
PEA-233-prevent console user deletion before deleting their team
2024-02-11 14:52:24 +05:30
Damodar Lohani
681688e252
fix rename
2024-02-11 14:52:54 +05:45
Damodar Lohani
c8720805c7
Update app/controllers/api/account.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:19 +05:45
Christy Jacob
5abcb86fd7
fix: use atomic operations for updating team count
2024-02-09 23:18:18 +05:30
shimon
179a045399
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
...
Conflicts:
composer.lock
2024-02-09 16:29:26 +02:00
Souptik Datta
e6a97bb36a
Merge branch 'master' into fix-7109-user-activity-log
2024-02-09 00:40:36 +05:30
Souptik Datta
8d7be399d3
fix: Fix project user activity log's missing fields and total count
...
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:15:48 +05:30
Souptik Datta
f42a78ef9c
fix: Fix account activity logs total count
...
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:14:37 +05:30
Christy Jacob
ba4f708137
Apply suggestions from code review
...
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2024-02-08 23:26:43 +05:30
fogelito
bcc6564e5b
typo
2024-02-08 18:18:39 +02:00
fogelito
7176d7feab
Remove comment
2024-02-08 18:12:43 +02:00
fogelito
103fec1664
parseQueries
2024-02-08 18:10:25 +02:00
fogelito
2c57f9a44a
Merge branch '1.5.x' of github.com:appwrite/appwrite into create-array-index
2024-02-08 15:04:43 +02:00
fogelito
98a6b96af9
Hardcode size and orders
2024-02-08 15:01:20 +02:00
shimon
790cdc297b
composer update
2024-02-08 10:26:45 +02:00
shimon
632f78140f
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
...
Conflicts:
composer.json
composer.lock
2024-02-08 09:29:12 +02:00
Christy Jacob
243ddd4b33
Merge pull request #7519 from appwrite/update-param-name
...
Update param name
2024-02-08 12:55:19 +05:30
Steven Nguyen
4ace8ed027
Replace catching \Exception with \Throwable
...
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:
} catch (\Exception $e) {
$deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {
As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00:00
Jake Barnby
66a38898eb
Fix message status values and enums
2024-02-07 23:50:05 +13:00
Jake Barnby
7014b2c2cd
Fix user API mfa route auth
2024-02-07 18:08:51 +13:00
Bradley Schofield
559fa924c0
Merge branch '1.5.x' into 1.5.x-response-request-models
2024-02-06 17:10:43 +00:00
Khushboo Verma
fb127270ce
Add test for empty domain
2024-02-06 16:04:58 +05:30
Khushboo Verma
11ceeff5ca
Add health certificate validity endpoint
2024-02-06 15:15:03 +05:30
Jake Barnby
0a72b37b3e
Fix session response model
2024-02-06 02:17:04 +13:00
Matej Bačo
25f8702429
Fix formatting
2024-02-05 10:40:53 +00:00
Matej Bačo
7beb9080fa
Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates
2024-02-05 10:38:48 +00:00
Khushboo Verma
e8523e38f7
Merge branch '1.5.x' into feat-block-countries
2024-02-05 13:26:52 +05:30
Jake Barnby
15f433794f
Add missing enum cases
2024-02-05 20:25:34 +13:00
shimon
6a6c3445fa
updates
2024-02-04 20:02:01 +02:00
shimon
a63977455f
Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
...
Conflicts:
.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby
bb9947bfd3
Remove invalid injection
2024-02-04 04:15:16 +13:00
Jake Barnby
68931c8672
Merge pull request #7538 from appwrite/fix-spec-generation
...
Fix spec generation
2024-02-03 04:04:00 +13:00
Jake Barnby
f14c0cc0aa
Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation
...
# 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
2024-02-03 03:35:14 +13:00
Khushboo Verma
d40a51b50a
Only disallow console requests
2024-02-02 20:01:54 +05:30
Jake Barnby
3816870e19
Fix duplicate routes
2024-02-03 03:26:04 +13:00
Jake Barnby
874e483fb5
Trigger delete of targets associated with sessions when sessions are deleted
2024-02-03 03:06:36 +13:00
Khushboo Verma
7b4f334f31
Update error message
2024-02-02 19:30:54 +05:30
Matej Bačo
4115537f72
Fix client error reporting
2024-02-02 14:33:52 +01:00
Torsten Dittmann
b462eee183
chore: run formatter
2024-02-02 13:50:41 +01:00
Torsten Dittmann
a77526cab1
fix: backup codes
2024-02-02 13:50:18 +01:00
Torsten Dittmann
db321db0fb
fix: code review
2024-02-02 13:42:15 +01:00
Torsten Dittmann
75fc59931a
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-02-02 13:30:11 +01:00
Jake Barnby
0e8e455903
Fix spec generation
2024-02-02 23:54:34 +13:00
Jake Barnby
df3042dc55
Merge pull request #7536 from appwrite/fix-invalid-usage-labels
...
Remove redundant usage labels
2024-02-02 22:21:20 +13:00
Khushboo Verma
d96d84201e
Add auth group to create email token endpoint
2024-02-02 14:03:20 +05:30
Khushboo Verma
0ea7b28a6b
Resolve merge conflicts
2024-02-02 12:53:25 +05:30
Jake Barnby
499f0a53ea
Update to standard namespacing for enums
2024-02-02 17:53:19 +13:00
Jake Barnby
d1bad7c3cd
Remove redundant usage labels
2024-02-02 17:16:31 +13:00
shimon
a254bb7edb
Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
2024-02-01 17:13:38 +02:00
Eldad A. Fux
321a998947
Merge pull request #7533 from appwrite/feat-rename-security-phrases
...
Feat: Rename security phrases
2024-02-01 15:45:15 +01:00
Matej Bačo
ef3f7878dc
PR review changes
2024-02-01 14:13:30 +00:00
Khushboo Verma
d3b002a48e
Merge branch '1.5.x' into feat-block-countries
2024-02-01 17:49:14 +05:30
Khushboo Verma
851e5c5154
Remove restrict group and add logic to auth group
2024-02-01 17:40:41 +05:30
Torsten Dittmann
ceb868c9d7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-02-01 11:57:32 +01:00
loks0n
5e26f01ecd
chore: fix account get ssr
2024-02-01 10:41:41 +00:00
Matej Bačo
a47a4240ed
Rename security phrases
2024-02-01 10:41:01 +00:00
shimon
350d72eb1f
updates
2024-02-01 12:21:50 +02:00
loks0n
d84cfab244
feat: remove users.createSession
2024-02-01 10:21:38 +00:00
Jake Barnby
21f0ce5b82
Set port, username and password to defaults if not provided
2024-02-01 17:45:41 +13:00
Jake Barnby
a6b5734884
Fix encryption type options
2024-02-01 17:44:42 +13:00
Jake Barnby
acc7131c95
Remove redundant key existence check
2024-02-01 17:42:19 +13:00
Jake Barnby
19fdc193b6
Fix credential enabled check
2024-02-01 17:41:24 +13:00
shimon
f477be7521
Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
...
Conflicts:
composer.json
2024-01-31 20:28:03 +02:00
Jake Barnby
d275d36a0b
Fix param order
2024-02-01 02:33:14 +13:00
Jake Barnby
e4194c690f
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider
...
# Conflicts:
# composer.lock
2024-02-01 01:50:36 +13:00
Jake Barnby
49a753509b
Merge pull request #7067 from appwrite/feat-php-8-1
...
Upgrade to PHP 8.2
2024-02-01 01:47:57 +13:00
Jake Barnby
d9f53cacfa
Add SMTP provider
2024-02-01 01:30:09 +13:00
Jake Barnby
39312a83ef
Merge pull request #7518 from appwrite/feat-remove-description
...
Feat remove description
2024-02-01 00:33:49 +13:00
Jake Barnby
79c324527e
Merge pull request #7510 from appwrite/feat-delete-message
...
Add message delete route
2024-01-31 19:55:11 +13:00
Khushboo Verma
dadb94c499
Merge branch '1.5.x' into feat-block-countries
2024-01-31 12:24:21 +05:30
Khushboo Verma
1d2eadf7e0
Allow 451 error publicly
2024-01-31 12:23:45 +05:30
Christy Jacob
8d7705a2e3
chore: update rate limits
2024-01-30 15:28:48 +00:00
Torsten Dittmann
3f688a2aa7
fix: remove some leftovers
2024-01-30 16:09:58 +01:00
shimon
5518ca165e
remarks
2024-01-30 13:24:57 +02:00
Christy Jacob
3c7fae7843
chore: update param name
2024-01-30 08:10:13 +00:00
Jake Barnby
ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit
...
Labels limit
2024-01-30 19:43:32 +13:00
Jake Barnby
ab0fae216d
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
...
# Conflicts:
# composer.lock
2024-01-30 18:44:16 +13:00
Jake Barnby
d7c9f9df59
Merge remote-tracking branch 'origin/1.5.x' into feat-remove-description
2024-01-30 16:58:20 +13:00
Jake Barnby
14a279eb57
Merge remote-tracking branch 'origin/1.5.x' into feat-delete-message
2024-01-30 16:58:04 +13:00
Jake Barnby
afb32b49d5
Throw if status still scheduled and scheduled time before now
2024-01-30 16:33:18 +13:00
Matej Bačo
738a696ca9
Add proejct ID abuse protection
2024-01-29 20:38:01 +00:00
Matej Bačo
7acdaa5978
PR review changes
2024-01-29 20:24:21 +00:00
Matej Bačo
bc88197e0d
Add more abuse keys
2024-01-29 20:11:44 +00:00
Matej Bačo
0a518cd47e
Fix failing tests
2024-01-29 20:03:14 +00:00
