Torsten Dittmann
a53e630536
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2
2024-03-05 10:31:51 +01:00
Christy Jacob
868bba52aa
Update app/init.php
...
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2024-03-01 22:05:42 +05:30
Torsten Dittmann
b7d3996960
feat: mfa collection restructure
2024-02-29 21:59:49 +01:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints"
2024-02-22 12:21:48 +05:30
Jake Barnby
379c79dae9
Consistent naming for device resources
2024-02-21 03:10:51 +13:00
Jake Barnby
bbce53cda5
Auto trigger messaging events
2024-02-21 01:06:35 +13:00
Jake Barnby
85b0ec7f77
Temp bump console for SDK fixes
2024-02-19 17:33:47 +13:00
Jake Barnby
f28f9df41c
Update geodb
2024-02-13 17:55:32 +13:00
Jake Barnby
37522ea66f
Merge branch '1.5.x' into fix-catch-exception
2024-02-13 12:47:36 +13:00
fogelito
ace75b0786
parseQueries
2024-02-12 18:02:04 +02:00
shimon
70effd1e99
Sync against main
2024-02-12 11:14:26 +02:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
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
465bc81071
Add deletes job to delete targets tied to a particular session
2024-02-03 03:06:31 +13:00
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
shimon
13a879c274
Add count for messages(sms) metric
2024-01-30 11:19:10 +02:00
Jake Barnby
ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit
...
Labels limit
2024-01-30 19:43:32 +13:00
fogelito
974783f54a
Increase labels max value
2024-01-28 12:51:05 +02:00
fogelito
789e19d26a
Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
2024-01-25 19:06:18 +02:00
fogelito
a782e20315
Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
...
Conflicts:
app/controllers/api/account.php
composer.json
composer.lock
src/Appwrite/Platform/Tasks/CalcTierStats.php
tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Jake Barnby
7106131545
Merge branch '1.5.x' into feat-maintenance-delete-expired-targets
2024-01-26 00:26:29 +13:00
Torsten Dittmann
9070dce6ac
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-01-24 16:32:12 +01:00
Torsten Dittmann
9f5a0312cf
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-01-24 11:24:59 +01:00
Matej Bačo
5bd106afaf
Implement better cname validation logging
2024-01-23 15:40:32 +00:00
Torsten Dittmann
f1293d2636
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-22 18:32:22 +01:00
Torsten Dittmann
185e4258df
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-22 14:45:07 +01:00
Matej Bačo
32cc186ea6
Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal
2024-01-22 08:17:52 +00:00
Khushboo Verma
a134ca7efd
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2024-01-19 17:12:14 +05:30
Jake Barnby
9fc68d23a0
Fix delete type for expired targets
2024-01-19 17:23:44 +13:00
Jake Barnby
59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling
...
Feat message scheduling
2024-01-19 16:55:49 +13:00
Jake Barnby
a3096bc209
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
...
# Conflicts:
# app/controllers/api/messaging.php
2024-01-19 15:54:21 +13:00
Torsten Dittmann
1ab3dc2236
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-18 13:10:15 +01:00
Khushboo Verma
e9aab8d9ee
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2024-01-18 15:21:55 +05:30
Steven Nguyen
d670c07ca4
Delete subscribers and update topic totals when deleting target
2024-01-17 22:56:56 +00:00
Matej Bačo
39997c817f
Fix failing tests
2024-01-15 14:37:47 +00:00
Jake Barnby
189406635a
Use internal ID for subquery
2024-01-15 18:25:34 +13:00
loks0n
56fe939713
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-13 09:55:44 +00:00
Torsten Dittmann
e2a0c2d825
sync: with 1.5.x
2024-01-12 14:04:31 +01:00
Khushboo Verma
d443602cbc
resolve merge conflicts
2024-01-12 01:55:32 +05:30
Jake Barnby
322dae626a
Merge branch '1.5.x' into feat-message-scheduling
2024-01-11 22:29:49 +13:00
Jake Barnby
320919fef2
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
2024-01-11 19:59:59 +13:00
Jake Barnby
b9892b857a
Make const int easier to read
2024-01-11 15:54:44 +13:00
Jake Barnby
51b2019ab6
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
...
# Conflicts:
# composer.lock
2024-01-09 13:56:01 +13:00
Khushboo Verma
6b018d2f16
Add const for max file size
2024-01-09 01:41:48 +05:30
loks0n
5c803f6eff
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-08 11:41:55 +00:00
Torsten Dittmann
208abe17e7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-08 12:20:08 +01:00
Khushboo Verma
bbd551cf0d
Reset attempts to 0 on successful request
2024-01-05 17:54:20 +05:30
Khushboo Verma
fb9e393c97
Merge branch '1.5.x' into fix-limit-failed-webhook-attempts
2024-01-04 16:42:47 +05:30
Khushboo Verma
431e26c153
Allow certain domains to skip validation
2024-01-04 16:37:15 +05:30
Steven Nguyen
0c3ed13ad3
Fix _APP_CONSOLE_HOSTNAMES check
...
Ensure invalid hostnames such as empty strings are not added as a
hostname.
2024-01-03 20:39:19 +00:00
