Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-22 16:38:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
24619 commits 1266 branches 495 tags 510 MiB
Commit graph

675 commits

Author SHA1 Message Date
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
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
Prateek Banga
3ade88897c Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x 2023-11-10 12:49:05 +05:30
prateek banga
06daa544e8 review changes 2023-10-30 23:37:57 +05:30
Steven Nguyen
836ce852ed
Refactor email templates 
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.

It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
 2023-10-26 16:47:14 -07:00
Steven Nguyen
70a3820009
Remove unused mail vars 2023-10-26 16:23:58 -07:00
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
prateek banga
161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
shimon
2451d9fef1 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn 
 Conflicts:
	src/Appwrite/Platform/Workers/Deletes.php
 2023-10-16 17:06:59 +03:00
shimon
0e2c1c1f2d small fixes 2023-10-16 16:20:41 +03:00
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Torsten Dittmann
3778939605 fix: relative links to absolute 2023-10-13 15:43:23 +02:00