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
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
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
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
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