Commit graph

806 commits

Author SHA1 Message Date
Matej Bačo
af0c872999 Merge branch '1.6.x' into 1.7.x 2025-05-13 10:11:39 +02:00
Darshan
f13a28cf6d
Merge branch '1.7.x' into fix-templates 2025-05-04 19:08:06 +05:30
Jake Barnby
27ac5cbb2a
Remove redundant withTimestamp 2025-04-30 17:40:47 +12:00
Eldad Fux
fb29fe7b3c Merge remote-tracking branch 'origin/1.7.x' into feat-apps-module 2025-04-29 20:12:31 +02:00
Matej Bačo
d8103cb57e Merge branch '1.7.x' into 1.6.x 2025-04-25 12:18:04 +02:00
Christy Jacob
f4e8d72593
Merge branch '1.6.x' into feat-group 2025-04-17 18:25:47 +04:00
ArnabChatterjee20k
b2f7ed48dd Simplify constructor usage by inlining message; limit try/catch to DB operations 2025-04-17 10:16:26 +05:30
arnab
6e422ebe3c added teams and users order exception 2025-04-16 17:16:39 +05:30
arnab
3c602e84e6 added order exception in teams 2025-04-16 17:09:53 +05:30
loks0n
944624f13a chore: fmt 2025-04-14 12:59:39 +01:00
loks0n
0a4c430ae7 feat: exp scheme 2025-04-14 12:56:42 +01:00
Chirag Aggarwal
74abf4897b chore: fix teamCreateMembership 2025-04-14 08:47:57 +00:00
Chirag Aggarwal
c3656fd4e7 Merge branch '1.6.x' into feat-group 2025-04-12 06:50:20 +00:00
Chirag Aggarwal
5a5d1752f9 Merge branch '1.7.x' into feat-development-keys 2025-04-09 09:02:20 +00:00
Darshan
7297188c1b update: roles check. 2025-04-05 19:42:20 +05:30
Darshan
2a672f5a63 fix: don't allow the only owner in an org to change their role to anything else. 2025-04-05 19:20:24 +05:30
Chirag Aggarwal
abcaf6cd73 feat: sdk group attribute 2025-03-31 05:48:17 +00:00
Darshan
57c06f1e5b update: use buttons instead of links for inner-base template. 2025-03-28 16:44:44 +05:30
Chirag Aggarwal
d661195a5f chore: only update total count for prviledged users 2025-03-21 15:59:30 +00:00
Eldad Fux
38cb95e940 Fixed tests 2025-03-18 22:28:19 +01:00
Eldad Fux
afb40218d7 Fixed tests 2025-03-18 16:12:13 +01:00
Eldad Fux
7bae15d4fe Merge remote-tracking branch 'origin/feat-sites' into feat-apps-module 2025-03-18 10:15:06 +01:00
Eldad Fux
8aa5714173 cleanups 2025-03-17 21:44:31 +01:00
Eldad Fux
1ce84f1650 WIP 2025-03-17 12:39:35 +01:00
Eldad Fux
706ce4b3b6 WIP - cleaning up auth managment 2025-03-16 18:30:48 +01:00
Chirag Aggarwal
c05ef9121f Merge branch '1.6.x' into feat-development-keys 2025-02-28 12:56:26 +00:00
Jake Barnby
6e82bfe8e7
Update date 2025-02-26 14:00:16 +13:00
Jake Barnby
3a2babc906
Update date 2025-02-25 21:34:46 +13:00
Jake Barnby
03f0e382f4
Fix dates 2025-02-25 21:03:37 +13:00
Jake Barnby
b272a8b1e7
Pass queries 2025-02-25 20:26:00 +13:00
Jake Barnby
2924f408b3
Reapply "Remove blocks"
This reverts commit f49346485a.
2025-02-25 19:21:35 +13:00
Jake Barnby
b0547015a9
Add temp log date skip 2025-02-25 18:51:11 +13:00
Jake Barnby
f49346485a
Revert "Remove blocks"
This reverts commit 6f854b5eb6.
2025-02-25 18:39:12 +13:00
Jake Barnby
6f854b5eb6
Remove blocks 2025-02-25 18:18:25 +13:00
Chirag Aggarwal
b72b118c07
Merge branch '1.6.x' into feat-development-keys 2025-02-24 13:53:24 +05:30
shimon
06d22f910c disable logs display 2025-02-23 20:51:38 +02:00
Chirag Aggarwal
431eea2787 Merge branch '1.6.x' into feat-development-keys 2025-02-21 09:24:04 +00:00
Chirag Aggarwal
d6c2dfb915 chore: updated name 2025-02-21 03:27:46 +00:00
Chirag Aggarwal
9d9e44a14f chore: remove redundant check 2025-02-20 17:36:42 +00:00
Chirag Aggarwal
397a6a34ed chore: fix null errors on team invite 2025-02-20 17:30:26 +00:00
Chirag Aggarwal
351afffdfe Merge branch '1.6.x' into feat-development-keys 2025-02-13 17:55:37 +00:00
Chirag Aggarwal
2457485230 chore: removed redundant exception 2025-02-13 13:16:29 +00:00
Chirag Aggarwal
e435e457de chore: added check for team membership exists 2025-02-12 09:50:13 +00:00
Damodar Lohani
4d43b41482 Merge remote-tracking branch 'origin/1.6.x' into feat-logs-db 2025-02-05 08:17:46 +00:00
Chirag Aggarwal
c8afd2c613 Merge branch '1.6.x' into feat-development-keys 2025-02-04 11:21:07 +00:00
Damodar Lohani
cb31e7954e refactor rename 2025-01-30 04:53:53 +00:00
Chirag Aggarwal
6801a46d4e chore: remove unnecessary priviledge check 2025-01-30 04:36:51 +00:00
Chirag Aggarwal
f867fddaae Merge branch '1.6.x' into feat-development-keys 2025-01-27 10:33:58 +00:00
Chirag Aggarwal
d40fbda04a chore: added teamName to membership redirect url 2025-01-25 17:25:07 +00:00
Bradley Schofield
e7b119abae Merge branch '1.6.x' into feat-1.6.x-new-sdk-class 2025-01-20 14:21:26 +09:00
Chirag Aggarwal
1d1b83afb6 chore: review 2025-01-17 17:28:03 +00:00
Bradley Schofield
20e87cb82f Run Linter 2025-01-17 13:39:16 +09:00
Bradley Schofield
95dcb67747 Implement new SDK Class on 1.6.x 2025-01-17 13:31:39 +09:00
Chirag Aggarwal
a1031ab921 fix: update membership 2025-01-17 03:58:23 +00:00
Chirag Aggarwal
8dc3b4ca60 fix: tests: 2025-01-16 06:15:41 +00:00
Chirag Aggarwal
23d20b7d02 fix: invited user's name 2025-01-16 04:29:11 +00:00
Chirag Aggarwal
120ceeedad chore: review 2025-01-16 04:27:25 +00:00
Chirag Aggarwal
d43507040c fix: tests 2025-01-14 10:43:48 +00:00
ChiragAgg5k
860c917cf6 fix: increment 2025-01-14 15:48:28 +05:30
ChiragAgg5k
1c7867ee03 fix: not sending mail to appuser 2025-01-14 15:47:05 +05:30
ChiragAgg5k
2571f7d3fc refactor: createdMembership 2025-01-14 15:43:00 +05:30
Chirag Aggarwal
e6cb17a6cc chore: remove TEAM_INVITE_ALREADY_EXISTS 2025-01-13 18:51:23 +00:00
Chirag Aggarwal
b5449a8ca6 fix: resend invitation 2025-01-13 18:25:48 +00:00
ChiragAgg5k
2178bb44cd fix: attribute 2025-01-08 17:14:07 +05:30
ChiragAgg5k
1f240ca27a chore: moved non-countrycode tracking outside abuse 2025-01-08 17:09:55 +05:30
ChiragAgg5k
ff056fa145 chore: shifted authphone usage tracking to api calls 2025-01-08 17:01:01 +05:30
Damodar Lohani
8a59a22c2e update suggested changes 2024-12-04 05:25:16 +00:00
Torsten Dittmann
c97a94ec98 chore: run formatter 2024-11-19 17:18:51 +01:00
Torsten Dittmann
5f56c45c6c fix: team invites with existing session 2024-11-19 17:18:51 +01:00
loks0n
ca533f40c9 fix: memberships-privacy mfa only 2024-11-13 10:45:50 +01:00
loks0n
e7e1a5b11f fix: tests 2024-11-07 11:13:20 +01:00
loks0n
d4de44429f fix: tests 2024-11-07 10:33:40 +01:00
loks0n
b7397617e6 fix: tests 2024-11-07 10:19:22 +01:00
loks0n
e4c6e97ded feat: memberships privacy 2024-11-06 21:15:31 +01:00
loks0n
a6ae565093 fix: tests 2024-11-06 17:54:02 +01:00
loks0n
7fd5f8c934 docs 2024-11-06 16:00:27 +01:00
loks0n
12b60e01cf fix: tests 2024-11-06 15:51:15 +01:00
loks0n
d27a7189c7 fix: stash 2024-11-05 19:46:22 +01:00
loks0n
0e254618f6 fix: tests 2024-11-05 18:37:48 +01:00
loks0n
6fd54d646a fix: tests 2024-11-05 18:05:33 +01:00
loks0n
9d1f366161 fix: console 2024-11-05 17:59:14 +01:00
loks0n
69e8fdf077 chore: refactor 2024-11-05 17:05:21 +01:00
loks0n
4c14375d89 fix: tests 2024-11-01 13:31:33 +00:00
loks0n
37d60e1039 fix: var name 2024-11-01 13:28:13 +00:00
loks0n
c9b2d6eb90 feat: teamHideSensitiveFields 2024-11-01 11:38:56 +00:00
Bradley Schofield
40b8af0671 Further cleanup code now findOne returns empty doc 2024-10-31 17:13:23 +09:00
Bradley Schofield
e15ac03c59 Merge branch '1.6.x' into chore-update-databases-findone
# Conflicts:
#	composer.json
#	composer.lock
2024-10-31 16:57:45 +09:00
Jake Barnby
a7f1cc128a
Validate cursor queries to avoid getDocument type error 2024-10-17 18:41:24 +13:00
Jake Barnby
8bc37026cd
Revert "Feat adding coroutines" 2024-10-08 20:54:40 +13:00
Binyamin Yawitz
60e0554fdf
fix: remove leftover print_r 2024-10-07 20:41:44 -04:00
Binyamin Yawitz
c34f8afa81
fix: wrong document check 2024-10-07 20:34:27 -04:00
Binyamin Yawitz
ab5632bfcd
fix: wrong document check 2024-10-07 20:17:45 -04:00
Bradley Schofield
4c5b202f8d Merge branch '1.6.x' into chore-update-databases-findone
# Conflicts:
#	composer.json
#	composer.lock
2024-10-07 11:42:43 +09:00
Bradley Schofield
91b78a70ae Remove redundancy 2024-10-07 11:40:01 +09:00
Binyamin Yawitz
2703ca1106
chore: merge 2024-10-01 11:44:01 -04:00
Binyamin Yawitz
d14edf4207
reverting: to set coroutines as head 2024-10-01 10:30:47 -04:00
Damodar Lohani
c31e928def fix linter 2024-09-22 02:44:53 +00:00
Binyamin Yawitz
5512340cdd
Revert "Feat eldad4 coroutines" 2024-09-20 12:30:05 -04:00
Bradley Schofield
e88cfed03a Normalize algorithm being used 2024-09-18 16:30:02 +09:00
Bradley Schofield
be3e3790c9 Update Database lib, update instances where findOne is used to ensure we check document is empty. 2024-09-18 14:47:36 +09:00
Damodar Lohani
cd40df8388 fix tests and membership update 2024-09-05 03:43:02 +00:00
Damodar Lohani
bc5ac28b84 update validator and formatting 2024-09-04 02:01:56 +00:00
Binyamin Yawitz
7d6eac4ddb
Merge branch '1.6.x' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/http.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Migration/Migration.php
#	src/Appwrite/Platform/Tasks/Migrate.php
#	src/Appwrite/Platform/Tasks/ScheduleExecutions.php
#	src/Appwrite/Platform/Workers/Builds.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	src/Appwrite/Utopia/Response.php
2024-09-03 19:06:48 -04:00
Damodar Lohani
550a479532 Merge remote-tracking branch 'origin/1.6.x' into feat-console-roles-dl 2024-09-03 02:05:43 +00:00
Christy Jacob
22a3508c24
Merge pull request #8217 from appwrite/feat-extract-team-deletion
Feat Sync team deletion
2024-08-15 23:51:36 +04:00
Binyamin Yawitz
01f27874b2
fix: Addressing review 2024-08-08 10:03:10 -04:00
Steven Nguyen
d900e88e7e
Merge pull request #8416 from appwrite/fix-realtime-permission-change
Fix realtime permission change
2024-08-06 09:12:11 -07:00
Christy Jacob
c167201d7c feat: add role override for admins 2024-07-24 02:47:46 +04:00
Binyamin Yawitz
4eee8689d3
fixes: Clean URL variables 2024-07-22 09:37:28 -04:00
Steven Nguyen
5aa944ee82
fix(realtime): add userId to queueForEvents
In order for realtime to detect and process a changed permission, the
userId param must be set.
2024-07-19 00:02:43 +00:00
Binyamin Yawitz
d1af8cfbe0
feat: Extracting authentication cookie 2024-07-17 15:21:47 -04:00
Binyamin Yawitz
4e4fcc06fd
refactor: Project deletion in worker 2024-06-27 18:27:04 -04:00
Binyamin Yawitz
184d76fc9e
Merge branch 'refs/heads/1.6.x' into feat-extract-team-deletion 2024-06-26 12:28:12 -04:00
Binyamin Yawitz
b849d82772
refactor: Singular 2024-06-25 09:18:17 -04:00
Binyamin Yawitz
6c26e2eb51
Merge branch 'refs/heads/main' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	composer.json
#	composer.lock
2024-06-20 17:23:15 -04:00
choir27
897ae1c859 docs: update text description in request table 2024-06-12 10:47:48 -04:00
Binyamin Yawitz
b5a241db8d
merge: Main into Coroutines 2024-06-05 18:38:39 -04:00
Binyamin Yawitz
18ca583df8
feat: Deleting teams in sync 2024-05-29 15:52:22 -04:00
Ketan Baitule
894f001c7a
Update app/controllers/api/teams.php
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-05-16 08:00:46 +05:30
Ketan Baitule
6ff3fc5c6b fix: Allow Adding User Over Limit From Console In Team Membership 2024-05-15 15:03:46 +05:30
Eldad Fux
d67df5feb1 Fixed formatting 2024-04-22 22:45:55 +02:00
Eldad Fux
766b2ba13e Avatars tests are green! 2024-04-14 22:17:07 +02:00
Eldad Fux
a1db69b7e7 Fixed missing System namespace 2024-04-02 08:13:28 +02:00
Eldad Fux
5ce3de4933 Merge remote-tracking branch 'origin/main' into feat-eldad2-coroutines 2024-04-02 02:13:15 +02:00
Eldad Fux
6ce8781af1 Fixed email escaping 2024-04-01 19:39:26 +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
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
Matej Bačo
db1674811f Finish fixing code QL warnings 2024-03-08 13:57:20 +01:00
Matej Bačo
005a239932 Auth fixes 2024-03-07 18:24:01 +01:00
Matej Bačo
efeb898be1 Import fixes 2024-03-07 15:29: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