Prateek Banga
f97d1fa9e3
adds log api in messaging controller
2023-11-02 18:00:17 +05:30
shimon
1c1028412a
refactor users, project, functions usage display
2023-11-01 20:44:06 +02:00
prateek banga
f7529140bd
adds event label to remaining messaging api
2023-10-31 23:53:46 +05:30
prateek banga
fd4a81c4fc
made review changes
2023-10-25 23:03:23 +05:30
loks0n
3a9202a46b
chore: christy feedback
2023-10-25 13:20:29 +01:00
shimon
4c6976488c
clean up
2023-10-25 15:06:54 +03:00
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
loks0n
a67ca55af5
fix: use queueForEvents in users
2023-10-23 11:32:09 +01:00
loks0n
1343d4851a
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-10-23 09:10:57 +01:00
prateek banga
af40c63357
review changes
2023-10-20 17:02:13 +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
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
loks0n
f9d6ebd3a0
docs: add descriptions to universal token endpoints
2023-10-11 16:31:32 +01:00
loks0n
e41fab769f
fix: edge cases
2023-10-11 13:20:25 +01:00
shimon
002fc19d60
tests fix
2023-10-10 21:02:24 +03:00
loks0n
c343d7550f
chore: fmt
2023-10-10 14:41:02 +01:00
loks0n
c4e82e4191
fix: edge cases
2023-10-09 14:49:07 +01:00
Prateek Banga
a92390dda2
review changes
2023-10-06 19:23:46 +05:30
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
Prateek Banga
d5cc214546
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x
2023-10-06 03:44:36 +05:30
Prateek Banga
22d445587e
review changes
2023-10-05 16:57:48 +05:30
loks0n
e94631f730
fix: token verification
2023-10-05 11:18:19 +01:00
Prateek Banga
48b91e39a8
review changes
2023-10-04 16:15:59 +05:30
shimon
7f1507f810
sync with 1.4
2023-10-04 11:20:32 +03:00
shimon
429dabaaee
sync with 1.4
2023-10-03 19:50:48 +03:00
loks0n
739be813e0
feat: oauth ssr token flow
2023-09-28 13:45:52 +01:00
shimon
dcf0107a79
sync with master
2023-09-27 20:10:21 +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
35d842171c
review changes
2023-09-20 23:37:10 +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
Prateek Banga
350549db7d
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models
2023-09-14 02:17:34 +05:30
Prateek Banga
d742b0c0a9
removes provider type from create user target
2023-09-13 00:53:25 +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
Prateek Banga
6affa6b5a0
Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-13 00:07:09 +05:30
Prateek Banga
11a458f1df
change providers to authProviders in remaining places
2023-09-13 00:06:18 +05:30
Matej Bačo
6964477429
Increase labels maximum limit
2023-09-06 18:15:03 +02:00
prateek banga
1762c81b8d
Merge branch 'feat-messages-event-config' into feat-mailgun-provider
2023-08-31 18:32:26 +05:30
prateek banga
df77f92860
adds sub query for targets and topics, permission for user target
2023-08-25 01:22:16 +05:30
prateek banga
5ca8dc0a73
merge cl-1.4.x
2023-08-24 14:10:26 +05:30
prateek banga
e8cc60b0c2
adds audit resource in messaging controllers
2023-08-24 14:05:51 +05:30
prateek banga
82d220e158
fixes audit events
2023-08-24 13:43:30 +05:30
prateek banga
a95c29d546
lint fix
2023-08-24 01:55:08 +05:30
prateek banga
ec54000263
adds test for target controllers
2023-08-24 01:54:25 +05:30
prateek banga
ac33d7828f
Revert "Pint linter ran"
...
This reverts commit bf5f0a8419
.
2023-08-24 01:53:52 +05:30
wess
bf5f0a8419
Pint linter ran
2023-08-23 13:12:43 -04:00
Matej Bačo
8802e318d5
Fix pools resource
2023-08-23 13:52:17 +02:00
Jake Barnby
c99288229f
Add back missing route
2023-08-22 21:36:32 -04:00
Jake Barnby
a84e669a1f
Add missing accessedAt values when creating users
2023-08-22 21:34:23 -04:00
Jake Barnby
efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
...
# Conflicts:
# app/controllers/api/users.php
# composer.json
# composer.lock
# tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
prateek banga
78385a59c6
adds remaining provider controllers
2023-08-22 22:15:31 +05:30
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
...
# Conflicts:
# app/controllers/api/functions.php
# composer.json
# composer.lock
# tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Jake Barnby
942705b5f3
Fix database upgrade
2023-08-21 23:25:55 -04:00
prateek banga
fe8b8d3dc6
fix lint
2023-08-21 14:14:06 +05:30
prateek banga
5e3065c30a
merge resolve conflicts
2023-08-21 14:07:18 +05:30
shimon
83ffea68d1
rolling back usage flow
2023-08-20 16:53:26 +03:00
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
prateek banga
36a5d1e245
adds remaining controllers for target in account and users
2023-08-18 23:28:12 +05:30
prateek banga
f73b3bf272
deletes user cache document
2023-08-18 01:07:42 +05:30
prateek banga
c83e4db23d
lint fix
2023-08-17 19:02:07 +05:30
prateek banga
07b7a9db0f
adds controller for creating a user target
2023-08-17 17:24:45 +05:30
prateek banga
e53f189b3b
lint fix
2023-08-16 20:17:36 +05:30
prateek banga
c7dec3762b
Adds getTarget and list targets controller to user and account
2023-08-16 20:13:38 +05:30
Damodar Lohani
9d15f70db5
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2
2023-08-13 00:45:11 +00:00
Matej Bačo
b9c52d8583
QA after merge fix
2023-08-10 01:44:00 +02:00
Matej Bačo
899bc38069
Merge branch 'cl-1.4.x' into feat-git-integration
2023-08-10 01:12:09 +02:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x
2023-08-09 09:01:29 -07:00
Matej Bačo
93735ac4a7
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
2023-08-09 12:30:45 +02:00
Christy Jacob
82a206d808
Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-08-08 16:48:59 +00: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
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration
2023-08-07 14:46:00 -07:00
Damodar Lohani
a6109a0341
Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2
2023-08-07 08:42:04 +00:00
Matej Bačo
e60456cfda
QA after merge with 1.4
2023-08-06 10:51:53 +02:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
27e212553d
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-04 15:07:36 -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
eb7526601d
Delete duplicate 'Update Email Verification' endpoint
2023-07-31 11:00:30 -07:00
Damodar Lohani
fa8fab184b
fix remove duplicate endpoints
2023-07-30 09:23:12 +00:00
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x
2023-07-26 13:33:49 -07:00
Steven Nguyen
9908a9021f
Update get logs by user to pass user internal id
...
The userId in audit is actually the userInternalId.
2023-07-19 22:49:51 -07:00
Christy Jacob
4c8608b49c
chore: update naming conventions
2023-07-20 02:24:32 +04:00
Christy Jacob
e493551f8a
Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data
2023-07-20 01:44:25 +04:00
Christy Jacob
257776a54e
fix: failing tests
2023-07-20 01:34:27 +04:00
Torsten Dittmann
74308b445e
Merge pull request #5587 from appwrite/feat-user-labels
...
Add a new labels attribute to the Users collection
2023-07-18 14:59:18 +02:00
Steven Nguyen
ca6e9a7f1e
Update get logs by user to pass user internal id
...
The userId in audit is actually the userInternalId.
2023-07-12 10:56:24 -07:00
Christy Jacob
e0aa3db21e
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data
2023-07-11 19:36:37 +00:00
Steven Nguyen
8258d70b78
Update user's search attribute using database filter
...
Using a database filter is the cleanest approach because it ensures
the logic is applied whenever the user is updated regardless of
whichever endpoint was used.
2023-07-05 12:17:47 -07:00
Steven Nguyen
b3c9a34e5e
Make users searchable by label
2023-06-09 10:19:57 -07:00
Steven Nguyen
8400394857
Add an endpoint to update user labels
2023-06-09 10:18:51 -07:00
shimon
432ee72071
Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
app/cli.php
app/console
app/controllers/api/account.php
app/controllers/api/functions.php
app/controllers/api/teams.php
app/controllers/shared/api.php
app/init.php
app/worker.php
app/workers/builds.php
app/workers/certificates.php
app/workers/deletes.php
app/workers/functions.php
app/workers/mails.php
src/Appwrite/Event/Event.php
src/Appwrite/Event/Mail.php
2023-05-22 18:41:24 +03:00
fogelito
f6153b7626
Use array instead of variadic
2023-05-16 15:56:20 +03:00
fogelito
d55dc7a5b2
Merge branch 'master' of github.com:appwrite/appwrite into validator-mv
2023-05-07 12:23:02 +03:00
Christy Jacob
60f51580a7
Merge pull request #5246 from singhbhaskar/fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled
...
Fix: Updated error when _APP_USAGE_STATS is disabled
2023-05-04 20:47:50 +05:30
fogelito
5e4ff01568
getByType
2023-05-01 12:18:50 +03:00
fogelito
9dcf4c0984
validations changes
2023-04-25 14:35:49 +03:00
Bhaskar Singh
3865f48d32
Moved check for _APP_USAGE_STATS
...
to create init hook for App
2023-04-21 23:09:01 +05:30
Christy Jacob
0fb34433b9
feat: personal data filters to enhance password protection
2023-04-14 00:20:03 +04:00
Torsten Dittmann
52d7dcf082
fix: update prefs endpoints to not fallback to stdClass
2023-04-12 18:02:43 +02: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
Vincent (Wen Yu) Ge
19d5ea03b9
Updates links for query page
2023-03-29 19:38:39 +00:00
Bhaskar Singh
ac2085ffa8
Updated error when _APP_USAGE_STATS is disabled
...
for usage
2023-03-18 22:12:36 +05:30
Damodar Lohani
6b6f9edbd6
Merge branch '1.3.x' into feat-13x-master-sync
2023-02-21 07:38:46 +05:45
Damodar Lohani
104d99e636
fix default value error
2023-02-20 07:08:27 +00:00
Damodar Lohani
4e1a4b961c
update attribute errors
2023-02-20 01:51:56 +00:00
Damodar Lohani
7e055c585d
formatting fix
2023-02-20 01:37:33 +00:00
Damodar Lohani
452ee5c086
update dictonary validator
2023-02-20 01:34:05 +00:00
Damodar Lohani
5acd78463a
Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync
2023-02-16 00:44:29 +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
shimon
5850a454e0
addressing comments
2023-02-05 22:07:46 +02:00
Vincent (Wen Yu) Ge
b25dc38a63
clarify custom ID vs unique ID
2023-01-20 22:22:16 +00:00
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
Damodar Lohani
4f35353289
Merge branch 'feat-password-history' of https://github.com/appwrite/appwrite into feat-password-dictionary
2023-01-16 05:09:55 +00:00
Damodar Lohani
fe472e5b36
Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-password-history
2023-01-16 05:04:13 +00: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
shimon
9a2f734d3a
compose.lock
2023-01-12 18:06:20 +02:00
Matej Bačo
ccc9432219
Merge branch 'master' into fix-1.2.x-conflicts
2022-12-27 08:29:10 +01:00
Damodar Lohani
a0a08b3588
fix make password optional
2022-12-27 07:13:39 +00:00
Damodar Lohani
0760ea90d6
use dictionary validator
2022-12-26 10:22:49 +00:00
Damodar Lohani
a9078cded5
rename resource
2022-12-26 09:24:51 +00:00
Damodar Lohani
276032b3f7
error fix
2022-12-26 05:55:02 +00:00
Damodar Lohani
574ffa4d4b
check dictionary is enabled before checking password
2022-12-26 05:52:49 +00:00
Damodar Lohani
e9710bdb76
formatting fix
2022-12-26 05:47:20 +00:00
Damodar Lohani
1ff8ce2382
check against passwords dictionary
2022-12-26 05:24:26 +00:00
Bradley Schofield
c0daed3644
Refactor names and cleanup code
2022-12-20 16:11:30 +00:00
Christy Jacob
cb0a927e34
Merge pull request #4050 from geisterfurz007/fix-3916-empty-payload-returned-as-object
...
fix: empty payload returned as list
2022-12-20 13:37:24 +05:30
Christy Jacob
6b31edfdef
Merge pull request #4506 from karniv00l/user-not-found-exception
...
Fix User not found exception
2022-12-20 13:25:35 +05:30
Damodar Lohani
5b1c54c440
fix suggestions
2022-12-19 05:07:41 +00:00
Damodar Lohani
30ece2d36a
validator for password history
2022-12-18 09:08:51 +00:00
Damodar Lohani
f7dd37a9d1
format fix
2022-12-18 08:54:53 +00:00
Damodar Lohani
d098c8c698
use array slice
2022-12-18 08:47:02 +00:00
Damodar Lohani
4abc30eed1
refactor: fix formatting issues
2022-12-18 06:31:14 +00:00
Damodar Lohani
6612e6edf0
fix: password verify
2022-12-18 06:28:19 +00:00
Damodar Lohani
0eae73e7b8
fix: password comparison
2022-12-18 06:27:41 +00:00
Damodar Lohani
51ad9c6479
fix: get history limit before adding password to history
2022-12-18 04:38:27 +00:00
Damodar Lohani
0b1b7b8170
feat: check history limit
2022-12-16 10:47:08 +00:00
Damodar Lohani
61e03eeedf
add new password to the history
2022-12-16 10:29:20 +00:00
Damodar Lohani
8e7b89ec03
feat: check password history
2022-12-16 10:22:39 +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
shimon
961c408885
metric negative / positive values in worker
2022-12-14 09:34:04 +02:00
shimon
52c2cefdb5
users usage
2022-12-11 11:06:19 +02:00
Eldad Fux
95e835a902
Deprecated Usage stats
2022-11-23 19:08:42 +02:00
Jake Barnby
f9d2976c1d
Merge remote-tracking branch 'origin/1.1.x' into feat-graphql-support
...
# Conflicts:
# CHANGES.md
# 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/init.php
# app/tasks/sdks.php
# composer.lock
# docker-compose.yml
2022-11-16 19:37:35 +13:00
Bradley Schofield
3c71164741
Merge branch '1.1.x' into feat-implement-session-length-api
2022-11-14 15:30:38 +00:00
Jake Barnby
a47bfe71bf
Merge remote-tracking branch 'origin/1.2.x' into feat-graphql-support
...
# Conflicts:
# CHANGES.md
# composer.json
# composer.lock
# tests/e2e/Services/Functions/FunctionsCustomServerTest.php
2022-11-04 21:32:57 +13:00
geisterfurz007
e891424c17
fix: empty payload deleting single user session
2022-10-31 21:01:49 +01:00
Vincent (Wen Yu) Ge
9a1f54baf1
Merge branch 'master' into doc-unique-id
2022-10-21 17:43:52 -04:00