Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-04 05:48:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
31586 commits 1165 branches 495 tags 510 MiB
Commit graph

806 commits

Author SHA1 Message Date
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
Prateek Banga
d842191cc6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-06 03:53:16 +05:30
shimon
2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
shimon
c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers 
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
 2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Prateek Banga
234f7f003b updated test cases for msg91 provider, moves worker to use provider from settings 2023-09-27 18:58:00 +05:30
Prateek Banga
06a05a3358 adds param messageId in send an email endpoint, tokenId as messageId in create phone session, membershipId as messageId in create team membership 2023-09-21 21:17:15 +05:30
Prateek Banga
35d842171c review changes 2023-09-20 23:37:10 +05:30
Prateek Banga
3456ad4e8c fixes merge conflict issue 2023-09-20 17:52:25 +05:30
Prateek Banga
a2e34b5b64 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-20 16:59:07 +05:30
Steven Nguyen
6b0c24a9d6
Update user creation from teams and users services to not set accessedAt 
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
 2023-09-12 12:05:11 -07:00
Bradley Schofield
8357d20be7 Make URL optional for API and Serverside Requests 2023-09-05 19:13:47 +01:00
prateek banga
38d81c058b lint fix 2023-09-05 23:10:33 +05:30
prateek banga
78a53aee37 adds messaging event and updates messaging worker 2023-09-05 22:40:48 +05:30
Christy Jacob
21dc3b16b0 chore: update changelog 2023-08-30 18:36:40 -04:00
Christy Jacob
861921526e fix: remove redundant name property 2023-08-30 18:34:20 -04:00
Christy Jacob
74012158b3 fix: variable names 2023-08-30 17:54:26 -04:00
Christy Jacob
75e957ed4a fix: missing variable in email templates 2023-08-30 17:48:25 -04:00
Jake Barnby
d3929a5bae
Fix forced username and password requirement 2023-08-30 01:31:02 -04:00
Matej Bačo
c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Matej Bačo
f130a9ebc9 linter fix 2023-08-28 14:21:35 +02:00
Matej Bačo
89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield
82f400d177 Add more HTML back 2023-08-28 09:03:55 +01:00
Bradley Schofield
88d48715c5 Run Linter 2023-08-28 06:53:26 +01:00
Bradley Schofield
11dca76a70 Update teams.php 2023-08-28 06:53:02 +01:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Jake Barnby
537756551e
Fix missing accessedAt 2023-08-22 21:36:04 -04:00
Jake Barnby
942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
Jake Barnby
a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade 
# Conflicts:
#	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
 2023-08-17 19:54:25 -04:00
Jake Barnby
861ed521a0
Merge branch '1.4.x' into fix-team-update-membership 
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.x-server.json
#	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-1.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
 2023-08-17 17:51:24 -04:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities 
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
 2023-08-02 15:36:06 -07:00
Dakshi
12228ccef4 converted desc to sentence case 2023-08-01 20:56:48 +05:30
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Christy Jacob
0feaf41fcb Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools 2023-07-20 11:53:36 +00:00
Steven Nguyen
187f3dc6ff
Update get logs APIs to return userId from data 
The audit userId is actually the internal id and the user id is in the
data attribute.
 2023-07-19 22:49:51 -07:00
Steven Nguyen
2befa60350
Track a user's last activity 
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.

To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
 2023-07-19 22:22:58 -07:00
Eldad A. Fux
66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp 
[FEAT] Custom SMTP and Template support
 2023-07-20 07:09:11 +03:00
Damodar Lohani
4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Damodar Lohani
8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
Steven Nguyen
fce230dca8
Fix team delete 
Ensure all memberships are deleted and the cached users are
invalidated so that the nested memberships will refresh.
 2023-07-17 17:21:16 -07:00
jaivix
4db919b42d linting and wording updates based on stnguyen90 feedback 2023-07-13 00:33:38 +05:30
Steven Nguyen
300d916621
Update get logs APIs to return userId from data 
The audit userId is actually the internal id and the user id is in the
data attribute.
 2023-07-12 10:27:57 -07:00
Damodar Lohani
0cff44b909 update description 2023-07-11 06:41:30 +00:00
Damodar Lohani
1207fb3cb1
Update teams.php 2023-07-11 11:56:42 +05:45
jaivix
a6671a5caa fixed team creation response if teamId already exists 2023-07-09 16:50:09 +05:30
shimon
57bc7d0584 functions/builds/deletes worker 2023-06-11 17:08:48 +03:00
shimon
f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
fogelito
f6153b7626 Use array instead of variadic 2023-05-16 15:56:20 +03:00
fogelito
5e4ff01568 getByType 2023-05-01 12:18:50 +03:00
fogelito
9dcf4c0984 validations changes 2023-04-25 14:35:49 +03:00
Damodar Lohani
ac9f434c85 more fixes and reset endpoints 2023-04-19 08:44:22 +00:00
Damodar Lohani
0177ddccb3 use custom templates to send email when enabled 2023-04-19 08:29:29 +00:00
Damodar Lohani
d394715b56 Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-13 01:35:56 +00:00
Torsten Dittmann
34d27fb4d0 fix: prefs for teams 2023-04-12 18:03:08 +02:00
Jake Barnby
d86d604624
Reviews fixes 2023-04-12 03:32:14 +12:00
Jake Barnby
7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships 
# Conflicts:
#	composer.lock
 2023-04-11 15:57:35 +12:00
Damodar Lohani
41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
Vincent (Wen Yu) Ge
19d5ea03b9 Updates links for query page 2023-03-29 19:38:39 +00:00
Torsten Dittmann
c1ba898cec feat: rename update team sdk method 2023-03-23 13:04:16 +01:00
Damodar Lohani
893d305453 fix template issues 2023-03-17 00:55:00 +00:00
Torsten Dittmann
08d588aeb1 fix: remove unnecessary owner check 2023-03-15 11:55:21 +01:00
Damodar Lohani
c7db44b45f default sms template 2023-03-14 09:07:42 +00:00
Torsten Dittmann
bfdb7830d0 fix: update team prefs endpoint 2023-03-14 04:40:17 +05:30
Damodar Lohani
82498459db update project smtp using hook 2023-03-13 09:21:16 +00:00
Damodar Lohani
07010a5192 set SMTP config from project 2023-03-12 02:14:03 +00:00
Torsten Dittmann
10150aad3e feat: only owners are allowed to update attributes 2023-03-10 21:57:13 +05:30
Torsten Dittmann
01edc57806 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-team-prefs 2023-03-09 16:04:20 +05:30
Steven Nguyen
85a2d623a6
Update APIs to check X-Appwrite-Timestamp header 
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
 2023-03-07 10:54:52 -08:00
Torsten Dittmann
496da61cd9 feat: team preferences 2023-03-06 19:54:02 +05:30
Torsten Dittmann
ae32536be2 Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-3-console-sdk 2023-02-28 14:45:34 +05:30
Steven Nguyen
c5ebcbab2b
Add offline support labels on endpoints 2023-02-23 14:47:45 -08:00
Damodar Lohani
4948aedfb5 Merge remote-tracking branch 'origin/master' into 1.3.x 2023-02-20 03:51:54 +00:00
Damodar Lohani
171f30adb1 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-16 00:29:37 +00:00
Damodar Lohani
71d2c45a92 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-14 04:35:19 +00:00
Jake Barnby
f6fc9a8d8c
Merge remote-tracking branch 'origin/master' into feat-technical-debt-2 
# Conflicts:
#	composer.lock
 2023-02-14 14:22:08 +13:00
Christy Jacob
e5a6db6133
Merge pull request #4890 from appwrite/doc-clarify-permission 
Update permission and ID param descriptions for grammar and clarity.
 2023-01-28 04:15:20 +05:30
Vincent (Wen Yu) Ge
b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00:00
Damodar Lohani
1466e7b770
Update app/controllers/api/teams.php 
Co-authored-by: Vincent (Wen Yu) Ge <vincent@appwrite.io>
 2023-01-18 09:33:47 +05:45
fogelito
c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2 
 Conflicts:
	app/init.php
	composer.json
	composer.lock
 2023-01-16 10:24:37 +02:00
Vincent (Wen Yu) Ge
45aea5b941 Update branch with master 2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge
92a384e31c Fix descriptions for ID and regen 1.2.x specs 2023-01-13 14:27:08 -05:00
Bradley Schofield
31b718d829 Replace Appwrite Validators with backported Utopia ones 
+ Updated Utopia Framework to 0.26.0
+ Replaced Appwrite Validators with Utopia ones
 2023-01-13 15:28:04 +00:00
Damodar Lohani
afaa64b54b fix invitation after merge 2023-01-13 06:05:16 +00:00
Damodar Lohani
3146ec363d
Merge branch 'master' into feat-team-invite-improvements 2023-01-13 11:39:20 +05:45
Damodar Lohani
f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
Damodar Lohani
b06ce91297 fix formatting 2023-01-09 11:11:55 +00:00
Damodar Lohani
8d40220114 remove var dumps 2023-01-09 11:10:50 +00:00
Damodar Lohani
11b3739360 fix when either email or phone were empty 2023-01-09 11:10:02 +00:00
Damodar Lohani
a2642ecc67 send phone invite only if email is empty 2023-01-09 10:59:28 +00:00
Damodar Lohani
34b2280207 fix format 2023-01-09 09:18:13 +00:00
Damodar Lohani
8f351ad7b2 set email and phone attribute once user found 2023-01-09 09:17:39 +00:00
Damodar Lohani
bc7b98821a fix error 2023-01-09 08:56:18 +00:00
Damodar Lohani
32b8a1edfe fix param order in action 2023-01-09 08:44:02 +00:00
Damodar Lohani
29ef377b60 refactor privileged/app user check 2023-01-09 08:29:33 +00:00
Damodar Lohani
63a981591d fix error and param order 2023-01-09 08:25:15 +00:00
Damodar Lohani
a812bfb686 format fix 2023-01-09 05:55:07 +00:00
Damodar Lohani
2e154c06bc different test and messaging integration as well 2023-01-09 05:46:02 +00:00
Bradley Schofield
c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Damodar Lohani
b7d17e82da fix: membership invite email 2022-12-16 06:15:23 +00:00
Damodar Lohani
495da1bfd4 fix: template path 2022-12-16 06:11:12 +00:00
Damodar Lohani
5d195659bd refactor: mails refactor 2022-12-15 09:22:05 +00:00
fogelito
8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
fogelito
f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Christy Jacob
69d5a25c62 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-12-07 15:39:44 +04:00
Matej Bačo
8b71e318c2 Fix tests bug 2022-11-24 11:55:49 +00:00
Matej Bačo
efe093ce3c
Fix unsaved changes in team inv 2022-11-24 12:35:26 +01:00
Christy Jacob
080abbbb79 Merge branch 'master' of github.com:appwrite/appwrite into feat-add-console 2022-11-17 20:26:10 +05:30
Bradley Schofield
0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield
66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +00:00
Christy Jacob
b7a24da288 Merge branch 'master' of github.com:appwrite/appwrite into feat-db-pools 2022-11-05 18:06:44 +05:30
Bradley Schofield
4dfafd1169 Merge branch 'master' into feat-implement-session-length-api 2022-11-04 16:11:38 +00:00
Bradley Schofield
e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield
4cfc3b3a7f Update authDuration fallback value 2022-11-04 10:12:02 +00:00
Bradley Schofield
cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield
5dc8a2dee0 Add Tests and fix bugs 2022-11-01 11:15:45 +00:00
Bradley Schofield
d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Eldad Fux
54469e9b4d Unused classes 2022-10-21 08:41:12 +03:00
Vincent (Wen Yu) Ge
4cee87273c
Merge branch 'master' into doc-unique-id 2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge
ae2100244f Update unique() to be ID.unique() 2022-10-03 20:22:28 +00:00
Christy Jacob
54d14a5151
Merge pull request #3883 from appwrite/fix-get-membership-response 
Fix: Get Membership response
 2022-09-23 11:42:33 +05:30
Matej Bačo
c42bf2d8da Fix documentation response model 2022-09-19 11:43:21 +00:00
Matej Bačo
a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Christy Jacob
105e5fe71c feat: rename getMemberships to listMemberships 2022-09-14 01:44:56 +05:30
shimon
834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling 
 Conflicts:
	app/controllers/api/storage.php
 2022-09-08 15:13:22 +03:00
Eldad Fux
c442a5bce2 Fix linter test 2022-09-07 14:23:57 +03:00
Eldad Fux
c22c28bc67 Fixed indentation 2022-09-07 14:14:53 +03:00
Eldad Fux
01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
shimon
1362902082 audit event name reformation 2022-09-05 11:00:08 +03:00
shimon
5d16c39d5f account labels 2022-09-04 11:13:44 +03:00
Jake Barnby
b9148d380b
Fix only variables can passed by reference errors 2022-08-31 11:31:43 +12:00
Christy Jacob
7591f68970
Merge pull request #3702 from appwrite/feat-list-endpoints-queries 
Feat: List endpoint queries
 2022-08-30 14:56:09 +02:00
Matej Bačo
63c02677a0
PR review changes 2022-08-30 13:55:23 +02:00
Matej Bačo
2b3dc48bf1 PR review changes 2022-08-30 08:21:34 +00:00
Jake Barnby
44970cc628 Sync master 2022-08-28 11:01:46 +12:00
Matej Baco
fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Matej Bačo
65d09705ac Simplify class name 2022-08-24 18:25:15 +00:00
Jake Barnby
ea4b177b83 Fix team permissions 2022-08-24 20:26:47 +12:00
Matej Bačo
531d57feff Upgrade listMemberships queries 2022-08-23 13:16:46 +00:00
Matej Bačo
2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo
79560c13e6 Upgrade teamListLogs queries 2022-08-23 12:50:52 +00:00
Matej Bačo
6c971f6ece Upgrade listTeams queries 2022-08-23 08:56:28 +00:00
Jake Barnby
cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix 
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
 2022-08-19 16:49:34 +12:00
Jake Barnby
7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes 
# Conflicts:
#	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/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
 2022-08-19 16:20:19 +12:00
Jake Barnby
66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
shimon
2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/users.php
	composer.json
	composer.lock
 2022-08-17 10:05:37 +03:00
Jake Barnby
b09aaabd14 Fix teams exception 2022-08-17 00:14:22 +12:00
shimon
923a741c5a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
 2022-08-16 12:47:51 +03:00
Jake Barnby
bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix 
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
 2022-08-16 20:30:00 +12:00
Jake Barnby
fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge 
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
 2022-08-16 19:20:26 +12:00
Christy Jacob
5b7b39a300
Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
shimon
590c1467bc Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
 2022-08-15 18:19:59 +03:00
Jake Barnby
77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
Christy Jacob
509f9083c9 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-15 12:43:24 +05:30
Jake Barnby
66f518b531 Fix team membership delete 2022-08-15 18:04:00 +12:00
Eldad Fux
98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
Jake Barnby
613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Jake Barnby
9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes 
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
 2022-08-14 23:46:34 +12:00
Jake Barnby
6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes 
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
 2022-08-14 23:11:05 +12:00
Jake Barnby
b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Christy Jacob
979768fc9f Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-14 14:42:14 +05:30
Christy Jacob
70d2ebf55b feat: tests 2022-08-14 14:25:59 +05:30
Christy Jacob
a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Jake Barnby
fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Jake Barnby
ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix 
# Conflicts:
#	app/controllers/general.php
#	composer.lock
 2022-08-14 02:31:06 +12:00
Jake Barnby
68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Eldad Fux
3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Steven
1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Jake Barnby
09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Bradley Schofield
7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01:00
shimon
1af95fcdaa Tidy up 2022-08-12 16:21:32 +03:00
shimon
90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
Jake Barnby
1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
shimon
b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
shimon
d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Jake Barnby
216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
Jake Barnby
fb0168ea50 Fix erroneous whitespace 2022-08-09 14:48:39 +12:00
shimon
2d7a2bb57f leftovers 2022-08-08 18:23:45 +03:00
shimon
62ef532801 leftovers 2022-08-08 17:32:54 +03:00
Bradley Schofield
43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
Jake Barnby
e8af744c97 More write ref updates 2022-08-05 18:00:56 +12:00
Jake Barnby
bed6eb70af Replace write refs 2022-08-05 17:23:32 +12:00
Jake Barnby
ce38e74ba2 Update remaining services to new permissions 2022-08-02 21:21:53 +12:00
Bradley Schofield
3c808ca895 Fix problem with Exception class 2022-07-26 15:56:59 +01:00
Bradley Schofield
96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +01:00
Matej Bačo
dbccf39a9f Merge branch 'master' into feat-password-hash-algos 2022-07-25 12:37:07 +00:00
Fawzi E. Abdulfattah
3f09575740
get the invitee info from the db 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2022-07-25 06:09:35 +02:00
Fawzi E. Abdulfattah
9f45bce55f Fixing #3583 - create team membership to return added person name and email 
Signed-off-by: Fawzi E. Abdulfattah <iifawzie@gmail.com>
 2022-07-23 01:51:58 +02:00
fogelito
0816dd15f9 remove comments 2022-07-14 16:12:44 +03:00
fogelito
45ac40cc85 change function names 2022-07-13 17:02:49 +03:00
fogelito
f384a3352b change class from database:: to dateTime:: 2022-07-12 16:32:39 +03:00
fogelito
29436c1e5f Datetime change for joined and invited 2022-07-07 10:44:28 +03:00
fogelito
ae4cb685c0 expire 2022-07-05 21:55:20 +03:00
fogelito
acba505144 addCookie timestamp 2022-07-05 21:24:10 +03:00
fogelito
8628105eef Model changes 2022-07-04 12:55:11 +03:00
Torsten Dittmann
e83cf382fd fix: all sdks and specs 2022-06-28 13:21:28 +02:00
Matej Bačo
d9a88515bc Merge remote-tracking branch 'origin/0.15.x' into feat-password-hash-algos 2022-06-21 14:03:19 +00:00
Torsten Dittmann
511898afc9 Merge branch '0.15.x' of https://github.com/appwrite/appwrite into origin/feat-internal-id 2022-06-20 15:34:27 +02:00
Torsten Dittmann
bbdf70ee90 feat: use new $createdAt and $updatedAt attributes 2022-06-15 14:46:52 +02:00
fogelito
0d1b1ddef6 Adding Account + teams + users Internal Ids to colleactions 2022-06-14 20:15:22 +03:00
Matej Bačo
0aaa5779ab Linter fixes 2022-06-14 11:08:54 +00:00
Matej Bačo
0d94e4c9ce Merge branch 'master' into feat-password-hash-algos 2022-06-10 08:03:09 +00:00
Torsten Dittmann
3d297e825f
Merge pull request #3296 from stnguyen90/fix-2955-add-team-member-toast 
Update success, loading, and error message for add team member
 2022-06-01 16:24:45 +02:00
Steven
4a87e73a45 Update success, loading, and error message for add team member 
Remove text indicating invitations since no emails are sent when adding
a user via the Admin console.
 2022-05-31 22:00:37 -07:00
Steven
ec1c4fd5c3 Bypass SMTP host check for admins adding team members 
Since no email is sent when adding team members for admins, there shouldn't
be any need to check the SMTP host.
 2022-05-31 20:50:19 -07:00
Everly Precia Suresh
c61dd1e261 remove unecessary semi colons 2022-05-31 14:24:01 +00:00
Everly Precia Suresh
60a73c74a5 fix multi-line params in controllers 2022-05-23 16:42:27 +00:00
Everly Precia Suresh
19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Torsten Dittmann
bb0db796f7 feat: account update status 2022-05-16 11:58:17 +02:00
Torsten Dittmann
158ecce959 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.14.x 2022-05-12 20:41:04 +02:00
Torsten Dittmann
8fcc37e287
Merge pull request #3211 from appwrite/feat-api-user-memberships 
feat(api): user memberships
 2022-05-12 20:14:19 +02:00
Torsten Dittmann
9455a7c573
Merge pull request #3144 from appwrite/feat-array-limits 
Feat: Array API limits
 2022-05-12 19:03:29 +02:00
Torsten Dittmann
bf0506ecc7 feat: add user memberships endpoint 2022-05-12 15:20:06 +02:00
Torsten Dittmann
57246b14d7 fix: add missing teams update audit 2022-05-09 14:57:42 +02:00
Torsten Dittmann
fdd16e44c6 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-09 09:12:06 +02:00
Matej Bačo
4c642b99c5 Merge remote-tracking branch 'origin/0.14.x' into feat-sessions-subquery 2022-05-08 18:50:41 +00:00
Torsten Dittmann
33414b58b1 Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-05-08 17:25:01 +02:00
Torsten Dittmann
3990ef7fa2 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.14.x 2022-05-08 17:15:25 +02:00
Torsten Dittmann
40fbc7aa60
Merge pull request #3156 from appwrite/feat-user-tokens-subquery 
Feat: User tokens subcollection
 2022-05-08 17:09:49 +02:00
Torsten Dittmann
9c88906c7e
Merge pull request #3184 from appwrite/fix-team-user 
Fix: Team User Creation
 2022-05-08 16:47:01 +02:00
Torsten Dittmann
f5844df97b
Merge branch 'master' into feat-user-tokens-subquery 2022-05-08 16:39:24 +02:00
Torsten Dittmann
df1f8735a9
Merge pull request #3158 from appwrite/feat-user-memberships-subquery 
Feat: User membership subquery
 2022-05-08 16:35:33 +02:00
Matej Bačo
cc1ddc87d9 Fix tema user creation 2022-05-06 11:03:41 +00:00
Matej Bačo
814bb5c6b6 Finish hashing controllers 2022-05-05 11:21:31 +00:00
Matej Bačo
bc1b62f7da Merge branch 'master' into feat-password-hash-algos 2022-05-04 13:33:32 +00:00
Everly Precia Suresh
65a246bd21 add type for locale 2022-05-04 09:51:48 +00:00
Everly Precia Suresh
20b4119ee9 add primitive types to params 2022-05-03 13:21:25 +00:00
Everly Precia Suresh
76cd825112 refactor teams.php 2022-05-03 11:57:26 +00:00
Matej Bačo
5aa009d843 Rename const 2022-05-01 07:54:58 +00:00
Matej Bačo
4d2d7eddaf PR review changes 2022-05-01 07:53:59 +00:00
Matej Bačo
92d6ed6089 Implement memberships subquery 2022-04-27 12:44:47 +00:00
Matej Bačo
50082c3512 Implement user tokens subcollection 2022-04-27 11:06:53 +00:00
Matej Bačo
dd8f96ea63 Define const APP_LIMIT_ATTRIBUTE_COUNT 2022-04-26 13:29:23 +00:00
Torsten Dittmann
297d076caf Merge branch '0.14.x' of https://github.com/appwrite/appwrite into feat-new-event-model 2022-04-26 12:39:13 +02:00
Matej Bačo
de7e70e275 Tests fix 2022-04-26 08:52:59 +00:00
Matej Bačo
d36a2602ed Add limits, add docs 2022-04-25 07:23:25 +00:00
Matej Bačo
c6f32a31d2 Implement team activity 2022-04-21 14:07:08 +00:00
Torsten Dittmann
8ec435ed1f sync: changes 2022-04-17 22:34:32 +02:00
Torsten Dittmann
87b8fc3c41 feat: event classes for different cases 2022-04-13 14:39:31 +02:00
Torsten Dittmann
19c864e049
Merge pull request #2594 from Malte2036/fix-2593-duplicate-membership-verification 
fix: check whether the membershipId has been confirmed to avoid recon…
 2022-03-03 14:40:26 +01:00
Matej Baco
56bf7a51df Refactored 'sum' to 'total' 2022-02-27 10:57:09 +01:00
Christy Jacob
3c65d40234 Merge branch '0.13.x' of github.com:appwrite/appwrite into feat-functions-refactor-merge 2022-02-18 15:16:10 +04:00
Torsten Dittmann
8b9bd03306 fix: team role update 2022-02-16 17:26:19 +01:00
Christy Jacob
1ab27083c4 feat: update cursor errors 2022-02-09 02:56:11 +04:00
Christy Jacob
661630c1c6 Merge branch 'master' of github.com:appwrite/appwrite into feat-add-error-codes 2022-02-08 20:56:03 +04:00
Torsten Dittmann
6796aabf9c
Merge pull request #2637 from appwrite/feat-migration-0-13 
feat: migration for 0.13
 2022-02-08 11:17:44 +01:00
Christy Jacob
30c5d3c264 feat: use general server errors in general API controller 2022-02-07 01:27:16 +04:00
Christy Jacob
6d343abcb1 feat: use general server errors in teams API 2022-02-07 01:00:06 +04:00
Christy Jacob
7160364902 feat: update error codes in the teams API 2022-02-06 19:57:15 +04:00
Christy Jacob
c3369dec50 feat: update error codes in the teams API 2022-02-06 19:38:15 +04:00
Christy Jacob
5fc751a9dd feat: update error codes in the teams API 2022-02-06 19:17:19 +04:00
Christy Jacob
d756a9b972 feat: update error codes in the teams API 2022-02-06 18:52:21 +04:00
Matej Baco
d3e8e5ff21 Fixed tests 2022-02-04 17:10:52 +01:00
Matej Baco
4ff32612c8 Fixing tests 2022-02-04 16:25:54 +01:00
Malte2036
89c40dd4ed
Merge branch 'appwrite:master' into fix-2593-duplicate-membership-verification 2022-01-31 11:45:03 +01:00
Eldad A. Fux
9cd9a1dc5d
Merge pull request #2468 from stnguyen90/bug-2405-non-owner-delete-membership 
Fix non-owner not able to delete their membership
 2022-01-27 08:53:27 +02:00
Steven Nguyen
88f43c32a4 Fix non-owner not able to delete their membership 2022-01-18 21:26:14 -08:00
Malte2036
9f42a53a53 refactor confirm team validation to pass tests 2022-01-18 23:32:05 +01:00
Torsten Dittmann
d3150afebc feat: migration for 0.13 2022-01-18 12:05:04 +01:00
Malte2036
640b2ef324
change Error Code to 409 
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
 2022-01-13 13:11:08 +01:00
Vincent Ge
a102ee6f14 Wrap unique() in double quotes to better indicate that it's a literal string 2022-01-12 17:19:30 -05:00
Malte2036
c24a7fa611 fix: check whether the membershipId has been confirmed to avoid reconfirmation 2022-01-12 11:21:53 +01:00
Matej Baco
69b4d074f5 Migrated all imports to new request class 2021-12-31 16:50:07 +01:00
Torsten Dittmann
49ba7d5dfd fix: users prefs default value 2021-12-28 11:48:50 +01:00
Torsten Dittmann
693b8c7185 fix: replace internal and external database with project database 2021-12-27 13:45:23 +01:00
Torsten Dittmann
8826984b1f refactor: replace disable with skip calls for authorization 2021-12-17 16:25:05 +01:00