Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,434 Commits 1,269 Branches 495 Tags
fix-github-error-file-path
Commit Graph
16391 Commits
Author SHA1 Message Date
Khushboo Verma d5cc9d9eea Addressed PR Comments 2023-12-15 01:45:17 +05:30
fogelito 4ce312560b Connection problem 2023-12-14 18:17:19 +02:00
Jake Barnby 4e26bdb5df Update update route params 2023-12-15 03:45:51 +13:00
Jake Barnby 7b99fab512 Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby 2eace5a627 Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic 
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
 2023-12-15 02:47:59 +13:00
Jake BarnbyandGitHub 91e3ea4bae Merge pull request #7287 from appwrite/fix-list-sizes 
Fix max array size 1
 2023-12-15 02:42:45 +13:00
Jake Barnby 5135262b79 Merge remote-tracking branch 'origin/1.4.x' into 1.5.x 
# Conflicts:
#	app/config/errors.php
#	composer.lock
 2023-12-15 02:41:46 +13:00
fogelito cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Jake Barnby 944e474ec4 Fix max array size 1 2023-12-15 02:30:44 +13:00
Christy JacobandGitHub b36c98af66 Merge pull request #7274 from appwrite/refactor-usage-execution-trigger 
Refactor usage execution trigger
 2023-12-14 06:16:01 +01:00
德华 刘 dc89501012 chore: linter 2023-12-14 04:51:36 +00:00
德华 刘 1307f73c31 chore: refactor code 2023-12-14 04:49:16 +00:00
Christy JacobandGitHub 39d91aecf1 Merge pull request #7273 from appwrite/damodar/pea-15-refactor-maintenance-deletes-worker 
PEA-15 Refactor Deletes and maintenance worker
 2023-12-14 05:08:11 +01:00
Steven Nguyen 92a307c164 Fix user identity attaching to wrong user 
Suppose a user has 2 accounts on Appwrite:

1. joe@example.com
2. joe@gmail.com

Prior to this PR, if joe@example.com created a Google OAuth2 session
using his joe@gmail.com email, a new joe@gmail.com identity would be
created linked to joe@example.com.

This is especially problematic because if the user tried to create a
Google OAuth2 session using joe@gmail.com, Appwrite would lookup the
user via email and find the joe@gmail.com user, but then find an
identity from joe@example.com. This mismatching user ID would then
cause an error.

This PR prevents an identity from being created if the email from the
OAuth2 provider matches another user's email.
 2023-12-13 18:45:05 +00:00
Torsten Dittmann 9bc52e8900 fix: commatation in email html 2023-12-13 18:08:36 +01:00
Torsten Dittmann 7645d6c34a fix: email templates 2023-12-13 17:46:14 +01:00
loks0n 3d4701abf4 Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-13 10:36:57 +00:00
loks0n 78878c6ba0 chore: fmt 2023-12-13 10:36:49 +00:00
Luke B. SilverandGitHub 60a0fefe56 Merge branch '1.4.x' into feat-ssr 2023-12-13 10:32:13 +00:00
loks0n 0e25d3e1df fix: scopes 2023-12-13 10:25:20 +00:00
Jake Barnby 276d671921 Add temp parsing code 2023-12-13 22:45:01 +13:00
Serhat AksakalandGitHub e56b30e6a6 Update tr.json 2023-12-13 12:10:44 +03:00
德华 刘 f334168f90 fix: remove expired cookie 2023-12-13 08:45:47 +00:00
Khushboo Verma 16addeba10 Fixed some errors 2023-12-13 03:00:16 +05:30
shimon 41ae96ea77 change execution usage trigger 2023-12-12 21:55:01 +02:00
shimon bdf9a64771 change execution usage trigger 2023-12-12 21:21:47 +02:00
Torsten Dittmann cf87cfab3a Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-12 18:48:26 +01:00
Torsten Dittmann 063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
loks0n b2f118d23b fix: specs 2023-12-12 15:42:22 +00:00
loks0n fe0001350d feat: use x-appwrite-session header 2023-12-12 15:39:24 +00:00
Damodar Lohani 5c3bd741b4 fix resources 2023-12-12 11:26:14 +00:00
loks0n fda9df069a feat: enable array sdk.method 2023-12-12 11:24:50 +00:00
Damodar Lohani d8fe96e300 set project resource 2023-12-12 11:08:14 +00:00
Damodar Lohani 104b8bb366 provide retention time as queue server resource 2023-12-12 08:07:24 +00:00
loks0n 453c1928ee fix: teams tests 2023-12-11 20:56:59 +00:00
loks0n fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
Khushboo Verma ff7cfc6602 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-12 00:17:21 +05:30
loks0n cb788b13bf chore: remove unused imports 2023-12-11 18:36:17 +00:00
loks0n 1e8a931751 chore: format 2023-12-11 17:13:19 +00:00
loks0n 7ee4ad5ba9 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-11 16:52:14 +00:00
loks0n f0d7312bd3 feat: create session method 2023-12-11 16:24:24 +00:00
Torsten Dittmann 5e74c5bbc4 fix: typo usage 2023-12-11 17:12:43 +01:00
Torsten Dittmann 3485373cd7 chore: generate specs 2023-12-11 16:40:19 +01:00
Torsten Dittmann 7d5f926d9c Merge branch 'refactor-usage-sn' of https://github.com/appwrite/appwrite into refactor-usage-sn 2023-12-11 16:37:27 +01:00
Torsten Dittmann 2657247b50 bump: console version 2023-12-11 16:37:14 +01:00
Torsten Dittmann 1794b1395a chore: run formatter 2023-12-11 16:33:15 +01:00
Torsten Dittmann ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
Torsten Dittmann b87231153e chore: bump console version number 2023-12-10 21:38:34 +01:00
Torsten Dittmann f8878ac039 chore: generate specs 2023-12-10 21:29:32 +01:00
Torsten Dittmann c37e31e6c3 fix: inconsistent timestamp generation 2023-12-10 20:58:38 +01:00