Matej Bačo
1234770dc8
CI/CD fixes
2024-04-02 18:48:12 +02: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
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
62b2dc0801
use internal ids
2024-03-18 09:22:15 +00:00
Damodar Lohani
21d4b8feef
check user internal Id on membership
2024-03-18 09:01:54 +00:00
Damodar Lohani
d4bc65260f
fix linter issues
2024-03-17 09:39:21 +00:00
Damodar Lohani
21d33eaceb
Use team internal ID for checks and queries for membership
2024-03-17 15:08:43 +05:45
Damodar Lohani
05221334e2
use team internal id in delete memberships
2024-03-17 14:55:31 +05:45
Damodar Lohani
4fcb399867
use team internal id for membership check on update
2024-03-17 14:54:08 +05:45
Damodar Lohani
24319b8417
Fix membership query to use internalId
2024-03-17 14:51:27 +05:45
Jake Barnby
cea4e0d8b6
Wrap all db exceptions in error handler
2024-03-11 12:54:42 +01:00
Torsten Dittmann
0a1d572c72
chore: run formatter
2024-03-06 18:34:21 +01:00
Torsten Dittmann
dd13d17377
feat: const for totp values
2024-03-01 03:07:58 +01:00
Matej Bačo
5327c02870
Improve tests
2024-02-25 18:42:24 +01:00
Matej Bačo
862cba1a5b
Check against false positive for MFA
2024-02-25 18:42:24 +01: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
Jake Barnby
bbce53cda5
Auto trigger messaging events
2024-02-21 01:06:35 +13:00
Jake Barnby
37522ea66f
Merge branch '1.5.x' into fix-catch-exception
2024-02-13 12:47:36 +13:00
Jake Barnby
06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
...
fix Indexes
2024-02-13 12:37:59 +13:00
fogelito
ace75b0786
parseQueries
2024-02-12 18:02:04 +02: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
fogelito
adbe11fd50
fix Indexes
2024-02-12 11:55:45 +02:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
Christy Jacob
5abcb86fd7
fix: use atomic operations for updating team count
2024-02-09 23:18:18 +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
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
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
Christy Jacob
d849aa1ed2
chore: add logs
2024-01-29 16:47:12 +00:00
Christy Jacob
94c423c429
chore: add project details to messaging worker
2024-01-29 13:27:03 +00:00
Christy Jacob
6c09d04038
fix: use atomic operations for count updates
2024-01-29 10:54:58 +00: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
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
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
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
442451aa42
feat: mfa console
2024-01-18 16:04:18 +01:00
Torsten Dittmann
e7c40d1cb1
fix: teams session
2024-01-18 14:19:30 +01:00
loks0n
bc1858c516
chore: do not auto create accounts in users endpoints
2024-01-17 11:03:04 +00:00
Matej Bačo
4f5755e7d0
Implement session renewal
2024-01-15 13:43:21 +00:00
Torsten Dittmann
78f7b1897e
fix: hotfix for redirect param in custom templates ( #7437 )
...
* fix: hotfix for redirect param in custom templates
* fix: redirect param variables
* fix: variable typo
* chore: update comments for template variables
2024-01-11 21:36:05 +01:00
Torsten Dittmann
9ba2eafa83
fix: escape html in email params ( #7409 )
...
* fix: escape html in email params
* revert: phpunit stop on failure
* chore: fix linter
2024-01-08 18:08:17 +01:00
fogelito
cc5ae73f57
purgeCached changes
2023-12-14 15:32:06 +02:00
Prateek Banga
b8aa2faa7b
adds scheduling commit, still need to resolve pools error
2023-12-07 11:25:19 +01:00
fogelito
2fe50717d1
TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE
2023-12-06 15:10:40 +01:00
prateek banga
c24664f5d9
removes internal provider
2023-11-16 01:30:47 +05:30
prateek banga
7ae614fe13
adds provider type in target
2023-11-14 18:14:07 +05:30
