Jake Barnby
2a85c7cd96
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
2024-02-27 21:56:05 +13:00
Jake Barnby
44ec1502f0
Merge remote-tracking branch 'origin/main' into 1.5.x
2024-02-26 18:35:25 +13:00
Vincent (Wen Yu) Ge
b32d40f3e2
Improve messages
2024-02-26 02:25:45 +00:00
navjotNSK
cab2233816
Formatting
2024-02-25 20:24:36 +01:00
navjotNSK
3a8c5a2e65
Default value added for name
2024-02-25 20:24:36 +01:00
Jake Barnby
b1200f4cbd
Merge branch '1.5.x' into refactor-disallow-new-session-with-existing
2024-02-26 01:29:14 +13:00
Jake Barnby
91c52b28eb
Move targets to new session if upgrading to oauth session
2024-02-26 01:13:39 +13:00
Jake Barnby
86a2821a23
Merge pull request #7649 from appwrite/chore-remove-array-sdk-method
...
chore: remove array sdk method
2024-02-26 01:02:01 +13:00
Torsten Dittmann
194c61a47f
fix: mfa backup codes
2024-02-25 11:47:22 +01: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
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
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
7ab80b9288
Fix account method
2024-02-24 02:00:31 +13:00
Luke B. Silver
f285173f4e
Merge branch '1.5.x' into feat-ssr-dx
2024-02-22 13:22:41 +00:00
Torsten Dittmann
18e4385ca5
fix: change emailPassword factor from email to password
2024-02-21 18:18:56 +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
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
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
3c727861bb
Fix target permissions
2024-02-16 17:07:16 +13:00
Torsten Dittmann
14ecbd6658
fix: 2fa endpoint params
2024-02-15 11:26:34 +00: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
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
8ed2b1f3a5
Fix tests
2024-02-12 18:35:05 +13:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13: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
Souptik Datta
e6a97bb36a
Merge branch 'master' into fix-7109-user-activity-log
2024-02-09 00:40:36 +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
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
0a72b37b3e
Fix session response model
2024-02-06 02:17:04 +13:00
Khushboo Verma
e8523e38f7
Merge branch '1.5.x' into feat-block-countries
2024-02-05 13:26:52 +05:30
