Jake Barnby
74a147f3b2
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables
...
# Conflicts:
# tests/e2e/Services/Projects/ProjectsCustomServerTest.php
2024-05-07 15:53:58 +12:00
Jake Barnby
912e3b01dc
Add clarifying comments
2024-05-07 14:07:04 +12:00
Steven Nguyen
98d18ecc47
refactor(auth): remove auth duration from Auth::sessionVerify() calls
...
The paramter was removed from the method so we don't need to pass it
in anymore.
2024-05-06 17:16:56 -07:00
Jake Barnby
5e62007c8f
Fix dbForProject resources
2024-05-06 21:19:19 +12:00
Jake Barnby
52c52fa519
Add scheme to DSN on fail
2024-05-06 18:13:41 +12:00
Jake Barnby
db94070162
Use DSN for project database
2024-05-06 17:33:36 +12:00
Damodar Lohani
14a0dd3166
Merge remote-tracking branch 'origin/main' into feat-security-emails
2024-05-06 01:04:44 +00:00
shimon
8e291f3700
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into fix-file-size-limit
...
Conflicts:
app/controllers/api/storage.php
composer.lock
2024-05-05 11:52:49 +03:00
Khushboo Verma
e583f44147
Increase chunk size to 10 MB
2024-05-03 18:01:15 +05:30
Jake Barnby
c4deb0ba93
Allow shared tables namespace override
2024-05-03 21:30:38 +12:00
Jake Barnby
a680b27e2b
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables
2024-05-03 19:07:23 +12:00
Christy Jacob
95300d796b
Revert "Update chunk size to 7 MB"
2024-05-03 10:19:03 +04:00
Jake Barnby
99d05b3d8c
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables
2024-05-03 14:24:57 +12:00
Khushboo Verma
87fb11914e
Update chunk size to 7 MB
2024-05-02 19:38:45 +05:30
Jake Barnby
d4254b34e2
Update db name
2024-05-02 18:28:03 +12:00
Khushboo Verma
885e7019f8
Update chunk size to 10 MB
2024-05-01 23:37:18 +05:30
Jake Barnby
b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
...
# Conflicts:
# .gitignore
# app/cli.php
# app/controllers/api/account.php
# app/controllers/api/databases.php
# app/controllers/api/projects.php
# app/controllers/general.php
# app/controllers/shared/api.php
# app/init.php
# app/realtime.php
# app/worker.php
# composer.json
# composer.lock
# src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
# src/Appwrite/Platform/Tasks/GetMigrationStats.php
# src/Appwrite/Platform/Workers/Databases.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Hamster.php
# tests/e2e/General/HTTPTest.php
# tests/e2e/Services/Databases/DatabasesCustomServerTest.php
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
Steven Nguyen
06e7efbd29
Merge pull request #7993 from fuyangpengqi/main
...
chore: fix some typos in comments
2024-04-29 16:41:24 -07:00
Matej Bačo
9616de7576
Merge branch 'main' into refactor-usage-sn-1.5.x
2024-04-26 13:11:21 +02:00
Steven Nguyen
eb6eb98a4a
Bump appwrite version to 1.5.5
2024-04-25 17:44:04 +00:00
Steven Nguyen
6c87ee8ce6
Merge pull request #8017 from appwrite/chore-bump-console-4.0.6
...
Bump console to version 4.0.6
2024-04-24 14:09:30 -07:00
Steven Nguyen
db6615ed2b
Bump console to version 4.0.6
2024-04-24 13:00:20 -07:00
shimon
4e639526d6
pull changes
2024-04-24 12:25:49 +03:00
Steven Nguyen
b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x
2024-04-23 23:43:53 +00:00
fuyangpengqi
2f5be1080f
chore: fix some typos in comments
...
Signed-off-by: fuyangpengqi <995764973@qq.com>
2024-04-18 21:40:03 +08:00
Jake Barnby
f95800de73
Revert connection changes
2024-04-12 14:37:15 +12:00
Jake Barnby
b50ec49ac1
Move Connections to pools namespace
2024-04-09 20:26:42 +12:00
Jake Barnby
388f450d89
Fix missing injection
2024-04-09 18:11:08 +12:00
Jake Barnby
730e7319df
Use connection group to reclaim all use connections for request
2024-04-09 17:03:28 +12:00
Jake Barnby
7b66cc5672
Revert getProjectDB change
2024-04-08 15:48:57 +12:00
shimon
574035d638
sms country code
2024-04-07 18:20:42 +03:00
shimon
7df94fcee6
Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into feat-sms-locale
...
Conflicts:
composer.json
composer.lock
2024-04-07 18:17:16 +03:00
Jake Barnby
479ed3d0b1
Inline defaults
2024-04-04 18:51:40 +13:00
Jake Barnby
8974dcfb39
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-reclaim-only-current-connection
...
# Conflicts:
# app/console
# app/init.php
2024-04-04 17:21:16 +13:00
Matej Bačo
d091b37a15
Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x
2024-04-02 18:42:17 +02:00
Damodar Lohani
026f5dde2d
set http version to 1.1 for do spaces
2024-04-02 08:35:14 +00:00
Eldad Fux
beda5293b4
Fix format
2024-04-01 13:08:46 +02:00
Eldad Fux
8ed1da4ea8
Updated getEnv to use system lib
2024-04-01 13:02:47 +02:00
Damodar Lohani
00c45c2507
new environment for certificates and security emails
2024-03-31 03:32:55 +00:00
Steven Nguyen
3c68c7e9cf
Bump console to version 4.0.5
2024-03-25 10:54:33 -07:00
shimon
63a30ed083
maximumFileSize fix
2024-03-19 12:15:39 +02:00
Damodar Lohani
c5512ae010
Update init.php
2024-03-17 15:01:09 +05:45
Jake Barnby
c6ce585fcc
Update version
2024-03-13 11:08:50 +01:00
Steven Nguyen
d167fb3650
Bump appwrite version to 1.5.3
2024-03-11 17:59:12 +01:00
Steven Nguyen
5bbfffff86
Bump console to version 4.0.4
2024-03-11 17:13:50 +01:00
Jake Barnby
9d1ccf78af
Update cache baster and image version
2024-03-09 18:46:14 +01:00
Torsten Dittmann
e75ba0600e
release: 1.5.2
2024-03-08 21:55:25 +01:00
Torsten Dittmann
150681246e
bump: version number
2024-03-08 17:25:10 +01:00
Torsten Dittmann
f51c39cd2b
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-03-08 00:30:02 +01:00
Jake Barnby
664df69a5f
Fix method refs
2024-03-07 17:49:59 +01:00
Jake Barnby
8a73203635
Revert debugs
2024-03-07 14:52:13 +01:00
Jake Barnby
b857fa3cdc
Debug
2024-03-07 14:06:33 +01:00
Jake Barnby
503fb2ca82
Debug
2024-03-07 12:49:54 +01:00
Jake Barnby
2bed17de35
Debug
2024-03-06 21:50:31 +01:00
Jake Barnby
3312ed1c5d
Debug
2024-03-06 21:14:55 +01:00
Torsten Dittmann
0a1d572c72
chore: run formatter
2024-03-06 18:34:21 +01:00
Shimon Newman
5b00737b55
Update app/init.php
...
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2024-03-06 18:09:13 +01:00
Jake Barnby
1b7ce8fc61
Debug
2024-03-06 10:59:05 +01:00
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
Khushboo Verma
d3b0b00917
Allow users to disable APIs
2024-03-04 23:12:54 +01:00
Jake Barnby
74a3d6531f
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
...
# Conflicts:
# composer.json
# composer.lock
# src/Appwrite/Platform/Tasks/CalcTierStats.php
# tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-03-04 19:50:10 +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
shimon
62ee10493b
usage sms per country code count
2024-02-15 10:10:01 +02: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
